Better OTel and use Pull Diagnostics

Author: TheAngryByrd

docker-compose.yml

@@ -0,0 +1,33 @@
+services:
+  seq:
+    profiles:
+      - seq
+    image: datalust/seq
+    ports:
+      - 5341:80 # http and collection
+    environment:
+      - ACCEPT_EULA=Y
+    # http://localhost:5341
+    # OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:5341/ingest/otlp/v1/logs
+    # OTEL_EXPORTER_OTLP_PROTOCOL="http/protobuf"
+    # OTEL_EXPORTER_OTLP_HEADERS="X-Seq-ApiKey=your_api_key"
+  jaeger:
+    profiles:
+      - jaeger
+    image: jaegertracing/all-in-one
+    ports:
+      - 6831:6831/udp
+      - 6832:6832/udp
+      - 5778:5778
+      - 16686:16686
+      - 4317:4317
+      - 4318:4318
+      - 14250:14250
+      - 14268:14268
+      - 14269:14269
+      - 9411:9411
+    environment:
+      - COLLECTOR_ZIPKIN_HTTP_PORT=9411
+      - COLLECTOR_OTLP_ENABLED=true
+    # http://localhost:16686/
+    # OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317

src/FsAutoComplete.Core/CompilerServiceInterface.fs

@@ -1,5 +1,7 @@
 namespace FsAutoComplete
 
+open FsAutoComplete.Utils.Tracing
+open FsAutoComplete.Telemetry
 open System.IO
 open FSharp.Compiler.CodeAnalysis
 open Utils
@@ -14,6 +16,7 @@ open System
 open FsToolkit.ErrorHandling
 open FSharp.Compiler.CodeAnalysis.ProjectSnapshot
 open System.Threading
+open IcedTasks
 
 type Version = int
 
@@ -108,6 +111,8 @@ type FSharpCompilerServiceChecker
       ?transparentCompilerCacheSizes = cacheSize
     )
 
+  let thisType = typeof<FSharpCompilerServiceChecker>
+
   let entityCache = EntityCache()
 
   // FCS can't seem to handle parallel project restores for script files
@@ -337,15 +342,20 @@ type FSharpCompilerServiceChecker
     }
 
   member self.GetProjectSnapshotsFromScript(file: string<LocalPath>, source, tfm: FSIRefs.TFM) =
-    async {
-      try
-        do! scriptLocker.WaitAsync() |> Async.AwaitTask
+    asyncEx {
+      let tags =
+        seq {
+          yield "file", box file
+          yield "tfm", tfm
+        }
+
+      use _trace = Tracing.fsacActivitySource.StartActivityForType(thisType, tags = tags)
+      use! _l = scriptLocker.LockAsync()
+
+      match tfm with
+      | FSIRefs.TFM.NetFx -> return! self.GetNetFxScriptSnapshot(file, source)
+      | FSIRefs.TFM.NetCore -> return! self.GetNetCoreScriptSnapshot(file, source)
 
-        match tfm with
-        | FSIRefs.TFM.NetFx -> return! self.GetNetFxScriptSnapshot(file, source)
-        | FSIRefs.TFM.NetCore -> return! self.GetNetCoreScriptSnapshot(file, source)
-      finally
-        scriptLocker.Release() |> ignore<int>
     }
 
 
@@ -418,15 +428,19 @@ type FSharpCompilerServiceChecker
     }
 
   member self.GetProjectOptionsFromScript(file: string<LocalPath>, source, tfm) =
-    async {
-      try
-        do! scriptLocker.WaitAsync() |> Async.AwaitTask
-
-        match tfm with
-        | FSIRefs.TFM.NetFx -> return! self.GetNetFxScriptOptions(file, source)
-        | FSIRefs.TFM.NetCore -> return! self.GetNetCoreScriptOptions(file, source)
-      finally
-        scriptLocker.Release() |> ignore<int>
+    asyncEx {
+      let tags =
+        seq {
+          yield "file", box file
+          yield "tfm", box tfm
+        }
+
+      use _trace = Tracing.fsacActivitySource.StartActivityForType(thisType, tags = tags)
+      use! _l = scriptLocker.LockAsync()
+
+      match tfm with
+      | FSIRefs.TFM.NetFx -> return! self.GetNetFxScriptOptions(file, source)
+      | FSIRefs.TFM.NetCore -> return! self.GetNetCoreScriptOptions(file, source)
     }
 
 

src/FsAutoComplete.Logging/FsOpenTelemetry.fs

@@ -574,13 +574,15 @@ type ActivityExtensions =
 
       let tags =
         ActivityTagsCollection(
-          [ yield KeyValuePair(SemanticConventions.General.Exceptions.exception_escaped, box escaped)
+          seq {
+            yield KeyValuePair(SemanticConventions.General.Exceptions.exception_escaped, box escaped)
             yield KeyValuePair(SemanticConventions.General.Exceptions.exception_type, box errorType)
 
             if Option.isSome stacktrace then
               yield KeyValuePair(SemanticConventions.General.Exceptions.exception_stacktrace, box stacktrace.Value)
 
-            yield KeyValuePair(SemanticConventions.General.Exceptions.exception_message, box errorMessage) ]
+            yield KeyValuePair(SemanticConventions.General.Exceptions.exception_message, box errorMessage)
+          }
         )
 
       ActivityEvent(SemanticConventions.General.Exceptions.exception_, tags = tags)
@@ -602,11 +604,12 @@ type ActivityExtensions =
 
       let tags =
         ActivityTagsCollection(
-          [ yield KeyValuePair(SemanticConventions.General.Exceptions.exception_escaped, box escaped)
+          seq {
+            yield KeyValuePair(SemanticConventions.General.Exceptions.exception_escaped, box escaped)
             yield KeyValuePair(SemanticConventions.General.Exceptions.exception_type, box exceptionType)
             yield KeyValuePair(SemanticConventions.General.Exceptions.exception_stacktrace, box exceptionStackTrace)
             if not <| String.IsNullOrEmpty(exceptionMessage) then
-              yield KeyValuePair(SemanticConventions.General.Exceptions.exception_message, box exceptionMessage) ]
+              yield KeyValuePair(SemanticConventions.General.Exceptions.exception_message, box exceptionMessage) }
         )
 
       ActivityEvent(SemanticConventions.General.Exceptions.exception_, tags = tags)

src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs

@@ -166,6 +166,10 @@ module CallHierarchyHelpers =
     }
 
 open CallHierarchyHelpers
+// type DiagnosticType =
+//   | FSharp of FSharp.Compiler.Diagnostics.FSharpDiagnostic
+//   | Analyzer of FSharp.Analyzers.SDK.Message
+//   | UnusedOpen
 
 type AdaptiveFSharpLspServer
   (
@@ -2500,7 +2504,38 @@ type AdaptiveFSharpLspServer
 
     override x.TextDocumentDeclaration p = x.logUnimplementedRequest p
 
-    override x.TextDocumentDiagnostic p = x.logUnimplementedRequest p
+    override x.TextDocumentDiagnostic p =
+      asyncResult {
+        let tags = [ "DocumentDiagnosticParams", box p ]
+        use trace = fsacActivitySource.StartActivityForType(thisType, tags = tags)
+
+        try
+          logger.info (
+            Log.setMessage "TextDocumentDiagnostic Request: {params}"
+            >> Log.addContextDestructured "params" p
+          )
+
+          let filePath = p.TextDocument.GetFilePath() |> Utils.normalizePath
+
+          let! diags = state.GetDiagnostics filePath |> AsyncResult.ofStringErr
+
+          return
+            DocumentDiagnosticReport.C1(
+              { Kind = "full"
+                ResultId = None
+                Items = diags
+                RelatedDocuments = None }
+            )
+
+        with e ->
+          trace |> Tracing.recordException e
+
+          let logCfg =
+            Log.setMessage "TextDocumentDiagnostic Request Errored {p}"
+            >> Log.addContextDestructured "p" p
+
+          return! returnException e logCfg
+      }
 
     override x.TextDocumentLinkedEditingRange p = x.logUnimplementedRequest p