From c2975507c0b90079907c56a57d61668b127f70a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Mon, 9 Dec 2024 09:50:58 +0100 Subject: [PATCH] Bump contrib packages to 1.10.0(-beta.1) --- CHANGELOG.md | 16 +++++++++++- Directory.Packages.props | 2 +- docs/config.md | 18 ++++++------- docs/plugins.md | 16 ++++++------ src/Directory.Packages.props | 26 +++++++++---------- .../netfx_assembly_redirection.h | 22 ++++++++-------- 6 files changed, 57 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6937e9610..1886b6f1d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,9 +29,22 @@ 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.GrpcNetClient` from `1.9.0-beta.1` to `1.10.0-beta.1` - `OpenTelemetry.Instrumentation.Http` from `1.9.0` to `1.10.0`, - - `OpenTelemetry.Instrumentation.Runtime` from `1.9.0` to `1.10.0`. + - `OpenTelemetry.Instrumentation.Process` from `0.5.0-beta.7` to `1.10.0-beta.1`, + - `OpenTelemetry.Instrumentation.Quartz` from `1.0.0-beta.3` to `1.10.0-beta.1`, + - `OpenTelemetry.Instrumentation.Runtime` from `1.9.0` to `1.10.0`, + - `OpenTelemetry.Instrumentation.Wcf` from `1.0.0-rc.18` to `1.10.0-beta.1`, + - `OpenTelemetry.Resources.Azure` from `1.0.0-beta.9` to `1.10.0-beta.1`, + - `OpenTelemetry.Resources.Container` from `1.0.0-beta.9` to `1.10.0-beta.1`, + - `OpenTelemetry.Resources.Host` from `0.1.0-beta.3` to `1.10.0-beta.1`, + - `OpenTelemetry.Resources.OperatingSystem` from `0.1.0-alpha.4` to `1.10.0-beta.1`, + - `OpenTelemetry.Resources.Process` from `0.1.0-beta.3` to `1.10.0-beta.1`, + - `OpenTelemetry.Resources.ProcessRuntime` from `0.1.0-beta.2` to `1.10.0-beta.1`. - .NET only, following packages updated + - `OpenTelemetry.Instrumentation.AspNetCore` from `1.9.0` to `1.10.0`, + - `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.0.0-beta.12` to `1.10.0-beta.1`, + - `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.9.0-beta.1` to `1.10.0-beta.1`, - `System.Diagnostics.DiagnosticSource` from `8.0.0` to `9.0.0`. - .NET Framework only, following packages updated - `Google.Protobuf` updated from `3.28.3` to `3.29.1`, @@ -45,6 +58,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h - `Microsoft.Extensions.Options` from `8.0.2` to `9.0.0`, - `Microsoft.Extensions.Options.ConfigurationExtensions` from `8.0.0` to `9.0.0`, - `Microsoft.Extensions.Primitives` from `8.0.0` to `9.0.0`, + - `OpenTelemetry.Instrumentation.AspNet` from `1.9.0-beta.1` to `1.10.0-beta.1`, - `System.Buffers` from `4.5.5` to `4.6.0`, - `System.Memory` from `4.5.5` to `4.6.0`, - `System.Numerics.Vectors` from `4.5.0` to `4.6.0`, diff --git a/Directory.Packages.props b/Directory.Packages.props index f765f9beb9..5c5de554a5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,6 +11,6 @@ - + diff --git a/docs/config.md b/docs/config.md index d6fe522271..3bf904fe5e 100644 --- a/docs/config.md +++ b/docs/config.md @@ -181,14 +181,14 @@ due to lack of stable semantic convention. Metrics are stable, but particular instrumentation are in Experimental status due to lack of stable semantic convention. -| ID | Instrumented library | Documentation | Supported versions | Instrumentation type | Status | -|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|----------------------|-----------------------------------------------------------------------------------------------------------------------------------| -| `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.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) | +| ID | Instrumented library | Documentation | Supported versions | Instrumentation type | Status | +|---------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|----------------------|-----------------------------------------------------------------------------------------------------------------------------------| +| `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.10.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.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-1.10.0-beta.1/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) | \[1\]: The ASP.NET metrics are generated only if the `AspNet` trace instrumentation is also enabled. @@ -199,7 +199,7 @@ due to lack of stable semantic convention. | ID | Instrumented library | Supported versions | Instrumentation type | Status | |-----------|---------------------------------------------------------------------------------------------------------------------------------|--------------------|------------------------|-----------------------------------------------------------------------------------------------------------------------------------| -| `ILOGGER` | [Microsoft.Extensions.Logging](https://www.nuget.org/packages/Microsoft.Extensions.Logging) **Not supported on .NET Framework** | ≥8.0.0 | bytecode or source [1] | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | +| `ILOGGER` | [Microsoft.Extensions.Logging](https://www.nuget.org/packages/Microsoft.Extensions.Logging) **Not supported on .NET Framework** | ≥9.0.0 | bytecode or source [1] | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) | **[1]**: For ASP.NET Core applications, the `LoggingBuilder` instrumentation can be enabled without using the .NET CLR Profiler by setting diff --git a/docs/plugins.md b/docs/plugins.md index 2d6946b626..b514504fab 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -117,15 +117,15 @@ public class MyPlugin | OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.10.0 | | OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.10.0 | | OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.10.0 | -| OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.9.0-beta.1 | -| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.9.0 | -| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.11 | -| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.9.0-beta.1 | +| OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.10.0-beta.1 | +| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.10.0 | +| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.10.0-beta.1 | +| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.10.0-beta.1 | | OpenTelemetry.Instrumentation.Http.HttpClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.10.0 | -| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-beta.3 | +| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.10.0-beta.1 | | OpenTelemetry.Instrumentation.SqlClient.SqlClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.9.0-beta.1 | -| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.9.0-beta.1 | -| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.18 | +| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.10.0-beta.1 | +| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.10.0-beta.1 | ### Metrics @@ -135,7 +135,7 @@ public class MyPlugin | OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.10.0 | | 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.AspNet.AspNetMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.10.0-beta.1 | | OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.10.0 | ### Logs diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index df217c5064..d406396f8f 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -16,22 +16,22 @@ - - - - - - + + + + + + - + - - - - - - + + + + + + diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index fe2bcbc451..967ec689db 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -45,20 +45,20 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Exporter.Prometheus.HttpListener", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.Zipkin", {1, 0, 0, 0} }, { L"OpenTelemetry.Extensions.Propagators", {1, 0, 0, 0} }, - { L"OpenTelemetry.Instrumentation.AspNet", {1, 9, 0, 46} }, - { L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 9, 0, 46} }, - { L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 9, 0, 44} }, + { L"OpenTelemetry.Instrumentation.AspNet", {1, 10, 0, 262} }, + { L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 10, 0, 262} }, + { L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 10, 0, 264} }, { 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.Process", {1, 10, 0, 265} }, + { L"OpenTelemetry.Instrumentation.Quartz", {1, 10, 0, 266} }, { 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} }, - { L"OpenTelemetry.Resources.Host", {0, 1, 0, 139} }, - { L"OpenTelemetry.Resources.OperatingSystem", {0, 1, 0, 152} }, - { L"OpenTelemetry.Resources.Process", {0, 1, 0, 175} }, - { L"OpenTelemetry.Resources.ProcessRuntime", {0, 1, 0, 56} }, + { L"OpenTelemetry.Instrumentation.Wcf", {1, 10, 0, 269} }, + { L"OpenTelemetry.Resources.Azure", {1, 10, 0, 270} }, + { L"OpenTelemetry.Resources.Host", {1, 10, 0, 272} }, + { L"OpenTelemetry.Resources.OperatingSystem", {1, 10, 0, 273} }, + { L"OpenTelemetry.Resources.Process", {1, 10, 0, 274} }, + { L"OpenTelemetry.Resources.ProcessRuntime", {1, 10, 0, 275} }, { L"OpenTelemetry.Shims.OpenTracing", {1, 0, 0, 0} }, { L"OpenTracing", {0, 12, 1, 0} }, { L"System.AppContext", {4, 1, 2, 0} },