[Instrumentation.Runtime] Prefer the built-in runtime metrics for .NET 9 targets.

src/OpenTelemetry.Instrumentation.Runtime/.publicApi/net8.0/PublicAPI.Shipped.txt

@@ -0,0 +1,6 @@
+#nullable enable
+OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions
+OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions.RuntimeInstrumentationOptions() -> void
+OpenTelemetry.Metrics.MeterProviderBuilderExtensions
+static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddRuntimeInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions!>? configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
+static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddRuntimeInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder) -> OpenTelemetry.Metrics.MeterProviderBuilder!

src/OpenTelemetry.Instrumentation.Runtime/.publicApi/net9.0/PublicAPI.Shipped.txt

@@ -0,0 +1 @@
+#nullable enable

src/OpenTelemetry.Instrumentation.Runtime/.publicApi/net9.0/PublicAPI.Unshipped.txt

@@ -0,0 +1,3 @@
+#nullable enable
+OpenTelemetry.Metrics.MeterProviderBuilderExtensions
+static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddRuntimeInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder) -> OpenTelemetry.Metrics.MeterProviderBuilder!

src/OpenTelemetry.Instrumentation.Runtime/.publicApi/netstandard2.0/PublicAPI.Shipped.txt

@@ -0,0 +1,6 @@
+#nullable enable
+OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions
+OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions.RuntimeInstrumentationOptions() -> void
+OpenTelemetry.Metrics.MeterProviderBuilderExtensions
+static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddRuntimeInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder, System.Action<OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions!>? configure) -> OpenTelemetry.Metrics.MeterProviderBuilder!
+static OpenTelemetry.Metrics.MeterProviderBuilderExtensions.AddRuntimeInstrumentation(this OpenTelemetry.Metrics.MeterProviderBuilder! builder) -> OpenTelemetry.Metrics.MeterProviderBuilder!

src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md

@@ -8,6 +8,9 @@
 * Updated OpenTelemetry core component version(s) to `1.10.0`.
   ([#2317](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2317))
 
+* Prefer built-in .NET runtime metrics for .NET 9 and greater.
+  ([#2339](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2339))
+
 ## 1.9.0
 
 Released 2024-Jun-18

src/OpenTelemetry.Instrumentation.Runtime/MeterProviderBuilderExtensions.cs

@@ -1,8 +1,10 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#if !NET9_0_OR_GREATER
 using OpenTelemetry.Instrumentation.Runtime;
 using OpenTelemetry.Internal;
+#endif
 
 namespace OpenTelemetry.Metrics;
 
@@ -11,15 +13,24 @@ namespace OpenTelemetry.Metrics;
 /// </summary>
 public static class MeterProviderBuilderExtensions
 {
+#if NET9_0_OR_GREATER
+    private const string DotNetRuntimeMeterName = "System.Runtime";
+#endif
+
     /// <summary>
     /// Enables runtime instrumentation.
     /// </summary>
     /// <param name="builder"><see cref="MeterProviderBuilder"/> being configured.</param>
     /// <returns>The instance of <see cref="MeterProviderBuilder"/> to chain the calls.</returns>
     public static MeterProviderBuilder AddRuntimeInstrumentation(
         this MeterProviderBuilder builder) =>
+#if NET9_0_OR_GREATER
+        builder.AddMeter(DotNetRuntimeMeterName);
+#else
         AddRuntimeInstrumentation(builder, configure: null);
+#endif
 
+#if !NET9_0_OR_GREATER
     /// <summary>
     /// Enables runtime instrumentation.
     /// </summary>
@@ -39,4 +50,5 @@ public static MeterProviderBuilder AddRuntimeInstrumentation(
         builder.AddMeter(RuntimeMetrics.MeterInstance.Name);
         return builder.AddInstrumentation(() => instrumentation);
     }
+#endif
 }

src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>$(NetMinimumSupportedVersion);$(NetStandardMinimumSupportedVersion);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
+    <TargetFrameworks>$(NetMinimumSupportedVersion);$(NetStandardMinimumSupportedVersion);$(NetFrameworkMinimumSupportedVersion);net9.0</TargetFrameworks>
     <Description>.NET runtime instrumentation for OpenTelemetry .NET.</Description>
     <PackageTags>$(PackageTags);runtime</PackageTags>
     <MinVerTagPrefix>Instrumentation.Runtime-</MinVerTagPrefix>
@@ -13,9 +13,14 @@
     <PackageReference Include="OpenTelemetry.Api" Version="$(OpenTelemetryCoreLatestVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="$(RepoRoot)\src\Shared\AssemblyVersionExtensions.cs" Link="Includes\AssemblyVersionExtensions.cs" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
     <Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\AssemblyVersionExtensions.cs" Link="Includes\AssemblyVersionExtensions.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <Compile Remove="RuntimeMetrics.cs" />
+    <Compile Remove="RuntimeInstrumentationOptions.cs" />
   </ItemGroup>
 
 </Project>

src/OpenTelemetry.Instrumentation.Runtime/README.md

@@ -48,6 +48,12 @@ to the application.
 
 ## Metrics
 
+> [!NOTE]
+> .NET 9 introduced built-in runtime metrics. As such, when applications target
+.NET 9 or greater this package registers a `Meter` to receive the built-in metrics.
+See the [Microsoft documentation](https://learn.microsoft.com/en-us/dotnet/core/diagnostics/built-in-metrics-runtime)
+ for details of the metric and attribute names for the built-in metrics.
+
 ### GC related metrics
 
 #### process.runtime.dotnet.**gc.collections.count**

test/OpenTelemetry.Instrumentation.Runtime.Tests/RuntimeMetricsTests.cs

@@ -32,12 +32,21 @@ public void RuntimeMetricsAreCaptured()
         meterProvider.ForceFlush(MaxTimeToAllowForFlush);
         Assert.True(exportedItems.Count > 1);
 
+#if NET9_0_OR_GREATER
+        var assembliesCountMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.assembly.count");
+        Assert.NotNull(assembliesCountMetric);
+
+        var exceptionsCountMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.exceptions");
+        Assert.NotNull(exceptionsCountMetric);
+        Assert.True(GetValue(exceptionsCountMetric) >= 1);
+#else
         var assembliesCountMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.assemblies.count");
         Assert.NotNull(assembliesCountMetric);
 
         var exceptionsCountMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.exceptions.count");
         Assert.NotNull(exceptionsCountMetric);
         Assert.True(GetValue(exceptionsCountMetric) >= 1);
+#endif
     }
 
     [Fact]
@@ -53,13 +62,23 @@ public void GcMetricsTest()
 
         meterProvider.ForceFlush(MaxTimeToAllowForFlush);
 
+#if NET9_0_OR_GREATER
+        // We don't need to test all metrics here as those are tested in the runtime.
+        // This is sufficient to validate that the runtime metrics are enabled.
+        var gcCountMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.gc.collections");
+        Assert.NotNull(gcCountMetric);
+
+        var totalObjectsSize = exportedItems.FirstOrDefault(i => i.Name == "dotnet.gc.heap.total_allocated");
+        Assert.NotNull(totalObjectsSize);
+#else
         var gcCountMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.gc.collections.count");
         Assert.NotNull(gcCountMetric);
 
         var totalObjectsSize = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.gc.objects.size");
         Assert.NotNull(totalObjectsSize);
+#endif
 
-#if NET
+#if NET8_0
 
         var gcAllocationSizeMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.gc.allocations.size");
         Assert.NotNull(gcAllocationSizeMetric);
@@ -93,6 +112,16 @@ public void JitRelatedMetricsTest()
 
         meterProvider.ForceFlush(MaxTimeToAllowForFlush);
 
+#if NET9_0_OR_GREATER
+        var jitCompiledSizeMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.jit.compiled_il.size");
+        Assert.NotNull(jitCompiledSizeMetric);
+
+        var jitMethodsCompiledCountMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.jit.compiled_methods");
+        Assert.NotNull(jitMethodsCompiledCountMetric);
+
+        var jitCompilationTimeMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.jit.compilation.time");
+        Assert.NotNull(jitCompilationTimeMetric);
+#else
         var jitCompiledSizeMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.jit.il_compiled.size");
         Assert.NotNull(jitCompiledSizeMetric);
 
@@ -101,6 +130,7 @@ public void JitRelatedMetricsTest()
 
         var jitCompilationTimeMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.jit.compilation_time");
         Assert.NotNull(jitCompilationTimeMetric);
+#endif
     }
 
     [Fact]
@@ -124,6 +154,15 @@ public async Task ThreadingRelatedMetricsTest()
 
         meterProvider.ForceFlush(MaxTimeToAllowForFlush);
 
+#if NET9_0_OR_GREATER
+        // We don't need to test all metrics here as those are tested in the runtime.
+        // This is sufficient to validate that the runtime metrics are enabled.
+        var lockContentionCountMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.monitor.lock_contentions");
+        Assert.NotNull(lockContentionCountMetric);
+
+        var threadCountMetric = exportedItems.FirstOrDefault(i => i.Name == "dotnet.thread_pool.thread.count");
+        Assert.NotNull(threadCountMetric);
+#else
         var lockContentionCountMetric = exportedItems.FirstOrDefault(i => i.Name == "process.runtime.dotnet.monitor.lock_contention.count");
         Assert.NotNull(lockContentionCountMetric);
 
@@ -166,6 +205,7 @@ static void TimerCallback(object? _)
                 timers[i].Dispose();
             }
         }
+#endif
     }
 #endif