Bump OTel Core packages to 1.11.*

open-telemetry · Jan 24, 2025 · 8dc5472 · 8dc5472
1 parent b8a42a1
commit 8dc5472
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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`,
@@ -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)

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -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>

diff --git a/LICENSE b/LICENSE
@@ -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

diff --git a/docs/README.md b/docs/README.md
@@ -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)
 

diff --git a/docs/plugins.md b/docs/plugins.md
@@ -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 |
@@ -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
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -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" />
@@ -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" />
@@ -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" />

diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h
@@ -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} },

diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj
@@ -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" />
@@ -90,4 +88,6 @@
     <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
 
+
+
 </Project>
diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-arm64.verified.txt
@@ -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,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux-x64.verified.txt
@@ -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,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux-arm64.verified.txt
@@ -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,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux-x64.verified.txt
@@ -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,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -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,

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -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,
@@ -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,