Skip to content

Commit

Permalink
Bump OpenTelemetry packages to 1.8.0 releases
Browse files Browse the repository at this point in the history
  • Loading branch information
Kielek committed Apr 5, 2024
1 parent 1103647 commit b0372f0
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 56 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

## [Unreleased](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/compare/v1.4.0..HEAD)

- [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
[`1.8.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.8.0)
- `System.Diagnostics.DiagnosticSource`: [`8.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/8.0.0)

### Added

- .NET only, warning in logs about End of Support date
Expand All @@ -16,16 +20,39 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

### Changed

- Changed supported method parameters for plugins
- from `OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions`
to `OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions`.

#### Dependency updates

- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
[`1.8.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.8.0).
- Following packages updated
- `MongoDB.Driver.Core.Extensions.DiagnosticSources` from `1.3.0` to `1.4.0`.
- `OpenTelemetry.Exporter.Prometheus.HttpListener` from `1.7.0-rc.1` to `1.8.0-rc.1`,
- `OpenTelemetry.Instrumentation.Http` from `1.7.1` to `1.8.0`,
- `OpenTelemetry.Instrumentation.Process` from `0.5.0-beta.4` to `0.5.0-beta.5`,
- `OpenTelemetry.Instrumentation.Quartz` from `1.0.0-beta.1` to `1.0.0-beta.2`,
- `OpenTelemetry.Instrumentation.Runtime` from `1.7.0` to `1.8.0`,
- `OpenTelemetry.Instrumentation.SqlClient` from `1.7.0-beta.1` to `1.8.0-beta.1`,
- `OpenTelemetry.Instrumentation.StackExchangeRedis` from `1.0.0-rc9.14` to `1.0.0-rc9.14`,
- `OpenTelemetry.Instrumentation.Wcf` from `1.0.0-rc.15` to `1.0.0-rc.16`,
- `OpenTelemetry.ResourceDetectors.Azure` from `1.0.0-beta.5` to `1.0.0-beta.6`,
- `OpenTelemetry.ResourceDetectors.Host` from `0.1.0-alpha.2` to `0.1.0-alpha.3`.
- `OpenTelemetry.ResourceDetectors.Process` from `0.1.0-alpha.2` to `0.1.0-alpha.3`.
- `OpenTelemetry.ResourceDetectors.ProcessRuntime` from `0.1.0-alpha.2` to `0.1.0-alpha.3`.
- .NET only, following packages updated
- `OpenTelemetry.Instrumentation.AspNetCore` from `1.7.1` to `1.8.0`,
- `OpenTelemetry.Instrumentation.EntityFrameworkCore` from `1.0.0-beta.10` to `1.0.0-beta.11`,
- `OpenTelemetry.ResourceDetectors.Container` from `1.0.0-beta.6` to `1.0.0-beta.7`.
- .NET Framework only, following packages updated
- `Google.Protobuf` updated from `3.25.2` to `3.26.1`,
- `Grpc.Core.Api` from `2.60.0` to `2.62.0`,
- `Microsoft.Extensions.DependencyInjection.Abstractions` from `8.0.0` to `8.0.1`,
- `Microsoft.Extensions.Options` from `8.0.1` to `8.0.2`,
- `Microsoft.Extensions.Logging.Abstractions` from `8.0.0` to `8.0.1`,
- `OpenTelemetry.Instrumentation.AspNet` from `1.7.0-beta.2` to `1.8.0-beta.1`,
- `System.Text.Json` from `8.0.1` to `8.0.3`.

### Deprecated
Expand Down
12 changes: 6 additions & 6 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<!-- Referencing Microsoft.SourceLink.GitHub directly is the workaround for lack of release DotNet.ReproducibleBuilds with 8.0.0 deoendencies. Ref: https://github.com/dotnet/reproducible-builds/pull/35 -->
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="MinVer" Version="5.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.15" />
<PackageVersion Include="OpenTelemetry" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.0.0-rc.16" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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.7.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.7.0)
[`1.8.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.8.0)
- `System.Diagnostics.DiagnosticSource`: [`8.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/8.0.0)
referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0)

Expand Down
42 changes: 21 additions & 21 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,37 +108,37 @@ public class MyPlugin

| Options type | NuGet package | NuGet version |
|-------------------------------------------------------------------------------------------|---------------------------------------------------|---------------|
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.7.0 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.7.0 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.7.0 |
| OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.7.0-beta.2 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.7.1 |
| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.10 |
| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.7.0-beta.1 |
| OpenTelemetry.Instrumentation.Http.HttpClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.7.1 |
| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-beta.1 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.7.0-beta.1 |
| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.13 |
| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.15 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.8.0 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.8.0 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.8.0 |
| OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.8.0-beta.1 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.8.0 |
| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.11 |
| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.8.0-beta.1 |
| OpenTelemetry.Instrumentation.Http.HttpClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.8.0 |
| OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-beta.2 |
| OpenTelemetry.Instrumentation.SqlClient.SqlClientTraceInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.8.0-beta.1 |
| OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.14 |
| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.16 |

### Metrics

| Options type | NuGet package | NuGet version |
|--------------------------------------------------------------------------|------------------------------------------------|---------------|
| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.7.0 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.7.0 |
| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.7.0-rc.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.7.0 |
| OpenTelemetry.Instrumentation.AspNet.AspNetMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.7.0-beta.1 |
| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.7.0 |
| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.8.0 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.8.0 |
| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.8.0-rc.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.8.0 |
| OpenTelemetry.Instrumentation.AspNet.AspNetMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.8.0-beta.1 |
| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.8.0 |

### Logs

| Options type | NuGet package | NuGet version |
|-----------------------------------------------|----------------------------------------------|---------------|
| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.7.0 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.7.0 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.7.0 |
| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.8.0 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.8.0 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.8.0 |

## Requirements

Expand Down
35 changes: 18 additions & 17 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
<!-- Versions from OpenTelemetry.AutoInstrumentation.csproj -->
<ItemGroup>
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.7.0-rc.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Propagators" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNet" Version="1.7.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.10" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.7.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.8.0-rc.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Propagators" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNet" Version="1.8.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-beta.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.8.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
<PackageVersion Include="OpenTelemetry.Shims.OpenTracing" Version="1.7.0-beta.1" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Azure" Version="1.0.0-beta.5" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.6" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Host" Version="0.1.0-alpha.2" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Process" Version="0.1.0-alpha.2" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.ProcessRuntime" Version="0.1.0-alpha.2" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Azure" Version="1.0.0-beta.6" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.7" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Host" Version="0.1.0-alpha.3" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.Process" Version="0.1.0-alpha.3" />
<PackageVersion Include="OpenTelemetry.ResourceDetectors.ProcessRuntime" Version="0.1.0-alpha.3" />
</ItemGroup>
<!-- Versions from SourceGenerators.csproj -->
<ItemGroup>
Expand Down Expand Up @@ -71,6 +71,7 @@
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
{ L"Microsoft.Extensions.Configuration.Binder", {8, 0, 0, 1} },
{ L"Microsoft.Extensions.DependencyInjection", {8, 0, 0, 0} },
{ L"Microsoft.Extensions.DependencyInjection.Abstractions", {8, 0, 0, 1} },
{ L"Microsoft.Extensions.Diagnostics.Abstractions", {8, 0, 0, 0} },
{ L"Microsoft.Extensions.Logging", {8, 0, 0, 0} },
{ L"Microsoft.Extensions.Logging.Abstractions", {8, 0, 0, 1} },
{ L"Microsoft.Extensions.Logging.Configuration", {8, 0, 0, 0} },
Expand All @@ -44,19 +45,19 @@ 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, 7, 0, 2} },
{ L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 7, 0, 2} },
{ L"OpenTelemetry.Instrumentation.AspNet", {1, 8, 0, 1} },
{ L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 8, 0, 1} },
{ L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Http", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Process", {0, 5, 0, 4} },
{ L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 1} },
{ L"OpenTelemetry.Instrumentation.Runtime", {1, 7, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Process", {0, 5, 0, 5} },
{ L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 2} },
{ L"OpenTelemetry.Instrumentation.Runtime", {1, 8, 0, 0} },
{ L"OpenTelemetry.Instrumentation.SqlClient", {1, 0, 0, 0} },
{ L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 15} },
{ L"OpenTelemetry.ResourceDetectors.Azure", {1, 0, 0, 5} },
{ L"OpenTelemetry.ResourceDetectors.Host", {0, 1, 0, 2} },
{ L"OpenTelemetry.ResourceDetectors.Process", {0, 1, 0, 2} },
{ L"OpenTelemetry.ResourceDetectors.ProcessRuntime", {0, 1, 0, 2} },
{ L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 16} },
{ L"OpenTelemetry.ResourceDetectors.Azure", {1, 0, 0, 6} },
{ L"OpenTelemetry.ResourceDetectors.Host", {0, 1, 0, 3} },
{ L"OpenTelemetry.ResourceDetectors.Process", {0, 1, 0, 3} },
{ L"OpenTelemetry.ResourceDetectors.ProcessRuntime", {0, 1, 0, 3} },
{ L"OpenTelemetry.Shims.OpenTracing", {1, 0, 0, 0} },
{ L"OpenTracing", {0, 12, 1, 0} },
{ L"System.AppContext", {4, 1, 2, 0} },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private void InitializeOnFirstCall(ILifespanManager lifespanManager)

var instrumentationType = Type.GetType("OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentation, OpenTelemetry.Instrumentation.AspNet");

var options = new OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions();
var options = new OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions();
_pluginManager.ConfigureTracesOptions(options);

var instrumentation = Activator.CreateInstance(instrumentationType, args: options);
Expand Down
Loading

0 comments on commit b0372f0

Please sign in to comment.