Merge remote-tracking branch 'baronfel/activities' into otel

Author: safesparrow

NuGet.config

@@ -13,6 +13,7 @@
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
+    <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

eng/Versions.props

@@ -87,6 +87,7 @@
     <SystemConsoleVersion>4.3.0</SystemConsoleVersion>
     <SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
     <SystemDesignVersion>4.0.0</SystemDesignVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>5.0.1</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
     <SystemDiagnosticsTraceSourceVersion>4.3.0</SystemDiagnosticsTraceSourceVersion>
     <MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>

src/Compiler/Driver/ParseAndCheckInputs.fs

@@ -4,6 +4,7 @@
 module internal FSharp.Compiler.ParseAndCheckInputs
 
 open System
+open System.Diagnostics
 open System.IO
 open System.Collections.Generic
 
@@ -21,6 +22,7 @@ open FSharp.Compiler.CompilerConfig
 open FSharp.Compiler.CompilerDiagnostics
 open FSharp.Compiler.CompilerImports
 open FSharp.Compiler.Diagnostics
+open FSharp.Compiler.Diagnostics.Activity
 open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.Features
 open FSharp.Compiler.IO
@@ -1290,7 +1292,9 @@ let CheckOneInput
     }
 
 /// Typecheck a single file (or interactive entry into F# Interactive)
-let TypeCheckOneInputEntry (ctok, checkForErrors, tcConfig: TcConfig, tcImports, tcGlobals, prefixPathOpt) tcState inp =
+let TypeCheckOneInputEntry (ctok, checkForErrors, tcConfig: TcConfig, tcImports, tcGlobals, prefixPathOpt) tcState (inp: ParsedInput) =
+    use tcOneInputActivity = activitySource.StartActivity("CheckOneInput")
+    tcOneInputActivity.AddTag("inputName", inp.FileName) |> ignore<_>
     // 'use' ensures that the warning handler is restored at the end
     use unwindEL =
         PushDiagnosticsLoggerPhaseUntilUnwind(fun oldLogger ->
@@ -1339,6 +1343,7 @@ let CheckClosedInputSetFinish (declaredImpls: CheckedImplFile list, tcState) =
     tcState, declaredImpls, ccuContents
 
 let CheckClosedInputSet (ctok, checkForErrors, tcConfig, tcImports, tcGlobals, prefixPathOpt, tcState, inputs) =
+    use tcActivity = activitySource.StartActivity("CheckClosedInputSet")
     // tcEnvAtEndOfLastFile is the environment required by fsi.exe when incrementally adding definitions
     let results, tcState =
         (tcState, inputs)

src/Compiler/Driver/fsc.fs

@@ -39,6 +39,7 @@ open FSharp.Compiler.CompilerGlobalState
 open FSharp.Compiler.CreateILModule
 open FSharp.Compiler.DependencyManager
 open FSharp.Compiler.Diagnostics
+open FSharp.Compiler.Diagnostics.Activity
 open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.IlxGen
 open FSharp.Compiler.InfoReader
@@ -166,6 +167,8 @@ let TypeCheck
         inputs,
         exiter: Exiter
     ) =
+    use typecheckActivity = activitySource.StartActivity("typecheck_inputs")
+
     try
         if isNil inputs then
             error (Error(FSComp.SR.fscNoImplementationFiles (), rangeStartup))
@@ -474,6 +477,8 @@ let main1
         diagnosticsLoggerProvider: DiagnosticsLoggerProvider,
         disposables: DisposablesTracker
     ) =
+    
+    use mainActivity = new Activity("main")
 
     // See Bug 735819
     let lcidFromCodePage =
@@ -529,6 +534,7 @@ let main1
 
     // Process command line, flags and collect filenames
     let sourceFiles =
+        use parseActivity = activitySource.StartActivity("determine_source_files")
 
         // The ParseCompilerOptions function calls imperative function to process "real" args
         // Rather than start processing, just collect names, then process them.
@@ -562,6 +568,8 @@ let main1
 
     // If there's a problem building TcConfig, abort
     let tcConfig =
+        use createConfigActivity = activitySource.StartActivity("create_tc_config")
+
         try
             TcConfig.Create(tcConfigB, validate = false)
         with e ->
@@ -586,10 +594,12 @@ let main1
     let foundationalTcConfigP = TcConfigProvider.Constant tcConfig
 
     let sysRes, otherRes, knownUnresolved =
+        use splitResolutionsActivity = activitySource.StartActivity("split_resolutions")
         TcAssemblyResolutions.SplitNonFoundationalResolutions(tcConfig)
 
     // Import basic assemblies
     let tcGlobals, frameworkTcImports =
+        use frameworkImportsActivity = activitySource.StartActivity("import_framework_references")
         TcImports.BuildFrameworkTcImports(foundationalTcConfigP, sysRes, otherRes)
         |> NodeCode.RunImmediateWithoutCancellation
 
@@ -642,6 +652,7 @@ let main1
     ReportTime tcConfig "Import non-system references"
 
     let tcImports =
+        use nonFrameworkImportsActivity = activitySource.StartActivity("import_non_framework_references")
         TcImports.BuildNonFrameworkTcImports(tcConfigP, frameworkTcImports, otherRes, knownUnresolved, dependencyProvider)
         |> NodeCode.RunImmediateWithoutCancellation
 
@@ -660,6 +671,7 @@ let main1
     use unwindParsePhase = PushThreadBuildPhaseUntilUnwind BuildPhase.TypeCheck
 
     let tcEnv0, openDecls0 =
+        use initialTcEnvActivity = activitySource.StartActivity("get_initial_tc_env")
         GetInitialTcEnv(assemblyName, rangeStartup, tcConfig, tcImports, tcGlobals)
 
     // Type check the inputs
@@ -719,7 +731,9 @@ let main1OfAst
         disposables: DisposablesTracker,
         inputs: ParsedInput list
     ) =
-
+    
+    use main1AstActivity = activitySource.StartActivity("main1_of_ast")
+    
     let tryGetMetadataSnapshot = (fun _ -> None)
 
     let directoryBuildingFrom = Directory.GetCurrentDirectory()
@@ -904,6 +918,8 @@ let main2
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main2Activity = activitySource.StartActivity("main2")
+
 
     if tcConfig.typeCheckOnly then
         exiter.Exit 0
@@ -1012,7 +1028,7 @@ let main3
            exiter: Exiter,
            ilSourceDocs))
     =
-
+    use main3Activity = activitySource.StartActivity("main3")
     // Encode the signature data
     ReportTime tcConfig "Encode Interface Data"
     let exportRemapping = MakeExportRemapping generatedCcu generatedCcu.Contents
@@ -1108,6 +1124,7 @@ let main4
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main4Activity = activitySource.StartActivity("main4")
 
     match tcImportsCapture with
     | None -> ()
@@ -1211,6 +1228,7 @@ let main5
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main5Activity = activitySource.StartActivity("main5")
 
     use unwindBuildPhase = PushThreadBuildPhaseUntilUnwind BuildPhase.Output
 
@@ -1243,6 +1261,7 @@ let main6
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main6Activity = activitySource.StartActivity("main6")
 
     ReportTime tcConfig "Write .NET Binary"
 
@@ -1379,7 +1398,6 @@ let CompileFromCommandLineArguments
                 with _ ->
                     ()
         }
-
     main1 (
         ctok,
         argv,

src/Compiler/FSharp.Compiler.Service.fsproj

@@ -3,7 +3,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472;</TargetFrameworks>
     <OutputType>Library</OutputType>
     <NoWarn>$(NoWarn);44</NoWarn> <!-- Obsolete -->
     <NoWarn>$(NoWarn);57</NoWarn> <!-- Experimental -->
@@ -496,6 +496,7 @@
   <ItemGroup>
     <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemdiagnosticsDiagnosticSourceVersion)" />
     <PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourceVersion)" />
     <PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />

src/Compiler/Facilities/Logger.fs

@@ -2,8 +2,13 @@
 
 namespace FSharp.Compiler.Diagnostics
 
-open System.Diagnostics.Tracing
 open System
+open System.Diagnostics
+open System.Diagnostics.Tracing
+
+module Activity =
+    let activitySourceName = "fsc"
+    let activitySource = new ActivitySource(activitySourceName)
 
 type LogCompilerFunctionId =
     | Service_ParseAndCheckFileInProject = 1

src/Compiler/Facilities/Logger.fsi

@@ -3,6 +3,11 @@
 namespace FSharp.Compiler.Diagnostics
 
 open System
+open System.Diagnostics
+
+module Activity = 
+    val activitySourceName: string
+    val activitySource: ActivitySource
 
 type internal LogCompilerFunctionId =
     | Service_ParseAndCheckFileInProject = 1

src/fsc/fsc.targets

@@ -37,12 +37,16 @@
 
   <ItemGroup>
     <PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
     <PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
     <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
     <PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.1.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.1.0" />
+
   </ItemGroup>
 
 </Project>

src/fsc/fscProject/fsc.fsproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup >
     <TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net6.0;net472;</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0</TargetFrameworks>
     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
   </PropertyGroup>

src/fsc/fscmain.fs

@@ -13,16 +13,38 @@ open Internal.Utilities.Library.Extras
 open FSharp.Compiler.AbstractIL
 open FSharp.Compiler.AbstractIL.ILBinaryReader
 open FSharp.Compiler.CompilerConfig
+open FSharp.Compiler.Diagnostics.Activity
 open FSharp.Compiler.Driver
 open FSharp.Compiler.DiagnosticsLogger
 open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Text
+open System.Diagnostics
+open OpenTelemetry
+open OpenTelemetry.Resources
+open OpenTelemetry.Trace
 
 [<Dependency("FSharp.Compiler.Service", LoadHint.Always)>]
 do ()
 
 [<EntryPoint>]
-let main (argv) =
+let main(argv) =
+
+    // eventually this would need to only export to the OLTP collector, and even then only if configured. always-on is no good.
+    // when this configuration becomes opt-in, we'll also need to safely check activities around every StartActivity call, because those could
+    // be null
+    use tracerProvider =
+        Sdk.CreateTracerProviderBuilder()
+           .AddSource(activitySourceName)
+           .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName ="fsc", serviceVersion = "42.42.42.42"))
+           .AddOtlpExporter()
+           .AddZipkinExporter()
+           .Build();
+    use mainActivity = activitySource.StartActivity("main")
+
+    let forceCleanup() =
+        mainActivity.Dispose()
+        activitySource.Dispose()
+        tracerProvider.Dispose()
 
     let compilerName =
         // the 64 bit desktop version of the compiler is name fscAnyCpu.exe, all others are fsc.exe
@@ -67,6 +89,7 @@ let main (argv) =
             let stats = ILBinaryReader.GetStatistics()
 
             AppDomain.CurrentDomain.ProcessExit.Add(fun _ ->
+                forceCleanup()
                 printfn
                     "STATS: #ByteArrayFile = %d, #MemoryMappedFileOpen = %d, #MemoryMappedFileClosed = %d, #RawMemoryFile = %d, #WeakByteArrayFile = %d"
                     stats.byteFileCount
@@ -81,6 +104,7 @@ let main (argv) =
         let quitProcessExiter =
             { new Exiter with
                 member _.Exit(n) =
+                    forceCleanup()
                     try
                         exit n
                     with _ ->