Bump OpenTelemetry .NET Automatic Instrumentation to 1.3.0 (#405)

signalfx · Jan 18, 2024 · d5172f0 · d5172f0
1 parent dd22298
commit d5172f0
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 146 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,17 @@ All notable changes to this component are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v1.1.0...HEAD)
+## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v1.2.1...HEAD)
+
+This release is built on top of [OpenTelemetry .NET Auto Instrumentation v1.3.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0).
 
 ### Added
 
 ### Changed
 
+- Updated [OpenTelemetry .NET Auto Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation):
+  [`1.3.0`](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0).
+
 ### Deprecated
 
 ### Removed

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Splunk Distribution of OpenTelemetry .NET
 
-[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.6.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.6.0)
-[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.1.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.1.0)
+[![OpenTelemetry .NET](https://img.shields.io/badge/OTel-1.7.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.7.0)
+[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.3.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.3.0)
 [![Splunk GDI Specification](https://img.shields.io/badge/GDI-1.6.0-blueviolet)](https://github.com/signalfx/gdi-specification/releases/tag/v1.6.0)
 [![Keep a Changelog](https://img.shields.io/badge/changelog-Keep%20a%20Changelog-%23E05735)](CHANGELOG.md)
 [![LICENSE](https://img.shields.io/github/license/signalfx/splunk-otel-dotnet)](LICENSE)

diff --git a/build/Build.cs b/build/Build.cs
@@ -16,7 +16,7 @@ partial class Build : NukeBuild
     [Parameter("Configuration to build - Default is 'Release'")]
     readonly Configuration Configuration = Configuration.Release;
 
-    const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.2.0";
+    const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.3.0";
 
     [Parameter($"OpenTelemetry AutoInstrumentation dependency version - Default is '{OpenTelemetryAutoInstrumentationDefaultVersion}'")]
     readonly string OpenTelemetryAutoInstrumentationVersion = OpenTelemetryAutoInstrumentationDefaultVersion;

diff --git a/docs/advanced-config.md b/docs/advanced-config.md
@@ -7,7 +7,7 @@
 
 ## OpenTelemetry configuration
 
-See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.1.0/docs/config.md)
+See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/config.md)
 for configuration details.
 
 ## Splunk distribution configuration
@@ -23,7 +23,7 @@ Download and install the latest binaries from
 
 When running your application, make sure to:
 
-1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.1.0/docs/config.md#resources).
+1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/config.md#resources).
 1. Set the environment variables from the table below.
 
 | Environment variable                 | .NET version        | Value                                                                                       |
@@ -45,7 +45,7 @@ When running your application, make sure to:
 | `OTEL_DOTNET_AUTO_HOME`              | All versions        | `$INSTALL_DIR`                                                                              |
 | `OTEL_DOTNET_AUTO_PLUGINS`           | All versions        | `Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation` |
 
-> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.2.0/docs/config.md#net-clr-profiler).
+> Some settings can be omitted on .NET. For more information, see the [documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.3.0/docs/config.md#net-clr-profiler).
 
 ## Splunk plugin settings
 

diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Plugin.cs b/src/Splunk.OpenTelemetry.AutoInstrumentation/Plugin.cs
@@ -90,7 +90,7 @@ public void ConfigureTracesOptions(AspNetInstrumentationOptions options)
     /// Configures ASP.NET Core instrumentation options.
     /// </summary>
     /// <param name="options">Otlp options.</param>
-    public void ConfigureTracesOptions(AspNetCoreInstrumentationOptions options)
+    public void ConfigureTracesOptions(AspNetCoreTraceInstrumentationOptions options)
     {
         _traces.ConfigureTracesOptions(options);
     }

diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj b/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj
@@ -15,18 +15,18 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
+    <PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.6.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.7.0-beta.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.3" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -57,7 +57,7 @@
     <Content Include="splunk-launch.*">
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </Content>
-    <PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.2.0">
+    <PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.3.0">
       <PrivateAssets>none</PrivateAssets> <!-- Ensures that content and build transitive dependencies are properly delivered -->
     </PackageReference>
     <None Include="splunk-logo-256x256.png" Pack="true" PackagePath="images" />

diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Traces.cs b/src/Splunk.OpenTelemetry.AutoInstrumentation/Traces.cs
@@ -80,7 +80,7 @@ public void ConfigureTracesOptions(AspNetInstrumentationOptions options)
 
 #else
 
-    public void ConfigureTracesOptions(AspNetCoreInstrumentationOptions options)
+    public void ConfigureTracesOptions(AspNetCoreTraceInstrumentationOptions options)
     {
         if (_settings.TraceResponseHeaderEnabled)
         {

diff --git a/...strumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/...strumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -37,11 +37,13 @@
   /net/OpenTelemetry.Instrumentation.Wcf.dll,
   /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.dll,
+  /net/OpenTelemetry.ResourceDetectors.Host.dll,
+  /net/OpenTelemetry.ResourceDetectors.Process.dll,
+  /net/OpenTelemetry.ResourceDetectors.ProcessRuntime.dll,
   /net/OpenTelemetry.Shims.OpenTracing.dll,
   /net/OpenTelemetry.dll,
   /net/OpenTracing.dll,
   /net/Splunk.OpenTelemetry.AutoInstrumentation.dll,
-  /net/System.Diagnostics.DiagnosticSource.dll,
   /net/System.Private.ServiceModel.dll,
   /net/System.Security.Permissions.dll,
   /net/System.ServiceModel.Primitives.dll,
@@ -81,40 +83,5 @@
   /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
   /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net6.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net6.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net7.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
+  /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
 ]
diff --git a/....AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/....AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -37,11 +37,13 @@
   /net/OpenTelemetry.Instrumentation.Wcf.dll,
   /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.dll,
+  /net/OpenTelemetry.ResourceDetectors.Host.dll,
+  /net/OpenTelemetry.ResourceDetectors.Process.dll,
+  /net/OpenTelemetry.ResourceDetectors.ProcessRuntime.dll,
   /net/OpenTelemetry.Shims.OpenTracing.dll,
   /net/OpenTelemetry.dll,
   /net/OpenTracing.dll,
   /net/Splunk.OpenTelemetry.AutoInstrumentation.dll,
-  /net/System.Diagnostics.DiagnosticSource.dll,
   /net/System.Private.ServiceModel.dll,
   /net/System.Security.Permissions.dll,
   /net/System.ServiceModel.Primitives.dll,
@@ -81,40 +83,5 @@
   /store/x64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
   /store/x64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
   /store/x64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net6.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net6.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net6.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net7.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net7.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net7.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net7.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll,
-  /store/x86/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll,
-  /store/x86/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll,
-  /store/x86/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll,
-  /store/x86/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll,
-  /store/x86/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll,
-  /store/x86/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll,
-  /store/x86/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
+  /store/x64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll
 ]
-Original file line number
+Diff line change
@@ Expand Up @@
     #else
-        public void ConfigureTracesOptions(AspNetCoreInstrumentationOptions options)
+        public void ConfigureTracesOptions(AspNetCoreTraceInstrumentationOptions options)
         {
             if (_settings.TraceResponseHeaderEnabled)
             {
@@ Expand Down @@