Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump OTel Core packages to 1.11.* #3986

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Bump OTel Core packages to 1.11.* #3986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

#### Dependency updates

- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components):
[`1.11.1`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.11.1).
- .NET Framework only, following packages updated
- `Google.Protobuf` updated from `3.29.1` to `3.29.3`,
- `Microsoft.Bcl.AsyncInterfaces` updated from `9.0.0` to `9.0.1`,
- `Microsoft.Extensions.Configuration` updated from `9.0.0` to `9.0.1`,
- `Microsoft.Extensions.Configuration.Abstractions` updated from `9.0.0` to `9.0.1`,
Expand All @@ -31,6 +32,15 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

### Removed

#### Dependency removals

- Following packages removed
- `Google.Protobuf`.
- .NET only, following packages removed
- `Grpc.Core.Api`.
- `Grpc.Net.Client`.
- `Grpc.Net.Common.dll`.

### Fixed

## [1.10.0-beta.1](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.10.0-beta.1)
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
<PackageVersion Include="log4net" Version="3.0.3" />
<PackageVersion Include="MinVer" Version="6.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Wcf" Version="1.10.0-beta.1" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,6 @@ OpenTelemetry .NET Automatic Instrumentation components
OpenTelemetry .NET Automatic Instrumentation project contains components with
separate copyright notices and license terms:

Library Google.Protobuf is under the following copyright:
Copyright 2008 Google Inc. All rights reserved under BSD-3-Clause license
(<https://github.com/protocolbuffers/protobuf/blob/main/LICENSE>).

Libraries

- Google.Protobuf,
- Grpc.Net.Client
- Grpc.Net.Common,
are under the following copyright:
Copyright 2019 The gRPC Authors under Apache License Version 2.0
(<https://github.com/grpc/grpc-dotnet/blob/master/LICENSE>).

Libraries

- OpenTelemetry
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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.10.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.10.0)
[`1.11.1`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.10.0)
- `System.Diagnostics.DiagnosticSource`: [`9.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/9.0.0)
referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0)

Expand Down
20 changes: 10 additions & 10 deletions docs/plugins.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ public class MyPlugin

| Options type | NuGet package | NuGet version |
|-------------------------------------------------------------------------------------------|---------------------------------------------------|---------------|
| 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.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.11.1 |
| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.11.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.11.1 |
| OpenTelemetry.Instrumentation.AspNet.AspNetTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.10.0-beta.1 |
| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreTraceInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.10.1 |
| OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.10.0-beta.1 |
Expand All @@ -131,20 +131,20 @@ public class MyPlugin

| Options type | NuGet package | NuGet version |
|--------------------------------------------------------------------------|------------------------------------------------|---------------|
| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.10.0 |
| 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.Metrics.MetricReaderOptions | OpenTelemetry | 1.11.1 |
| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.11.1 |
| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.11.0-beta.1 |
| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.11.1 |
| OpenTelemetry.Instrumentation.AspNet.AspNetMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.10.0-beta.1 |
| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.10.0 |

### Logs

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

## Requirements

Expand Down
10 changes: 4 additions & 6 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</ItemGroup>
<!-- Versions from OpenTelemetry.AutoInstrumentation.csproj -->
<ItemGroup>
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Propagators" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.11.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Propagators" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNet" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.10.0-beta.1" />
Expand All @@ -24,7 +24,7 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Shims.OpenTracing" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Shims.OpenTracing" Version="1.11.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Azure" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Container" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Resources.Host" Version="1.10.0-beta.1" />
Expand All @@ -46,8 +46,6 @@
<PackageVersion Include="System.Windows.Extensions" Version="4.7.0" />
</ItemGroup>
<ItemGroup Label="Transient dependencies auto-generated by GenerateNetFxTransientDependencies">
<PackageVersion Include="Google.Protobuf" Version="3.29.3" />
<PackageVersion Include="Grpc" Version="2.46.6" />
<PackageVersion Include="Grpc.Core" Version="2.46.6" />
<PackageVersion Include="Grpc.Core.Api" Version="2.67.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
Expand Down
1 change: 0 additions & 1 deletion src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap()
const USHORT auto_major = atoi(AUTO_MAJOR);

assembly_version_redirect_map_.insert({
{ L"Google.Protobuf", {3, 29, 3, 0} },
{ L"Grpc.Core", {2, 0, 0, 0} },
{ L"Grpc.Core.Api", {2, 0, 0, 0} },
{ L"Microsoft.Bcl.AsyncInterfaces", {9, 0, 0, 1} },
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@

<ItemGroup Label="Transient dependencies auto-generated by GenerateNetFxTransientDependencies" Condition=" '$(TargetFramework)' == 'net462' AND $(_IsPacking) != true ">
<!-- These dependencies are also not included in the NuGet package since the conflicts can be left to NuGet version resolution. -->
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Grpc" />
<PackageReference Include="Grpc.Core" />
<PackageReference Include="Grpc.Core.Api" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
Expand Down Expand Up @@ -90,4 +88,6 @@
<PackageReference Include="System.ValueTuple" />
</ItemGroup>



</Project>
4 changes: 0 additions & 4 deletions test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
/LICENSE,
/instrument.sh,
/linux-musl-arm64/OpenTelemetry.AutoInstrumentation.Native.so,
/net/Google.Protobuf.dll,
/net/Grpc.Core.Api.dll,
/net/Grpc.Net.Client.dll,
/net/Grpc.Net.Common.dll,
/net/Microsoft.Extensions.Diagnostics.Abstractions.dll,
/net/OpenTelemetry.Api.ProviderBuilderExtensions.dll,
/net/OpenTelemetry.Api.dll,
Expand Down
4 changes: 0 additions & 4 deletions test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
/LICENSE,
/instrument.sh,
/linux-musl-x64/OpenTelemetry.AutoInstrumentation.Native.so,
/net/Google.Protobuf.dll,
/net/Grpc.Core.Api.dll,
/net/Grpc.Net.Client.dll,
/net/Grpc.Net.Common.dll,
/net/Microsoft.Extensions.Diagnostics.Abstractions.dll,
/net/OpenTelemetry.Api.ProviderBuilderExtensions.dll,
/net/OpenTelemetry.Api.dll,
Expand Down
4 changes: 0 additions & 4 deletions test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
/LICENSE,
/instrument.sh,
/linux-arm64/OpenTelemetry.AutoInstrumentation.Native.so,
/net/Google.Protobuf.dll,
/net/Grpc.Core.Api.dll,
/net/Grpc.Net.Client.dll,
/net/Grpc.Net.Common.dll,
/net/Microsoft.Extensions.Diagnostics.Abstractions.dll,
/net/OpenTelemetry.Api.ProviderBuilderExtensions.dll,
/net/OpenTelemetry.Api.dll,
Expand Down
4 changes: 0 additions & 4 deletions test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
/LICENSE,
/instrument.sh,
/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so,
/net/Google.Protobuf.dll,
/net/Grpc.Core.Api.dll,
/net/Grpc.Net.Client.dll,
/net/Grpc.Net.Common.dll,
/net/Microsoft.Extensions.Diagnostics.Abstractions.dll,
/net/OpenTelemetry.Api.ProviderBuilderExtensions.dll,
/net/OpenTelemetry.Api.dll,
Expand Down
4 changes: 0 additions & 4 deletions test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
/AdditionalDeps/shared/Microsoft.NETCore.App/9.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
/LICENSE,
/instrument.sh,
/net/Google.Protobuf.dll,
/net/Grpc.Core.Api.dll,
/net/Grpc.Net.Client.dll,
/net/Grpc.Net.Common.dll,
/net/Microsoft.Extensions.Diagnostics.Abstractions.dll,
/net/OpenTelemetry.Api.ProviderBuilderExtensions.dll,
/net/OpenTelemetry.Api.dll,
Expand Down
5 changes: 0 additions & 5 deletions test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
\AdditionalDeps\shared\Microsoft.NETCore.App\9.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
\LICENSE,
\instrument.sh,
\net\Google.Protobuf.dll,
\net\Grpc.Core.Api.dll,
\net\Grpc.Net.Client.dll,
\net\Grpc.Net.Common.dll,
\net\Microsoft.Extensions.Diagnostics.Abstractions.dll,
\net\OpenTelemetry.Api.ProviderBuilderExtensions.dll,
\net\OpenTelemetry.Api.dll,
Expand Down Expand Up @@ -47,7 +43,6 @@
\net\System.ServiceModel.Primitives.dll,
\net\System.ServiceModel.dll,
\net\ruleEngine.json,
\netfx\Google.Protobuf.dll,
\netfx\Grpc.Core.Api.dll,
\netfx\Grpc.Core.dll,
\netfx\Microsoft.Bcl.AsyncInterfaces.dll,
Expand Down
Loading