very basic spans

Author: baronfel

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 />

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

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))
@@ -529,6 +532,7 @@ let main1
 
     // Process command line, flags and collect filenames
     let sourceFiles =
+        use parseActivity = activitySource.StartActivity("fcs:main1:determine_sources")
 
         // The ParseCompilerOptions function calls imperative function to process "real" args
         // Rather than start processing, just collect names, then process them.
@@ -562,6 +566,8 @@ let main1
 
     // If there's a problem building TcConfig, abort
     let tcConfig =
+        use createConfigActivity = activitySource.StartActivity("fcs:main1:create_tc_config")
+
         try
             TcConfig.Create(tcConfigB, validate = false)
         with e ->
@@ -586,10 +592,12 @@ let main1
     let foundationalTcConfigP = TcConfigProvider.Constant tcConfig
 
     let sysRes, otherRes, knownUnresolved =
+        use splitResolutionsActivity = activitySource.StartActivity("fcs:main1:split_resolutions")
         TcAssemblyResolutions.SplitNonFoundationalResolutions(tcConfig)
 
     // Import basic assemblies
     let tcGlobals, frameworkTcImports =
+        use frameworkImportsActivity = activitySource.StartActivity("fcs:main:import_framework_references")
         TcImports.BuildFrameworkTcImports(foundationalTcConfigP, sysRes, otherRes)
         |> NodeCode.RunImmediateWithoutCancellation
 
@@ -642,6 +650,7 @@ let main1
     ReportTime tcConfig "Import non-system references"
 
     let tcImports =
+        use nonFrameworkImportsActivity = activitySource.StartActivity("fcs:main1:import_non_framework_references")
         TcImports.BuildNonFrameworkTcImports(tcConfigP, frameworkTcImports, otherRes, knownUnresolved, dependencyProvider)
         |> NodeCode.RunImmediateWithoutCancellation
 
@@ -660,6 +669,7 @@ let main1
     use unwindParsePhase = PushThreadBuildPhaseUntilUnwind BuildPhase.TypeCheck
 
     let tcEnv0, openDecls0 =
+        use initialTcEnvActivity = activitySource.StartActivity("fcs:main1:get_initial_tc_env")
         GetInitialTcEnv(assemblyName, rangeStartup, tcConfig, tcImports, tcGlobals)
 
     // Type check the inputs
@@ -719,7 +729,9 @@ let main1OfAst
         disposables: DisposablesTracker,
         inputs: ParsedInput list
     ) =
-
+    
+    use main1AstActivity = activitySource.StartActivity("fcs:main1_ast")
+    
     let tryGetMetadataSnapshot = (fun _ -> None)
 
     let directoryBuildingFrom = Directory.GetCurrentDirectory()
@@ -904,6 +916,8 @@ let main2
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main2Activity = activitySource.StartActivity("fcs:main2")
+
 
     if tcConfig.typeCheckOnly then
         exiter.Exit 0
@@ -1012,7 +1026,7 @@ let main3
            exiter: Exiter,
            ilSourceDocs))
     =
-
+    use main3Activity = activitySource.StartActivity("fcs:main3")
     // Encode the signature data
     ReportTime tcConfig "Encode Interface Data"
     let exportRemapping = MakeExportRemapping generatedCcu generatedCcu.Contents
@@ -1108,6 +1122,7 @@ let main4
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main4Activity = activitySource.StartActivity("fcs:main4")
 
     match tcImportsCapture with
     | None -> ()
@@ -1212,6 +1227,7 @@ let main5
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main5Activity = activitySource.StartActivity("fcs:main5")
 
     use unwindBuildPhase = PushThreadBuildPhaseUntilUnwind BuildPhase.Output
 
@@ -1244,6 +1260,7 @@ let main6
            exiter: Exiter,
            ilSourceDocs))
     =
+    use main6Activity = activitySource.StartActivity("fcs:main6")
 
     ReportTime tcConfig "Write .NET Binary"
 
@@ -1368,6 +1385,7 @@ let CompileFromCommandLineArguments
         tcImportsCapture,
         dynamicAssemblyCreator
     ) =
+    use mainActivity = activitySource.StartActivity("fcs:main")
 
     use disposables = new DisposablesTracker()
     let savedOut = Console.Out

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 -->
@@ -497,6 +497,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/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,6 +13,7 @@ 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
@@ -26,18 +27,20 @@ open OpenTelemetry.Trace
 do ()
 
 [<EntryPoint>]
-let main (argv) =
+let main(argv) =
 
-    use tracerProvider = 
+    // 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("fsc")
+           .AddSource(activitySourceName)
            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName ="fsc", serviceVersion = "42.42.42.42"))
            .AddConsoleExporter()
            .Build();
-    use activitySource = new ActivitySource("fsc") 
-    use mainActivity = activitySource.StartActivity("main") 
-    
-    let forceCleanup() = 
+    use mainActivity = activitySource.StartActivity("main")
+
+    let forceCleanup() =
         mainActivity.Dispose()
         activitySource.Dispose()
         tracerProvider.Dispose()