no metrics in ci

eng/eng.sln

@@ -0,0 +1,35 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DumpPackageRoot", "DumpPackageRoot\DumpPackageRoot.csproj", "{B89EE536-0BE7-2F71-3534-80C865BF7F34}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{881589EE-639B-0A35-DBCE-5D94E4FC90C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tools", "common\internal\Tools.csproj", "{EC3C2A6A-F9C1-3B52-791D-863B6891FEFB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B89EE536-0BE7-2F71-3534-80C865BF7F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B89EE536-0BE7-2F71-3534-80C865BF7F34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B89EE536-0BE7-2F71-3534-80C865BF7F34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B89EE536-0BE7-2F71-3534-80C865BF7F34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC3C2A6A-F9C1-3B52-791D-863B6891FEFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC3C2A6A-F9C1-3B52-791D-863B6891FEFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC3C2A6A-F9C1-3B52-791D-863B6891FEFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC3C2A6A-F9C1-3B52-791D-863B6891FEFB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{EC3C2A6A-F9C1-3B52-791D-863B6891FEFB} = {881589EE-639B-0A35-DBCE-5D94E4FC90C0}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {69994860-C020-43F2-8564-C0EAC60E82FE}
+	EndGlobalSection
+EndGlobal

src/Compiler/Checking/import.fs

@@ -100,7 +100,7 @@ let createTypeSubsumptionCache (g: TcGlobals) =
         | CompilationMode.OneOff ->
             // This is a one-off compilation, so we don't need to worry about eviction.
             { CacheOptions.Default with
-                MaximumCapacity = 4 * 1024
+                MaximumCapacity = 4 * 32768
                 EvictionMethod = EvictionMethod.NoEviction }
         | _ ->
             // Incremental use, so we need to set up the cache with eviction.
@@ -110,7 +110,7 @@ let createTypeSubsumptionCache (g: TcGlobals) =
                 MaximumCapacity = 4 * 32768 }
     Cache.Create<TTypeCacheKey, bool>(options)
 
-let typeSubsumptionCaches = Cache.Create<TcGlobals, Cache<TTypeCacheKey, bool>>({ CacheOptions.Default with MaximumCapacity = 16 })
+let typeSubsumptionCaches = Cache.Create<TcGlobals, Cache<TTypeCacheKey, bool>>({ CacheOptions.Default with MaximumCapacity = 24 })
 
 do typeSubsumptionCaches.ValueEvicted.Add <| _.Dispose()
 

src/Compiler/Utilities/Caches.fs

@@ -70,6 +70,7 @@ type CacheMetrics(cacheId) =
 
     let readings = ConcurrentDictionary<string, int64 ref>()
 
+#if DEBUG
     let listener =
         new MeterListener(
             InstrumentPublished =
@@ -82,6 +83,11 @@ type CacheMetrics(cacheId) =
         listener.SetMeasurementEventCallback<int64>(fun k v _ _ -> Interlocked.Add(readings.GetOrAdd(k.Name, ref 0L), v) |> ignore)
         listener.Start()
 
+    member this.Dispose() = listener.Dispose()
+#else
+    member this.Dispose() = ()
+#endif
+
     member val CacheId = cacheId
 
     member val RecentStats = "-" with get, set
@@ -116,8 +122,6 @@ type CacheMetrics(cacheId) =
         else
             false
 
-    member this.Dispose() = listener.Dispose()
-
     static member GetStats(cacheId) =
         instrumentedCaches[cacheId].TryUpdateStats(false) |> ignore
         instrumentedCaches[cacheId].RecentStats
@@ -342,8 +346,7 @@ module Cache =
     let applyOverride (options: CacheOptions) =
         let capacity =
             match Environment.GetEnvironmentVariable(overrideVariable) with
-            | NonNull _ when options.MaximumCapacity < 100 -> 5
-            | NonNull _ -> 8912
+            | NonNull _ when options.MaximumCapacity > 1024 -> 1024
             | _ -> options.MaximumCapacity
 
         { options with

tests/FSharp.Test.Utilities/XunitHelpers.fs

@@ -130,6 +130,46 @@ type CustomTheoryTestCase =
 
 #endif
 
+
+type OpenTelemetryExport(testRunName, enable) =
+    // On Windows forwarding localhost to wsl2 docker container sometimes does not work. Use IP address instead.
+    let otlpEndpoint = Uri("http://127.0.0.1:4317")
+
+    // Configure OpenTelemetry export. 
+    let providers : IDisposable list =
+        if not enable then [] else
+            [
+            // Configure OpenTelemetry tracing export. Traces can be viewed in Jaeger or other compatible tools.
+            OpenTelemetry.Sdk.CreateTracerProviderBuilder()
+                .AddSource(ActivityNames.FscSourceName)
+                .ConfigureResource(fun r -> r.AddService("F#") |> ignore)
+                .AddOtlpExporter(fun o ->
+                    o.Endpoint <- otlpEndpoint
+                    o.Protocol <- OpenTelemetry.Exporter.OtlpExportProtocol.Grpc
+                    // Empirical values to ensure no traces are lost and no significant delay at the end of test run.
+                    o.TimeoutMilliseconds <- 200
+                    o.BatchExportProcessorOptions.MaxQueueSize <- 16384
+                    o.BatchExportProcessorOptions.ScheduledDelayMilliseconds <- 100
+                )
+                .Build()
+
+            // Configure OpenTelemetry metrics export. Metrics can be viewed in Prometheus or other compatible tools.
+            OpenTelemetry.Sdk.CreateMeterProviderBuilder()
+                .AddMeter(nameof FSharp.Compiler.CacheMetrics)
+                .AddMeter("System.Runtime")
+                .ConfigureResource(fun r -> r.AddService(testRunName) |> ignore)
+                .AddOtlpExporter(fun e m ->
+                    e.Endpoint <- otlpEndpoint
+                    e.Protocol <- OpenTelemetry.Exporter.OtlpExportProtocol.Grpc
+                    m.PeriodicExportingMetricReaderOptions.ExportIntervalMilliseconds <- 1000
+                )
+                .Build()
+            ]
+
+    interface IDisposable with
+        member this.Dispose() =
+            for p in providers do p.Dispose()
+
 /// `XunitTestFramework` providing parallel console support and conditionally enabling optional xUnit customizations.
 type FSharpXunitFramework(sink: IMessageSink) =
     inherit XunitTestFramework(sink)
@@ -150,37 +190,9 @@ type FSharpXunitFramework(sink: IMessageSink) =
                 FSharp.Compiler.Cache.OverrideMaxCapacityForTesting()
 
                 let testRunName = $"RunTests_{assemblyName.Name} {Runtime.InteropServices.RuntimeInformation.FrameworkDescription}"
-
-                // On Windows forwarding localhost to wsl2 docker container sometimes does not work. Use IP address instead.
-                let otlpEndpoint = Uri("http://127.0.0.1:4317")
-
-                // Configure OpenTelemetry export. Traces can be viewed in Jaeger or other compatible tools.
-                use tracerProvider =
-                    OpenTelemetry.Sdk.CreateTracerProviderBuilder()
-                        .AddSource(ActivityNames.FscSourceName)
-                        .ConfigureResource(fun r -> r.AddService("F#") |> ignore)
-                        .AddOtlpExporter(fun o ->
-                            o.Endpoint <- otlpEndpoint
-                            o.Protocol <- OpenTelemetry.Exporter.OtlpExportProtocol.Grpc
-                            // Empirical values to ensure no traces are lost and no significant delay at the end of test run.
-                            o.TimeoutMilliseconds <- 200
-                            o.BatchExportProcessorOptions.MaxQueueSize <- 16384
-                            o.BatchExportProcessorOptions.ScheduledDelayMilliseconds <- 100
-                        )
-                        .Build()
-
-                use meterProvider =
-                    OpenTelemetry.Sdk.CreateMeterProviderBuilder()
-                        .AddMeter(nameof FSharp.Compiler.CacheMetrics)
-                        .AddMeter("System.Runtime")
-                        .ConfigureResource(fun r -> r.AddService(testRunName) |> ignore)
-                        .AddOtlpExporter(fun e m ->
-                            e.Endpoint <- otlpEndpoint
-                            e.Protocol <- OpenTelemetry.Exporter.OtlpExportProtocol.Grpc
-                            m.PeriodicExportingMetricReaderOptions.ExportIntervalMilliseconds <- 1000
-                        )
-                        .Build()
 
+                use _ = new OpenTelemetryExport(testRunName, Environment.GetEnvironmentVariable("FSHARP_OTEL_EXPORT") <> null)   
+
                 logConfig initialConfig
                 log "Installing TestConsole redirection"
                 TestConsole.install()
@@ -192,8 +204,6 @@ type FSharpXunitFramework(sink: IMessageSink) =
                     runner.RunAsync().Wait()
                 end
 
-                tracerProvider.ForceFlush() |> ignore
-
                 cleanUpTemporaryDirectoryOfThisTestRun ()
         }