diff --git a/CHANGELOG.md b/CHANGELOG.md index 9632ead27..595aa94ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h ## [Unreleased](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/compare/v0.7.0...HEAD) +This release is built on top of [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet): + +- [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): + [`1.5.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.5.0) +- `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0) + ### Added - The environment variable `OTEL_DOTNET_AUTO_FAIL_FAST_ENABLED` could be @@ -15,6 +21,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h ### Changed +- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): + [`1.5.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.5.0). - ASP.NET instrumentation no longer requires manual modification of config files to include `TelemetryHttpModule`. - Parameter for `ConfigureTracesOptions` extension point for StackExchangeRedis diff --git a/Directory.Packages.props b/Directory.Packages.props index 0f3bf204d..e5de97d16 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,11 +4,11 @@ - - - - - - + + + + + + diff --git a/docs/README.md b/docs/README.md index 0f0ec843d..54a934fee 100644 --- a/docs/README.md +++ b/docs/README.md @@ -40,7 +40,7 @@ OpenTelemetry .NET Automatic Instrumentation is built on top of [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet): - [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): -[`1.4.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0) +[`1.5.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.5.0) - `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0) referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0) diff --git a/docs/config.md b/docs/config.md index c2e30785d..7084a6fe1 100644 --- a/docs/config.md +++ b/docs/config.md @@ -266,7 +266,7 @@ To enable the OTLP exporter, set the `OTEL_TRACES_EXPORTER`/`OTEL_METRICS_EXPORT environment variable to `otlp`. To customize the OTLP exporter using environment variables, see the -[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables). +[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.5.0/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables). Important environment variables include: | Environment variable | Description | Default value | Status | @@ -314,7 +314,7 @@ The exporter exposes the metrics HTTP endpoint on `http://localhost:9464/metrics and it caches the responses for 300 milliseconds. See the -[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.Prometheus.HttpListener). +[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.5.0-rc.1/src/OpenTelemetry.Exporter.Prometheus.HttpListener). to learn more. ### Zipkin @@ -325,7 +325,7 @@ To enable the Zipkin exporter, set the `OTEL_TRACES_EXPORTER` environment variable to `zipkin`. To customize the Zipkin exporter using environment variables, -see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables). +see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.5.0/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables). Important environment variables include: | Environment variable | Description | Default value | Status | diff --git a/docs/plugins.md b/docs/plugins.md index 3bc90d64f..e75f081ae 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -78,38 +78,38 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |-------------------------------------------------------------------------------------------|---------------------------------------------------|---------------| -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0 | -| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0 | -| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.8 | -| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.14 | -| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.6 | -| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.0.0-rc9.14 | -| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.0.0-rc9.14 | -| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-alpha.2 | -| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.14 | -| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.9 | -| OpenTelemetry.Instrumentation.MySqlData.MySqlDataInstrumentationOptions | OpenTelemetry.Instrumentation.MySqlData | 1.0.0-beta.6 | -| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.9 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.5.0 | +| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.5.0 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.5.0 | +| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.9 | +| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.5.0-beta.1 | +| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.7 | +| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.5.0-beta.1 | +| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.5.0-beta.1 | +| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-alpha.3 | +| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.5.0-beta.1 | +| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.10 | +| OpenTelemetry.Instrumentation.MySqlData.MySqlDataInstrumentationOptions | OpenTelemetry.Instrumentation.MySqlData | 1.0.0-beta.7 | +| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.10 | ### Metrics | Options type | NuGet package | NuGet version | |----------------------------------------------------------------------------------|------------------------------------------------|---------------| -| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.4.0 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0 | -| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0 | -| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.14 | -| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.4.0 | +| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.5.0 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.5.0 | +| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.5.0-rc.1 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.5.0 | +| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.5.0-beta.1 | +| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.5.0 | ### Logs | Options type | NuGet package | NuGet version | |-----------------------------------------------|----------------------------------------------|---------------| -| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.4.0 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0 | +| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.5.0-rc.1 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.5.0 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.5.0 | ## Requirements diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 64929a2dc..d213cbf87 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 7cbf946bd..8ce013f65 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -39,16 +39,16 @@ 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, 0, 0, 8} }, - { L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 0, 0, 8} }, + { L"OpenTelemetry.Instrumentation.AspNet", {1, 0, 0, 9} }, + { L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 0, 0, 9} }, { L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 0, 0, 0} }, { L"OpenTelemetry.Instrumentation.Http", {1, 0, 0, 0} }, - { L"OpenTelemetry.Instrumentation.Process", {0, 5, 0, 2} }, - { L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 2} }, - { L"OpenTelemetry.Instrumentation.Runtime", {1, 4, 0, 0} }, + { L"OpenTelemetry.Instrumentation.Process", {0, 5, 0, 3} }, + { L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 3} }, + { L"OpenTelemetry.Instrumentation.Runtime", {1, 5, 0, 0} }, { L"OpenTelemetry.Instrumentation.SqlClient", {1, 0, 0, 0} }, - { L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 9} }, - { L"OpenTelemetry.ResourceDetectors.Container", {1, 0, 0, 3} }, + { L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 10} }, + { L"OpenTelemetry.ResourceDetectors.Container", {1, 0, 0, 4} }, { L"OpenTelemetry.Shims.OpenTracing", {1, 0, 0, 0} }, { L"OpenTracing", {0, 12, 1, 0} }, { L"System.AppContext", {4, 1, 2, 0} }, diff --git a/test/IntegrationTests/SmokeTests.cs b/test/IntegrationTests/SmokeTests.cs index 45caed1db..e49379578 100644 --- a/test/IntegrationTests/SmokeTests.cs +++ b/test/IntegrationTests/SmokeTests.cs @@ -115,7 +115,7 @@ public class SmokeTests : TestHelper #endif collector.ResourceExpector.Expect("telemetry.sdk.name", "opentelemetry"); collector.ResourceExpector.Expect("telemetry.sdk.language", "dotnet"); - collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute()!.Version); + collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute()!.InformationalVersion.Split('+')[0]); collector.ResourceExpector.Expect("telemetry.auto.version", OpenTelemetry.AutoInstrumentation.Constants.Tracer.Version); EnableOnlyHttpClientTraceInstrumentation(); @@ -134,7 +134,7 @@ public class SmokeTests : TestHelper collector.ResourceExpector.Expect("service.name", ServiceName); collector.ResourceExpector.Expect("telemetry.sdk.name", "opentelemetry"); collector.ResourceExpector.Expect("telemetry.sdk.language", "dotnet"); - collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute()!.Version); + collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute()!.InformationalVersion.Split('+')[0]); collector.ResourceExpector.Expect("telemetry.auto.version", OpenTelemetry.AutoInstrumentation.Constants.Tracer.Version); EnableOnlyHttpClientTraceInstrumentation(); @@ -154,7 +154,7 @@ public class SmokeTests : TestHelper collector.ResourceExpector.Expect("service.name", ServiceName); collector.ResourceExpector.Expect("telemetry.sdk.name", "opentelemetry"); collector.ResourceExpector.Expect("telemetry.sdk.language", "dotnet"); - collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute()!.Version); + collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute()!.InformationalVersion.Split('+')[0]); collector.ResourceExpector.Expect("telemetry.auto.version", OpenTelemetry.AutoInstrumentation.Constants.Tracer.Version); EnableOnlyHttpClientTraceInstrumentation();