* Remove references to OpenTelemetry

* Move activities to BackgroundChecker layer, deduplicate

Author: safesparrow

src/Compiler/FSharp.Compiler.Service.fsproj

@@ -501,8 +501,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.1.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.1.0" />
     <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemdiagnosticsDiagnosticSourceVersion)" />

src/Compiler/Facilities/BuildGraph.fs

@@ -94,29 +94,30 @@ type NodeCodeBuilder() =
     member _.Combine(Node (p1): NodeCode<unit>, Node (p2): NodeCode<'T>) : NodeCode<'T> = Node(async.Combine(p1, p2))
 
     [<DebuggerHidden; DebuggerStepThrough>]
-    member _.Using(value: ActivityFacade, binder: ActivityFacade -> NodeCode<'U>) =
+    member _.Using(value: CompilationGlobalsScope, binder: CompilationGlobalsScope -> NodeCode<'U>) =
         Node(
             async {
+                DiagnosticsThreadStatics.DiagnosticsLogger <- value.DiagnosticsLogger
+                DiagnosticsThreadStatics.BuildPhase <- value.BuildPhase
+
                 try
                     return! binder value |> Async.AwaitNodeCode
                 finally
                     (value :> IDisposable).Dispose()
             }
         )
-        
+    
     [<DebuggerHidden; DebuggerStepThrough>]
-    member _.Using(value: CompilationGlobalsScope, binder: CompilationGlobalsScope -> NodeCode<'U>) =
+    member _.Using(value: ActivityFacade, binder: ActivityFacade -> NodeCode<'U>) =
         Node(
             async {
-                DiagnosticsThreadStatics.DiagnosticsLogger <- value.DiagnosticsLogger
-                DiagnosticsThreadStatics.BuildPhase <- value.BuildPhase
-
                 try
                     return! binder value |> Async.AwaitNodeCode
                 finally
                     (value :> IDisposable).Dispose()
             }
         )
+        
 
 let node = NodeCodeBuilder()
 

src/Compiler/Service/service.fs

@@ -35,8 +35,6 @@ open FSharp.Compiler.Text
 open FSharp.Compiler.Text.Range
 open FSharp.Compiler.TcGlobals
 open FSharp.Compiler.BuildGraph
-open OpenTelemetry
-open OpenTelemetry.Resources
 
 [<AutoOpen>]
 module EnvMisc =
@@ -343,8 +341,7 @@ type BackgroundCompiler
                             member x.EvaluateRawContents() =
                                 node {
                                     Trace.TraceInformation("FCS: {0}.{1} ({2})", userOpName, "GetAssemblyData", nm)
-                                    let! x = self.GetAssemblyData(opts, userOpName + ".CheckReferencedProject(" + nm + ")")
-                                    return x
+                                    return! self.GetAssemblyData(opts, userOpName + ".CheckReferencedProject(" + nm + ")")
                                 }
 
                             member x.TryGetLogicalTimeStamp(cache) =
@@ -739,6 +736,13 @@ type BackgroundCompiler
             userOpName
         ) =
         node {
+            use _ =
+                Activity.instance.Start "CheckFileInProjectAllowingStaleCachedResults"
+                    [|
+                        "Project", options.ProjectFileName
+                        "filename", fileName
+                        "UserOpName", userOpName |> Option.defaultValue ""  
+                    |]
             let! cachedResults =
                 node {
                     let! builderOpt, creationDiags = getAnyBuilder (options, userOpName)
@@ -772,12 +776,11 @@ type BackgroundCompiler
     /// Type-check the result obtained by parsing. Force the evaluation of the antecedent type checking context if needed.
     member bc.CheckFileInProject(parseResults: FSharpParseFileResults, fileName, fileVersion, sourceText: ISourceText, options, userOpName) =
         node {
-            use _ = Activity.instance.Start "Service_CheckFileInProject" [|"project", options.ProjectFileName; "fileName", fileName|]
+            use _ = Activity.instance.Start "CheckFileInProject" [|"project", options.ProjectFileName; "fileName", fileName; "userOpName", userOpName|]
             let! builderOpt, creationDiags = getOrCreateBuilder (options, userOpName)
 
             match builderOpt with
-            | None ->
-                return FSharpCheckFileAnswer.Succeeded(FSharpCheckFileResults.MakeEmpty(fileName, creationDiags, keepAssemblyContents))
+            | None -> return FSharpCheckFileAnswer.Succeeded(FSharpCheckFileResults.MakeEmpty(fileName, creationDiags, keepAssemblyContents))
             | Some builder ->
                 // Check the cache. We can only use cached results when there is no work to do to bring the background builder up-to-date
                 let! cachedResults = bc.GetCachedCheckFileResult(builder, fileName, sourceText, options)
@@ -1234,7 +1237,7 @@ type FSharpChecker
             enableBackgroundItemKeyStoreAndSemanticClassification,
             enablePartialTypeChecking
         )
-      
+
     static let globalInstance = lazy FSharpChecker.Create()
 
     // STATIC ROOT: FSharpLanguageServiceTestable.FSharpChecker.braceMatchCache. Most recently used cache for brace matching. Accessed on the
@@ -1525,13 +1528,6 @@ type FSharpChecker
             ?userOpName: string
         ) =
         async {
-            use _ =
-                Activity.instance.Start "CheckFileInProjectAllowingStaleCachedResults"
-                    [|
-                        "Project", options.ProjectFileName
-                        "filename", fileName
-                        "UserOpName", userOpName |> Option.defaultValue ""  
-                    |]
             let userOpName = defaultArg userOpName "Unknown"
             return!
                 backgroundCompiler.CheckFileInProjectAllowingStaleCachedResults(
@@ -1557,13 +1553,6 @@ type FSharpChecker
             ?userOpName: string
         ) =
         async {
-            use _ =
-                Activity.instance.Start "CheckFileInProject"
-                        [|
-                            "Project", options.ProjectFileName
-                            "filename", fileName
-                            "UserOpName", userOpName |> Option.defaultValue ""  
-                        |]
             let userOpName = defaultArg userOpName "Unknown"
             return!
                 backgroundCompiler.CheckFileInProject(parseResults, fileName, fileVersion, sourceText, options, userOpName)

src/fsc/fscmain.fs

@@ -13,37 +13,16 @@ open Internal.Utilities.Library.Extras
 open FSharp.Compiler.AbstractIL
 open FSharp.Compiler.AbstractIL.ILBinaryReader
 open FSharp.Compiler.CompilerConfig
-open FSharp.Compiler.Diagnostics
 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) =
-
-    // 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(Activity.instance.Name)
-           .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName ="fsc", serviceVersion = "42.42.42.42"))
-           .AddJaegerExporter()
-           .Build();
-    use mainActivity = Activity.instance.StartNoTags "main"
-
-    let forceCleanup() =
-        mainActivity.Dispose()
-        Activity.instance.Dispose()
-        tracerProvider.Dispose()
+let main (argv) =
 
     let compilerName =
         // the 64 bit desktop version of the compiler is name fscAnyCpu.exe, all others are fsc.exe
@@ -85,7 +64,6 @@ 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
@@ -99,7 +77,6 @@ let main(argv) =
         let quitProcessExiter =
             { new Exiter with
                 member _.Exit(n) =
-                    forceCleanup()
                     try
                         exit n
                     with _ ->

tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/Program.fs

@@ -1,35 +1,7 @@
-open System
-open BenchmarkDotNet.Configs
-open BenchmarkDotNet.Running
+open BenchmarkDotNet.Running
 open FSharp.Compiler.Benchmarks
-open OpenTelemetry
-open OpenTelemetry.Resources
-open OpenTelemetry.Trace
-
-open FSharp.Compiler.Diagnostics
 
 [<EntryPoint>]
 let main args =
-    let b = DecentlySizedStandAloneFileBenchmark()
-    
-    // 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(Activity.instance.Name)
-           .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName ="program", serviceVersion = "42.42.42.44"))
-           .AddOtlpExporter()
-           .AddZipkinExporter()
-           .Build();
-    use mainActivity = Activity.instance.StartNoTags("main")
-
-    let forceCleanup() =
-        mainActivity.Dispose()
-        Activity.instance.Dispose()
-        tracerProvider.Dispose()
-    
-    b.Setup()
-    b.Run()
-    forceCleanup()
+    BenchmarkSwitcher.FromAssembly(typeof<DecentlySizedStandAloneFileBenchmark>.Assembly).Run(args) |> ignore
     0