diff --git a/README.md b/README.md index d6215083..f09071f3 100644 --- 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 index 09ab018d..df4e9f56 100644 --- 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 index b07f7d64..d52aeec3 100644 --- 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 index 5610f5f6..9f5fa7bc 100644 --- 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 index ea9d62c3..fe26eb46 100644 --- a/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj +++ b/src/Splunk.OpenTelemetry.AutoInstrumentation/Splunk.OpenTelemetry.AutoInstrumentation.csproj @@ -8,8 +8,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index c374fad9..638f5c5f 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.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,12 +28,12 @@ /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, @@ -42,7 +41,10 @@ /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/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index 3f6bc45c..29f3b0a7 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/Splunk.OpenTelemetry.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,12 +28,12 @@ /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, @@ -42,7 +41,10 @@ /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/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 2b631305..a8b3ed9b 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/Splunk.OpenTelemetry.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,12 +27,12 @@ /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, @@ -41,7 +40,10 @@ /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/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index 93b23236..902c93dd 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.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,12 +27,12 @@ \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, @@ -41,7 +40,10 @@ \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/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Helpers/ResourceExpectorExtensions.cs b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Helpers/ResourceExpectorExtensions.cs index 1491f580..d54388bd 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Helpers/ResourceExpectorExtensions.cs +++ b/test/Splunk.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/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests.csproj b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests.csproj index c1f0f9c3..ec6fb5c7 100644 --- a/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests.csproj +++ b/test/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests/Splunk.OpenTelemetry.AutoInstrumentation.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/test-applications/integrations/TestApplication.HttpServer/TestApplication.HttpServer.csproj b/test/test-applications/integrations/TestApplication.HttpServer/TestApplication.HttpServer.csproj index 49336679..cf30f57e 100644 --- a/test/test-applications/integrations/TestApplication.HttpServer/TestApplication.HttpServer.csproj +++ b/test/test-applications/integrations/TestApplication.HttpServer/TestApplication.HttpServer.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj b/test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj index e8fe3a5f..5f24dbc2 100644 --- a/test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj +++ b/test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj @@ -8,7 +8,7 @@ - +