Bump OTel .NET Auto to 1.0.0 (#316)

signalfx · Sep 7, 2023 · 61da982 · 61da982
1 parent cdcca84
commit 61da982
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 19 deletions.
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.5.1-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.5.1)
-[![OpenTelemetry .NET Auto Instrumentation](https://img.shields.io/badge/OTelAuto-v1.0.0rc.2-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.2)
+[![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.0.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0)
 [![Splunk GDI Specification](https://img.shields.io/badge/GDI-1.5.0-blueviolet)](https://github.com/signalfx/gdi-specification/releases/tag/v1.5.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
@@ -20,7 +20,7 @@ partial class Build : NukeBuild
     [Parameter("Platform to build - x86 or x64. Default is 'x64'")]
     readonly MSBuildTargetPlatform Platform = MSBuildTargetPlatform.x64;
 
-    const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.0.0-rc.2";
+    const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.0.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
@@ -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.0.0-rc.2/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.0.0/docs/config.md#net-clr-profiler).
 
 ## Splunk plugin settings
 

diff --git a/docs/bump-upstream.md b/docs/bump-upstream.md
@@ -6,7 +6,7 @@
    - [`docs/advanced-config.md`](./advanced-config.md)
    - [`docs/README.md`](./README.md)
    - [`src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj`](../src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj)
-   - [`test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/SmokeTests.cs`](../test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/SmokeTests.cs)
+   - [`test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/SmokeTests.cs`](../test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Helpers/ResourceExpectorExtensions.cs)
 
 1. Update the `test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_*.verified.txt`
    files.

diff --git a/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj b/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj
@@ -8,8 +8,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenTelemetry.Api" Version="1.5.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.1" />
+    <PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">

diff --git a/...strumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/...strumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt
@@ -20,7 +20,6 @@
   /net/OpenTelemetry.AutoInstrumentation.dll,
   /net/OpenTelemetry.AutoInstrumentation.pdb,
   /net/OpenTelemetry.Exporter.Console.dll,
-  /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll,
   /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll,
   /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll,
   /net/OpenTelemetry.Exporter.Zipkin.dll,
@@ -29,20 +28,23 @@
   /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll,
   /net/OpenTelemetry.Instrumentation.GrpcNetClient.dll,
   /net/OpenTelemetry.Instrumentation.Http.dll,
-  /net/OpenTelemetry.Instrumentation.MySqlData.dll,
   /net/OpenTelemetry.Instrumentation.Process.dll,
   /net/OpenTelemetry.Instrumentation.Quartz.dll,
   /net/OpenTelemetry.Instrumentation.Runtime.dll,
   /net/OpenTelemetry.Instrumentation.SqlClient.dll,
   /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  /net/OpenTelemetry.Instrumentation.Wcf.dll,
   /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.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,
+  /net/System.ServiceModel.dll,
   /net/ruleEngine.json,
   /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,

diff --git a/....AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/....AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -20,7 +20,6 @@
   /net/OpenTelemetry.AutoInstrumentation.dll,
   /net/OpenTelemetry.AutoInstrumentation.pdb,
   /net/OpenTelemetry.Exporter.Console.dll,
-  /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll,
   /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll,
   /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll,
   /net/OpenTelemetry.Exporter.Zipkin.dll,
@@ -29,20 +28,23 @@
   /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll,
   /net/OpenTelemetry.Instrumentation.GrpcNetClient.dll,
   /net/OpenTelemetry.Instrumentation.Http.dll,
-  /net/OpenTelemetry.Instrumentation.MySqlData.dll,
   /net/OpenTelemetry.Instrumentation.Process.dll,
   /net/OpenTelemetry.Instrumentation.Quartz.dll,
   /net/OpenTelemetry.Instrumentation.Runtime.dll,
   /net/OpenTelemetry.Instrumentation.SqlClient.dll,
   /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  /net/OpenTelemetry.Instrumentation.Wcf.dll,
   /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.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,
+  /net/System.ServiceModel.dll,
   /net/ruleEngine.json,
   /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,
   /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll,

diff --git a/...ry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/...ry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt
@@ -19,7 +19,6 @@
   /net/OpenTelemetry.AutoInstrumentation.dll,
   /net/OpenTelemetry.AutoInstrumentation.pdb,
   /net/OpenTelemetry.Exporter.Console.dll,
-  /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll,
   /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll,
   /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll,
   /net/OpenTelemetry.Exporter.Zipkin.dll,
@@ -28,20 +27,23 @@
   /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll,
   /net/OpenTelemetry.Instrumentation.GrpcNetClient.dll,
   /net/OpenTelemetry.Instrumentation.Http.dll,
-  /net/OpenTelemetry.Instrumentation.MySqlData.dll,
   /net/OpenTelemetry.Instrumentation.Process.dll,
   /net/OpenTelemetry.Instrumentation.Quartz.dll,
   /net/OpenTelemetry.Instrumentation.Runtime.dll,
   /net/OpenTelemetry.Instrumentation.SqlClient.dll,
   /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  /net/OpenTelemetry.Instrumentation.Wcf.dll,
   /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.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,
+  /net/System.ServiceModel.dll,
   /net/ruleEngine.json,
   /osx-x64/OpenTelemetry.AutoInstrumentation.Native.dylib,
   /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll,

diff --git a/...utoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/...utoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt
@@ -19,7 +19,6 @@
   \net\OpenTelemetry.AutoInstrumentation.dll,
   \net\OpenTelemetry.AutoInstrumentation.pdb,
   \net\OpenTelemetry.Exporter.Console.dll,
-  \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll,
   \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.dll,
   \net\OpenTelemetry.Exporter.Prometheus.HttpListener.dll,
   \net\OpenTelemetry.Exporter.Zipkin.dll,
@@ -28,20 +27,23 @@
   \net\OpenTelemetry.Instrumentation.EntityFrameworkCore.dll,
   \net\OpenTelemetry.Instrumentation.GrpcNetClient.dll,
   \net\OpenTelemetry.Instrumentation.Http.dll,
-  \net\OpenTelemetry.Instrumentation.MySqlData.dll,
   \net\OpenTelemetry.Instrumentation.Process.dll,
   \net\OpenTelemetry.Instrumentation.Quartz.dll,
   \net\OpenTelemetry.Instrumentation.Runtime.dll,
   \net\OpenTelemetry.Instrumentation.SqlClient.dll,
   \net\OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  \net\OpenTelemetry.Instrumentation.Wcf.dll,
   \net\OpenTelemetry.ResourceDetectors.Azure.dll,
   \net\OpenTelemetry.ResourceDetectors.Container.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,
+  \net\System.ServiceModel.dll,
   \net\ruleEngine.json,
   \netfx\Google.Protobuf.dll,
   \netfx\Grpc.Core.Api.dll,

diff --git a/....OpenTelemetry.AutoInstrumentation.IntegrationTests/Helpers/ResourceExpectorExtensions.cs b/....OpenTelemetry.AutoInstrumentation.IntegrationTests/Helpers/ResourceExpectorExtensions.cs
@@ -29,7 +29,7 @@ public static void ExpectDistributionResources(this OtlpResourceExpector resourc
         resourceExpector.Expect("telemetry.sdk.name", "opentelemetry");
         resourceExpector.Expect("telemetry.sdk.language", "dotnet");
         resourceExpector.Expect("telemetry.sdk.version", ExpectedSdkVersion);
-        resourceExpector.Expect("telemetry.auto.version", "1.0.0-rc.2");
+        resourceExpector.Expect("telemetry.auto.version", "1.0.0");
         resourceExpector.Expect("splunk.distro.version", ExpectedDistributionVersion);
     }
 }
diff --git a/...ntation.IntegrationTests/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests.csproj b/...ntation.IntegrationTests/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Grpc.Tools" Version="2.51.0" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="Testcontainers" Version="3.4.0" />

diff --git a/...st-applications/integrations/TestApplication.HttpServer/TestApplication.HttpServer.csproj b/...st-applications/integrations/TestApplication.HttpServer/TestApplication.HttpServer.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj b/test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>