diff --git a/build/Common.props b/build/Common.props index 1e7bfad803..c322c24bcd 100644 --- a/build/Common.props +++ b/build/Common.props @@ -31,11 +31,12 @@ [4.2.2,5.0) [3.3.3] [1.1.1,2.0) - [1.3.2,2.0) - [1.4.0-rc.4,2.0) + [1.4.0,2.0) + [1.4.0,2.0) [2.1.58,3.0) [1.2.0-beta.435,2.0) [4.3.4,) + 4.7.0 [6.0.0,) diff --git a/examples/AspNet/Examples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj index 4bdaadfa59..9a71f598b7 100644 --- a/examples/AspNet/Examples.AspNet.csproj +++ b/examples/AspNet/Examples.AspNet.csproj @@ -80,7 +80,7 @@ - + diff --git a/examples/AspNet/Web.config b/examples/AspNet/Web.config index bd4f12f8b1..d5496c456d 100644 --- a/examples/AspNet/Web.config +++ b/examples/AspNet/Web.config @@ -14,9 +14,7 @@ - + @@ -31,7 +29,7 @@ - + @@ -51,7 +49,7 @@ - + diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj index 0f4dde502a..8053b78dba 100644 --- a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj +++ b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs index 86657cced5..0f61e44bc6 100644 --- a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs +++ b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs @@ -43,8 +43,8 @@ public void ConfigureServices(IServiceCollection services) services.AddControllers(); // Wire in otel - services.AddOpenTelemetryTracing( - (builder) => builder + services.AddOpenTelemetry().WithTracing( + builder => builder .AddAspNetCoreInstrumentation() .AddGrpcCoreInstrumentation() .AddConsoleExporter()); diff --git a/examples/process-instrumentation/process-instrumentation.csproj b/examples/process-instrumentation/process-instrumentation.csproj index 3ac8e20efd..727523e7b5 100644 --- a/examples/process-instrumentation/process-instrumentation.csproj +++ b/examples/process-instrumentation/process-instrumentation.csproj @@ -6,7 +6,7 @@ enable - + diff --git a/examples/runtime-instrumentation/runtime-instrumentation.csproj b/examples/runtime-instrumentation/runtime-instrumentation.csproj index 3531e02f48..971a331c3d 100644 --- a/examples/runtime-instrumentation/runtime-instrumentation.csproj +++ b/examples/runtime-instrumentation/runtime-instrumentation.csproj @@ -6,7 +6,7 @@ enable - + diff --git a/src/OpenTelemetry.Contrib.Shared/OpenTelemetry.Contrib.Shared.csproj b/src/OpenTelemetry.Contrib.Shared/OpenTelemetry.Contrib.Shared.csproj index adb7aad559..2525d8bf35 100644 --- a/src/OpenTelemetry.Contrib.Shared/OpenTelemetry.Contrib.Shared.csproj +++ b/src/OpenTelemetry.Contrib.Shared/OpenTelemetry.Contrib.Shared.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md index 923cfb709d..770cf13c49 100644 --- a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) + ## 1.4.0-rc.4 Released 2023-Feb-13 diff --git a/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj b/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj index 41c3ddcc7b..d095eef969 100644 --- a/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj +++ b/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj index 1106dbce56..9921d0470a 100644 --- a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj +++ b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md index 581cc97f28..16a028098e 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) + * Tenant token is no longer exposed on `OneCollectorExporterOptions` and will be set automatically from the instrumentation key. Added new registration overloads and a builder to help with configuration. diff --git a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj index a156a0eac1..bb4ac8d267 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj +++ b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md index 84435083d1..1e420b07aa 100644 --- a/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Stackdriver/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OTel SDK version to `1.3.2`. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OTel SDK version to `1.4.0`. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-beta.4 diff --git a/src/OpenTelemetry.Extensions.Docker/CHANGELOG.md b/src/OpenTelemetry.Extensions.Docker/CHANGELOG.md index 803906ee89..65b8ae1498 100644 --- a/src/OpenTelemetry.Extensions.Docker/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions.Docker/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Updates to 1.3.2 of OpenTelemetry SDK. -[917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917) +* Updates to 1.4.0 of OpenTelemetry SDK. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-beta.2 diff --git a/src/OpenTelemetry.Extensions/CHANGELOG.md b/src/OpenTelemetry.Extensions/CHANGELOG.md index eef4594df2..d9def289e6 100644 --- a/src/OpenTelemetry.Extensions/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -* Update OpenTelemetry to 1.4.0-rc.4 - ([#990](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/990)) +* Update OpenTelemetry to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## Unreleased diff --git a/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj b/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj index 13eecc4e34..8462a7674f 100644 --- a/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj +++ b/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md index fad78ef43c..c8add8c51b 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update `OpenTelemetry.Api` to `1.3.2`. -([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update `OpenTelemetry.Api` to `1.4.0`. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-rc9.7 diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/README.md b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/README.md index 7037108954..1c5734e509 100644 --- a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/README.md +++ b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/README.md @@ -20,7 +20,7 @@ ASP.NET Core instrumentation example: ```csharp // Add OpenTelemetry and Elasticsearch client instrumentation -services.AddOpenTelemetryTracing(x => +services.AddOpenTelemetry().WithTracing(x => { x.AddElasticsearchClientInstrumentation(); x.UseJaegerExporter(config => { diff --git a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md index 8ec769c5e2..11860b8c0d 100644 --- a/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Updated OTel SDK package version to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) + ## 1.0.0-beta.4 Released 2023-Jan-25 diff --git a/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md index e50bf065dd..6df60b7a5b 100644 --- a/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry.Api to 1.3.2. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OpenTelemetry.Api to 1.4.0. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-alpha.2 diff --git a/src/OpenTelemetry.Instrumentation.GrpcCore/README.md b/src/OpenTelemetry.Instrumentation.GrpcCore/README.md index 5c629b815c..73be2ba56d 100644 --- a/src/OpenTelemetry.Instrumentation.GrpcCore/README.md +++ b/src/OpenTelemetry.Instrumentation.GrpcCore/README.md @@ -27,7 +27,7 @@ ASP.NET Core instrumentation example: ```csharp // Add OpenTelemetry and gRPC Core instrumentation -services.AddOpenTelemetryTracing(x => +services.AddOpenTelemetry().WithTracing(x => { x.AddGrpcCoreInstrumentation(); ... diff --git a/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md index b44eaa7736..e8caed7660 100644 --- a/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Hangfire/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OTel API version to `1.3.2`. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OTel API version to `1.4.0`. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-beta.4 diff --git a/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md index 818fdfdd5e..b73f86123d 100644 --- a/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.MySqlData/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OTel API version to `1.3.2`. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OTel API version to `1.4.0`. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-beta.5 diff --git a/src/OpenTelemetry.Instrumentation.MySqlData/OpenTelemetry.Instrumentation.MySqlData.csproj b/src/OpenTelemetry.Instrumentation.MySqlData/OpenTelemetry.Instrumentation.MySqlData.csproj index 83b39ef2f4..221dec0bd4 100644 --- a/src/OpenTelemetry.Instrumentation.MySqlData/OpenTelemetry.Instrumentation.MySqlData.csproj +++ b/src/OpenTelemetry.Instrumentation.MySqlData/OpenTelemetry.Instrumentation.MySqlData.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md index 38e529310c..f9b1a72736 100644 --- a/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Updated OpenTelemetry SDK to 1.3.2 - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Updated OpenTelemetry SDK to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) * Removes `AddOwinInstrumentation` method with default configure parameter. ([#929](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/929)) diff --git a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md index bfc8e1d554..6922e8e798 100644 --- a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry API to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) + ## 0.5.0-beta.1 Released 2023-Feb-17 diff --git a/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj b/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj index 265bccf4c0..4f7202a8f8 100644 --- a/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj +++ b/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md index 8720298814..23cc7aec70 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Quartz/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OpenTelemetry.Api to 1.3.2. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OpenTelemetry.Api to 1.4.0. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) * Removes .NET Framework 4.7.2. It is distributed as .NET Standard 2.0. ([#911](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/911)) * Removes `AddQuartzInstrumentation` method with default configure default parameter. diff --git a/src/OpenTelemetry.Instrumentation.Quartz/README.md b/src/OpenTelemetry.Instrumentation.Quartz/README.md index da549407b2..0e7edb1e2d 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/README.md +++ b/src/OpenTelemetry.Instrumentation.Quartz/README.md @@ -42,7 +42,7 @@ public void ConfigureServices(IServiceCollection services) } // Add OpenTelemetry and Quartz instrumentation -services.AddOpenTelemetryTracing(x => +services.AddOpenTelemetry().WithTracing(x => { x.AddQuartzInstrumentation(); x.UseJaegerExporter(config => { diff --git a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md index 7e79d03ad0..12fd47ab46 100644 --- a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Update OpenTelemetry API to 1.4.0 + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) + ## 1.1.0-rc.1 Released 2023-Feb-13 diff --git a/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj b/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj index 2f79c511f8..dc81b9be78 100644 --- a/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj +++ b/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md index 9a80c8054b..a9c10eef1e 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/CHANGELOG.md @@ -2,8 +2,11 @@ ## Unreleased -* Update OTel API version to `1.3.2`. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OTel API version to `1.4.0`. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) +* Added a direct dependency on System.Reflection.Emit.Lightweight which + previously came transitively through the OpenTelemetry API. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) ## 1.0.0-rc9.7 diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj index f71bb62aff..c12e750ae0 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj @@ -17,6 +17,7 @@ + diff --git a/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md index 6bfb00c834..61296f7556 100644 --- a/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md @@ -2,8 +2,8 @@ ## Unreleased -* Update OTel SDK version to `1.3.2`. - ([#917](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/917)) +* Update OTel SDK version to `1.4.0`. + ([#1038](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1038)) * Removes `AddWcfInstrumentation` method with default configure parameter. ([#928](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/928)) diff --git a/src/OpenTelemetry.ResourceDetectors.Azure/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.ResourceDetectors.Azure/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index 6388753f6e..e3dbfb40fc 100644 --- a/src/OpenTelemetry.ResourceDetectors.Azure/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.ResourceDetectors.Azure/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -1,3 +1,3 @@ OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector.AppServiceResourceDetector() -> void -OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector.Detect() -> OpenTelemetry.Resources.Resource? \ No newline at end of file +OpenTelemetry.ResourceDetectors.Azure.AppServiceResourceDetector.Detect() -> OpenTelemetry.Resources.Resource! diff --git a/src/OpenTelemetry.ResourceDetectors.Azure/AppServiceResourceDetector.cs b/src/OpenTelemetry.ResourceDetectors.Azure/AppServiceResourceDetector.cs index 3ab8352c10..88f5597e4f 100644 --- a/src/OpenTelemetry.ResourceDetectors.Azure/AppServiceResourceDetector.cs +++ b/src/OpenTelemetry.ResourceDetectors.Azure/AppServiceResourceDetector.cs @@ -27,7 +27,7 @@ namespace OpenTelemetry.ResourceDetectors.Azure; public sealed class AppServiceResourceDetector : IResourceDetector { /// - public Resource? Detect() + public Resource Detect() { List>? attributeList = null; diff --git a/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj b/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj index a08c3fc4e3..145a5d743b 100644 --- a/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj @@ -1,7 +1,8 @@ - + - netcoreapp3.1 + net7.0;net6.0;netcoreapp3.1 + true diff --git a/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj b/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj index d934ebd635..eeca559b44 100644 --- a/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Stackdriver.Tests/OpenTelemetry.Exporter.Stackdriver.Tests.csproj @@ -4,6 +4,7 @@ net7.0;net6.0;netcoreapp3.1 $(TargetFrameworks);net462 + true diff --git a/test/OpenTelemetry.Extensions.Docker.Tests/OpenTelemetry.Extensions.Docker.Tests.csproj b/test/OpenTelemetry.Extensions.Docker.Tests/OpenTelemetry.Extensions.Docker.Tests.csproj index b5f979b411..9d76d1a0c2 100644 --- a/test/OpenTelemetry.Extensions.Docker.Tests/OpenTelemetry.Extensions.Docker.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Docker.Tests/OpenTelemetry.Extensions.Docker.Tests.csproj @@ -5,6 +5,7 @@ net7.0;net6.0;netcoreapp3.1 $(TargetFrameworks);net462 + true diff --git a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj index 6c2b7a8ba7..81177f9a06 100644 --- a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj @@ -2,7 +2,7 @@ - net7.0;net6.0;netcoreapp3.1 + net7.0;net6.0 true diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj index 666bf9dae1..02ba50abd0 100644 --- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj @@ -2,7 +2,8 @@ Unit test project for OpenTelemetry Hangfire instrumentation - netcoreapp3.1;net472 + net7.0;net6.0;netcoreapp3.1;net472 + true false diff --git a/test/OpenTelemetry.Instrumentation.MySqlData.Tests/OpenTelemetry.Instrumentation.MySqlData.Tests.csproj b/test/OpenTelemetry.Instrumentation.MySqlData.Tests/OpenTelemetry.Instrumentation.MySqlData.Tests.csproj index e24d8f3916..7feadad48a 100644 --- a/test/OpenTelemetry.Instrumentation.MySqlData.Tests/OpenTelemetry.Instrumentation.MySqlData.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.MySqlData.Tests/OpenTelemetry.Instrumentation.MySqlData.Tests.csproj @@ -1,27 +1,28 @@ - - netcoreapp3.1 - true - + + net7.0;net6.0;netcoreapp3.1 + true + true + - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + - - - + + + diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj index 95b848e959..8e05b89b1d 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj @@ -4,6 +4,7 @@ net7.0;net6.0;netcoreapp3.1 $(TargetFrameworks);net462 + true $(TARGET_FRAMEWORK) @@ -20,7 +21,7 @@ - + all diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs index 1066317736..0539a93d4e 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs @@ -307,11 +307,12 @@ public void StackExchangeRedis_BadArgs() Assert.Throws(() => builder.AddRedisInstrumentation(null)); var activityProcessor = new Mock>(); - Assert.Throws(() => + var exception = Assert.Throws(() => Sdk.CreateTracerProviderBuilder() .AddProcessor(activityProcessor.Object) .AddRedisInstrumentation(null) .Build()); + Assert.Equal("StackExchange.Redis IConnectionMultiplexer could not be resolved through application IServiceProvider", exception.Message); } [Fact] @@ -336,7 +337,7 @@ public void StackExchangeRedis_DependencyInjection_Success() { optionsPickedFromDI = true; }); - services.AddOpenTelemetryTracing(builder => builder.AddRedisInstrumentation()); + services.AddOpenTelemetry().WithTracing(builder => builder.AddRedisInstrumentation()); using var serviceProvider = services.BuildServiceProvider(); @@ -351,7 +352,7 @@ public void StackExchangeRedis_DependencyInjection_Failure() { var services = new ServiceCollection(); - services.AddOpenTelemetryTracing(builder => builder.AddRedisInstrumentation()); + services.AddOpenTelemetry().WithTracing(builder => builder.AddRedisInstrumentation()); using var serviceProvider = services.BuildServiceProvider(); diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj b/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj index b7f42bf70f..dbf214f264 100644 --- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj @@ -27,7 +27,7 @@ - + diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryClientMessageInspectorTests.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryClientMessageInspectorTests.cs index 88c6a3b85d..555e1c2623 100644 --- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryClientMessageInspectorTests.cs +++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryClientMessageInspectorTests.cs @@ -153,7 +153,7 @@ public async Task OutgoingRequestInstrumentationTest( bool emptyOrNullAction = false) { #if NETFRAMEWORK - const string OutgoingHttpOperationName = "OpenTelemetry.HttpWebRequest.HttpRequestOut"; + const string OutgoingHttpOperationName = "OpenTelemetry.Instrumentation.Http.HttpWebRequest.HttpRequestOut"; #else const string OutgoingHttpOperationName = "System.Net.Http.HttpRequestOut"; #endif