Merge branch 'main' into build-nuget-package

CHANGELOG.md

@@ -7,10 +7,16 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ## [Unreleased](https://github.com/signalfx/splunk-otel-dotnet/compare/v1.0.0-rc.1...HEAD)
 
+This is a release candidate,
+built on top of [OpenTelemetry .NET Auto Instrumentation v1.0.0-rc.2](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.2).
+
 ### Added
 
 ### Changed
 
+- Updated [OpenTelemetry .NET Auto Instrumentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation):
+  [`1.0.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.2).
+
 ### Deprecated
 
 ### Removed

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.1-blueviolet)](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.0.0-rc.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)
 [![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)

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.1";
+    const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.0.0-rc.2";
     [Parameter($"OpenTelemetry AutoInstrumentation dependency version - Default is '{OpenTelemetryAutoInstrumentationDefaultVersion}'")]
     readonly string OpenTelemetryAutoInstrumentationVersion = OpenTelemetryAutoInstrumentationDefaultVersion;
 

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.0.0-rc.1/docs/config.md)
+See [Open Telemetry Auto Instrumentation documentation](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.0.0-rc.2/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.0.0-rc.1/docs/config.md#resources).
+1. Set the [resources](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/v1.0.0-rc.2/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.0.0-rc.1/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-rc.2/docs/config.md#net-clr-profiler).
 
 ## Splunk plugin settings
 

src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.0-beta.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
   </ItemGroup>
 
   <PropertyGroup>

test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt

@@ -35,6 +35,7 @@
   /net/OpenTelemetry.Instrumentation.Runtime.dll,
   /net/OpenTelemetry.Instrumentation.SqlClient.dll,
   /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.dll,
   /net/OpenTelemetry.Shims.OpenTracing.dll,
   /net/OpenTelemetry.dll,

test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt

@@ -35,6 +35,7 @@
   /net/OpenTelemetry.Instrumentation.Runtime.dll,
   /net/OpenTelemetry.Instrumentation.SqlClient.dll,
   /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.dll,
   /net/OpenTelemetry.Shims.OpenTracing.dll,
   /net/OpenTelemetry.dll,

test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt

@@ -34,6 +34,7 @@
   /net/OpenTelemetry.Instrumentation.Runtime.dll,
   /net/OpenTelemetry.Instrumentation.SqlClient.dll,
   /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  /net/OpenTelemetry.ResourceDetectors.Azure.dll,
   /net/OpenTelemetry.ResourceDetectors.Container.dll,
   /net/OpenTelemetry.Shims.OpenTracing.dll,
   /net/OpenTelemetry.dll,

test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt

@@ -34,6 +34,7 @@
   \net\OpenTelemetry.Instrumentation.Runtime.dll,
   \net\OpenTelemetry.Instrumentation.SqlClient.dll,
   \net\OpenTelemetry.Instrumentation.StackExchangeRedis.dll,
+  \net\OpenTelemetry.ResourceDetectors.Azure.dll,
   \net\OpenTelemetry.ResourceDetectors.Container.dll,
   \net\OpenTelemetry.Shims.OpenTracing.dll,
   \net\OpenTelemetry.dll,
@@ -77,6 +78,7 @@
   \netfx\OpenTelemetry.Instrumentation.Runtime.dll,
   \netfx\OpenTelemetry.Instrumentation.SqlClient.dll,
   \netfx\OpenTelemetry.Instrumentation.Wcf.dll,
+  \netfx\OpenTelemetry.ResourceDetectors.Azure.dll,
   \netfx\OpenTelemetry.ResourceDetectors.Container.dll,
   \netfx\OpenTelemetry.Shims.OpenTracing.dll,
   \netfx\OpenTelemetry.dll,

test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/SmokeTests.cs

@@ -121,12 +121,8 @@ public void TracesResource()
     {
         using var collector = new MockSpansCollector(Output);
         SetExporter(collector);
-        collector.ResourceExpector.Expect("service.name", ServiceName);
-        collector.ResourceExpector.Expect("telemetry.sdk.name", "opentelemetry");
-        collector.ResourceExpector.Expect("telemetry.sdk.language", "dotnet");
-        collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(global::OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion.Split('+')[0]);
-        collector.ResourceExpector.Expect("telemetry.auto.version", "1.0.0-rc.1");
-        collector.ResourceExpector.Expect("splunk.distro.version", typeof(Plugin).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version);
+
+        ExpectResources(collector.ResourceExpector);
 
         SetEnvironmentVariable("OTEL_DOTNET_AUTO_TRACES_ADDITIONAL_SOURCES", "MyCompany.MyProduct.MyLibrary");
         RunTestApplication();
@@ -140,12 +136,8 @@ public void MetricsResource()
     {
         using var collector = new MockMetricsCollector(Output);
         SetExporter(collector);
-        collector.ResourceExpector.Expect("service.name", ServiceName);
-        collector.ResourceExpector.Expect("telemetry.sdk.name", "opentelemetry");
-        collector.ResourceExpector.Expect("telemetry.sdk.language", "dotnet");
-        collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(global::OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion.Split('+')[0]);
-        collector.ResourceExpector.Expect("telemetry.auto.version", "1.0.0-rc.1");
-        collector.ResourceExpector.Expect("splunk.distro.version", typeof(Plugin).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version);
+
+        ExpectResources(collector.ResourceExpector);
 
         SetEnvironmentVariable("OTEL_DOTNET_AUTO_METRICS_ADDITIONAL_SOURCES", "MyCompany.MyProduct.MyLibrary");
         RunTestApplication();
@@ -160,17 +152,23 @@ public void LogsResource()
     {
         using var collector = new MockLogsCollector(Output);
         SetExporter(collector);
-        collector.ResourceExpector.Expect("service.name", ServiceName);
-        collector.ResourceExpector.Expect("telemetry.sdk.name", "opentelemetry");
-        collector.ResourceExpector.Expect("telemetry.sdk.language", "dotnet");
-        collector.ResourceExpector.Expect("telemetry.sdk.version", typeof(global::OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion.Split('+')[0]);
-        collector.ResourceExpector.Expect("telemetry.auto.version", "1.0.0-rc.1");
-        collector.ResourceExpector.Expect("splunk.distro.version", typeof(Plugin).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version);
+
+        ExpectResources(collector.ResourceExpector);
 
         EnableBytecodeInstrumentation();
         RunTestApplication();
 
         collector.ResourceExpector.AssertExpectations();
     }
 #endif
+
+    private static void ExpectResources(OtlpResourceExpector resourceExpector)
+    {
+        resourceExpector.Expect("service.name", ServiceName);
+        resourceExpector.Expect("telemetry.sdk.name", "opentelemetry");
+        resourceExpector.Expect("telemetry.sdk.language", "dotnet");
+        resourceExpector.Expect("telemetry.sdk.version", typeof(global::OpenTelemetry.Resources.Resource).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion.Split('+')[0]);
+        resourceExpector.Expect("telemetry.auto.version", "1.0.0-rc.2");
+        resourceExpector.Expect("splunk.distro.version", typeof(Plugin).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version);
+    }
 }