From e7ffc73ee6f04d88f1d29b1dc847ededf2873222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Fri, 6 Dec 2024 12:53:41 +0100 Subject: [PATCH] Bump OpenTelemetry.Instrumentation.Runtime to 1.10.0 --- CHANGELOG.md | 3 ++- docs/config.md | 2 +- docs/plugins.md | 2 +- src/Directory.Packages.props | 2 +- .../netfx_assembly_redirection.h | 2 +- test/IntegrationTests/RuntimeTests.cs | 4 ++++ 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab89bcb526..f6937e9610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h - `Microsoft.Extensions.Configuration.Binder` from `8.0.2` to `9.0.0`, - `Microsoft.Extensions.Logging.Configuration` from `8.0.0` to `9.0.0`, - `OpenTelemetry.Exporter.Prometheus.HttpListener` from `1.9.0-beta.2` to `1.10.0-beta.1`, - - `OpenTelemetry.Instrumentation.Http` from `1.9.0` to `1.10.0`. + - `OpenTelemetry.Instrumentation.Http` from `1.9.0` to `1.10.0`, + - `OpenTelemetry.Instrumentation.Runtime` from `1.9.0` to `1.10.0`. - .NET only, following packages updated - `System.Diagnostics.DiagnosticSource` from `8.0.0` to `9.0.0`. - .NET Framework only, following packages updated diff --git a/docs/config.md b/docs/config.md index 8523d4f662..d6fe522271 100644 --- a/docs/config.md +++ b/docs/config.md @@ -186,7 +186,7 @@ due to lack of stable semantic convention. | `ASPNET` | ASP.NET Framework \[1\] **Not supported on .NET** | [ASP.NET metrics](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.AspNet-1.9.0-beta.1/src/OpenTelemetry.Instrumentation.AspNet/README.md#list-of-metrics-produced) | * | source & bytecode | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | | `ASPNETCORE` | ASP.NET Core **Not supported on .NET Framework** | [ASP.NET Core metrics](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.AspNetCore-1.9.0/src/OpenTelemetry.Instrumentation.AspNetCore/README.md#list-of-metrics-produced) | * | source | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | | `HTTPCLIENT` | [System.Net.Http.HttpClient](https://docs.microsoft.com/dotnet/api/system.net.http.httpclient) and [System.Net.HttpWebRequest](https://docs.microsoft.com/dotnet/api/system.net.httpwebrequest) | [HttpClient metrics](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Http-1.10.0/src/OpenTelemetry.Instrumentation.Http/README.md#list-of-metrics-produced) | * | source | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | -| `NETRUNTIME` | [OpenTelemetry.Instrumentation.Runtime](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) | [Runtime metrics](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Runtime-1.9.0/src/OpenTelemetry.Instrumentation.Runtime/README.md#metrics) | * | source | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | +| `NETRUNTIME` | [OpenTelemetry.Instrumentation.Runtime](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) | [Runtime metrics](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Runtime-1.10.0/src/OpenTelemetry.Instrumentation.Runtime/README.md#metrics) | * | source | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | | `PROCESS` | [OpenTelemetry.Instrumentation.Process](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Process) | [Process metrics](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/Instrumentation.Process-0.5.0-beta.7/src/OpenTelemetry.Instrumentation.Process/README.md#metrics) | * | source | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | | `NSERVICEBUS` | [NServiceBus](https://www.nuget.org/packages/NServiceBus) | [NServiceBus metrics](https://docs.particular.net/samples/open-telemetry/prometheus-grafana/#reporting-metric-values) | ≥8.0.0 & < 10.0.0 | source & bytecode | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | diff --git a/docs/plugins.md b/docs/plugins.md index 364a939ea5..2d6946b626 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -136,7 +136,7 @@ public class MyPlugin | OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.10.0-beta.1 | | OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.10.0 | | OpenTelemetry.Instrumentation.AspNet.AspNetMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.9.0-beta.1 | -| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.9.0 | +| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.10.0 | ### Logs diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 53f80188a7..df217c5064 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -22,7 +22,7 @@ - + diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index f61bcfd5b7..fe2bcbc451 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -51,7 +51,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Instrumentation.Http", {1, 10, 0, 248} }, { L"OpenTelemetry.Instrumentation.Process", {0, 5, 0, 176} }, { L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 50} }, - { L"OpenTelemetry.Instrumentation.Runtime", {1, 9, 0, 57} }, + { L"OpenTelemetry.Instrumentation.Runtime", {1, 10, 0, 257} }, { L"OpenTelemetry.Instrumentation.SqlClient", {1, 9, 0, 43} }, { L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 214} }, { L"OpenTelemetry.Resources.Azure", {1, 0, 0, 172} }, diff --git a/test/IntegrationTests/RuntimeTests.cs b/test/IntegrationTests/RuntimeTests.cs index 7362b4a487..b58201f5e6 100644 --- a/test/IntegrationTests/RuntimeTests.cs +++ b/test/IntegrationTests/RuntimeTests.cs @@ -21,7 +21,11 @@ public void SubmitMetrics() { using var collector = new MockMetricsCollector(Output); SetExporter(collector); +#if NET9_0_OR_GREATER + collector.Expect("System.Runtime"); +#else collector.Expect("OpenTelemetry.Instrumentation.Runtime"); +#endif using var process = StartTestApplication(); try