diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index 6874c3d4666..0532a56ca84 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -239,9 +239,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Open EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Console.Tests", "test\OpenTelemetry.Exporter.Console.Tests\OpenTelemetry.Exporter.Console.Tests.csproj", "{011E70E1-152A-47BB-AF83-12DD12B125ED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.DependencyInjection", "src\OpenTelemetry.Extensions.DependencyInjection\OpenTelemetry.Extensions.DependencyInjection.csproj", "{171A87CB-393C-4296-913F-E704CD8CEAE9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Api.ProviderBuilderExtensions", "src\OpenTelemetry.Api.ProviderBuilderExtensions\OpenTelemetry.Api.ProviderBuilderExtensions.csproj", "{171A87CB-393C-4296-913F-E704CD8CEAE9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.DependencyInjection.Tests", "test\OpenTelemetry.Extensions.DependencyInjection.Tests\OpenTelemetry.Extensions.DependencyInjection.Tests.csproj", "{662476AA-5875-4E74-B992-DDF309168EFB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Api.ProviderBuilderExtensions.Tests", "test\OpenTelemetry.Api.ProviderBuilderExtensions.Tests\OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj", "{662476AA-5875-4E74-B992-DDF309168EFB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "getting-started-aspnetcore", "docs\trace\getting-started-aspnetcore\getting-started-aspnetcore.csproj", "{DEDE8442-03CA-48CF-99B9-EA224D89D148}" EndProject diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/net462/PublicAPI.Shipped.txt b/src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/net462/PublicAPI.Shipped.txt rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/net462/PublicAPI.Shipped.txt diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/net462/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/net462/PublicAPI.Unshipped.txt rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/net462/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/netstandard2.0/PublicAPI.Shipped.txt b/src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/netstandard2.0/PublicAPI.Shipped.txt similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/netstandard2.0/PublicAPI.Shipped.txt rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/netstandard2.0/PublicAPI.Shipped.txt diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/AssemblyInfo.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs similarity index 88% rename from src/OpenTelemetry.Extensions.DependencyInjection/AssemblyInfo.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs index 0226ed06231..e1ba813e7aa 100644 --- a/src/OpenTelemetry.Extensions.DependencyInjection/AssemblyInfo.cs +++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs @@ -18,4 +18,4 @@ [assembly: InternalsVisibleTo("OpenTelemetry" + AssemblyInfo.PublicKey)] [assembly: InternalsVisibleTo("OpenTelemetry.Tests" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("OpenTelemetry.Extensions.DependencyInjection.Tests" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("OpenTelemetry.Api.ProviderBuilderExtensions.Tests" + AssemblyInfo.PublicKey)] diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/CHANGELOG.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md similarity index 55% rename from src/OpenTelemetry.Extensions.DependencyInjection/CHANGELOG.md rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md index 3022510a0e7..8f2fcf7909a 100644 --- a/src/OpenTelemetry.Extensions.DependencyInjection/CHANGELOG.md +++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md @@ -5,6 +5,10 @@ * Removed `ConfigureBuilder` from the public API. ([#4103](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4103)) +* Renamed package from `OpenTelemetry.Extensions.DependencyInjection` to + `OpenTelemetry.Api.ProviderBuilderExtensions`. + ([#4125](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4125)) + ## 1.4.0-rc.2 Released 2023-Jan-09 diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Metrics/IConfigureMeterProviderBuilder.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/IConfigureMeterProviderBuilder.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Metrics/IConfigureMeterProviderBuilder.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/IConfigureMeterProviderBuilder.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Metrics/IMeterProviderBuilder.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/IMeterProviderBuilder.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Metrics/IMeterProviderBuilder.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/IMeterProviderBuilder.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Metrics/OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Metrics/OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Metrics/OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Metrics/OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/OpenTelemetryDependencyInjectionMetricsServiceCollectionExtensions.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/OpenTelemetry.Extensions.DependencyInjection.csproj b/src/OpenTelemetry.Api.ProviderBuilderExtensions/OpenTelemetry.Api.ProviderBuilderExtensions.csproj similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/OpenTelemetry.Extensions.DependencyInjection.csproj rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/OpenTelemetry.Api.ProviderBuilderExtensions.csproj diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md new file mode 100644 index 00000000000..5954755a9af --- /dev/null +++ b/src/OpenTelemetry.Api.ProviderBuilderExtensions/README.md @@ -0,0 +1,27 @@ +# OpenTelemetry.Api.ProviderBuilderExtensions + +[![NuGet](https://img.shields.io/nuget/v/OpenTelemetry.Api.ProviderBuilderExtensions.svg)](https://www.nuget.org/packages/OpenTelemetry.Api.ProviderBuilderExtensions) +[![NuGet](https://img.shields.io/nuget/dt/OpenTelemetry.Api.ProviderBuilderExtensions.svg)](https://www.nuget.org/packages/OpenTelemetry.Api.ProviderBuilderExtensions) + +## Installation + +```shell +dotnet add package --prerelease OpenTelemetry.Api.ProviderBuilderExtensions +``` + +## Overview + +The `OpenTelemetry.Api.ProviderBuilderExtensions` package provides extension +methods and helpers for building `TracerProvider`s and `MeterProvider`s using +the `Microsoft.Extensions.DependencyInjection` API (primarily +[IServiceCollection](https://learn.microsoft.com/dotnet/api/microsoft.extensions.dependencyinjection.iservicecollection)). + +The `OpenTelemetry.Api.ProviderBuilderExtensions` package is intended for +instrumentation library authors who need to integrate with the OpenTelemetry SDK +without a direct dependency. For more details see: [Registration extension +method guidance for library +authors](../../docs/trace/extending-the-sdk/README.md#registration-extension-method-guidance-for-library-authors). + +## References + +* [OpenTelemetry Project](https://opentelemetry.io/) diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Trace/IConfigureTracerProviderBuilder.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/IConfigureTracerProviderBuilder.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Trace/IConfigureTracerProviderBuilder.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/IConfigureTracerProviderBuilder.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Trace/ITracerProviderBuilder.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/ITracerProviderBuilder.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Trace/ITracerProviderBuilder.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/ITracerProviderBuilder.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Trace/OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Trace/OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.cs diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/Trace/OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.cs similarity index 100% rename from src/OpenTelemetry.Extensions.DependencyInjection/Trace/OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.cs rename to src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/OpenTelemetryDependencyInjectionTracingServiceCollectionExtensions.cs diff --git a/src/OpenTelemetry.Api/AssemblyInfo.cs b/src/OpenTelemetry.Api/AssemblyInfo.cs index 8edcf090456..6f0078895f2 100644 --- a/src/OpenTelemetry.Api/AssemblyInfo.cs +++ b/src/OpenTelemetry.Api/AssemblyInfo.cs @@ -17,7 +17,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("OpenTelemetry" + AssemblyInfo.PublicKey)] -[assembly: InternalsVisibleTo("OpenTelemetry.Extensions.DependencyInjection" + AssemblyInfo.PublicKey)] +[assembly: InternalsVisibleTo("OpenTelemetry.Api.ProviderBuilderExtensions" + AssemblyInfo.PublicKey)] [assembly: InternalsVisibleTo("OpenTelemetry.Tests" + AssemblyInfo.PublicKey)] [assembly: InternalsVisibleTo("OpenTelemetry.Shims.OpenTracing.Tests" + AssemblyInfo.PublicKey)] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2" + AssemblyInfo.MoqPublicKey)] diff --git a/src/OpenTelemetry.Extensions.DependencyInjection/README.md b/src/OpenTelemetry.Extensions.DependencyInjection/README.md deleted file mode 100644 index 3e783d502ee..00000000000 --- a/src/OpenTelemetry.Extensions.DependencyInjection/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# OpenTelemetry.Extensions.DependencyInjection - -[![NuGet](https://img.shields.io/nuget/v/OpenTelemetry.Extensions.DependencyInjection.svg)](https://www.nuget.org/packages/OpenTelemetry.Extensions.DependencyInjection) -[![NuGet](https://img.shields.io/nuget/dt/OpenTelemetry.Extensions.DependencyInjection.svg)](https://www.nuget.org/packages/OpenTelemetry.Extensions.DependencyInjection) - -## Installation - -```shell -dotnet add package --prerelease OpenTelemetry.Extensions.DependencyInjection -``` - -## Overview - -The OpenTelemetry.Extensions.DependencyInjection package provides extension -methods and helpers for building `TracerProvider`s and `MeterProvider`s using -the Microsoft.Extensions.DependencyInjection API. - -The Microsoft.Extensions.DependencyInjection package is primarily intended for -library authors who need to integrate with the OpenTelemetry SDK. For more -details see: [Registration extension method guidance for library -authors](../../docs/trace/extending-the-sdk/README.md#registration-extension-method-guidance-for-library-authors). - -## References - -* [OpenTelemetry Project](https://opentelemetry.io/) diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj b/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj index e2d22fad28e..873cadb0ee7 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj +++ b/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/OpenTelemetry/OpenTelemetry.csproj b/src/OpenTelemetry/OpenTelemetry.csproj index 3527d6a3071..cb741ecfd6d 100644 --- a/src/OpenTelemetry/OpenTelemetry.csproj +++ b/src/OpenTelemetry/OpenTelemetry.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/MeterProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/MeterProviderBuilderExtensionsTests.cs similarity index 98% rename from test/OpenTelemetry.Extensions.DependencyInjection.Tests/MeterProviderBuilderExtensionsTests.cs rename to test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/MeterProviderBuilderExtensionsTests.cs index 14136ffa92a..cb0b2063b53 100644 --- a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/MeterProviderBuilderExtensionsTests.cs +++ b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/MeterProviderBuilderExtensionsTests.cs @@ -19,7 +19,7 @@ using OpenTelemetry.Metrics; using Xunit; -namespace OpenTelemetry.Extensions.DependencyInjection.Tests; +namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests; public class MeterProviderBuilderExtensionsTests { diff --git a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/OpenTelemetry.Extensions.DependencyInjection.Tests.csproj b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj similarity index 88% rename from test/OpenTelemetry.Extensions.DependencyInjection.Tests/OpenTelemetry.Extensions.DependencyInjection.Tests.csproj rename to test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj index 295a7da1ac5..10273a30d18 100644 --- a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/OpenTelemetry.Extensions.DependencyInjection.Tests.csproj +++ b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs similarity index 97% rename from test/OpenTelemetry.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs rename to test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs index 72ede87e3e9..990335a3a09 100644 --- a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs +++ b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs @@ -19,7 +19,7 @@ using OpenTelemetry.Trace; using Xunit; -namespace OpenTelemetry.Extensions.DependencyInjection.Tests; +namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests; public class ServiceCollectionExtensionsTests { diff --git a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/TestMeterProviderBuilder.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TestMeterProviderBuilder.cs similarity index 98% rename from test/OpenTelemetry.Extensions.DependencyInjection.Tests/TestMeterProviderBuilder.cs rename to test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TestMeterProviderBuilder.cs index 86f7d523274..362dc70e40e 100644 --- a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/TestMeterProviderBuilder.cs +++ b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TestMeterProviderBuilder.cs @@ -17,7 +17,7 @@ using Microsoft.Extensions.DependencyInjection; using OpenTelemetry.Metrics; -namespace OpenTelemetry.Extensions.DependencyInjection.Tests; +namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests; public sealed class TestMeterProviderBuilder : MeterProviderBuilder, IMeterProviderBuilder, IDisposable { diff --git a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/TestTracerProviderBuilder.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TestTracerProviderBuilder.cs similarity index 98% rename from test/OpenTelemetry.Extensions.DependencyInjection.Tests/TestTracerProviderBuilder.cs rename to test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TestTracerProviderBuilder.cs index 89f61ae2bcf..73c48bcd940 100644 --- a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/TestTracerProviderBuilder.cs +++ b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TestTracerProviderBuilder.cs @@ -17,7 +17,7 @@ using Microsoft.Extensions.DependencyInjection; using OpenTelemetry.Trace; -namespace OpenTelemetry.Extensions.DependencyInjection.Tests; +namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests; public sealed class TestTracerProviderBuilder : TracerProviderBuilder, ITracerProviderBuilder, IDisposable { diff --git a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/TracerProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TracerProviderBuilderExtensionsTests.cs similarity index 98% rename from test/OpenTelemetry.Extensions.DependencyInjection.Tests/TracerProviderBuilderExtensionsTests.cs rename to test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TracerProviderBuilderExtensionsTests.cs index 48f8ec50993..faae0245e79 100644 --- a/test/OpenTelemetry.Extensions.DependencyInjection.Tests/TracerProviderBuilderExtensionsTests.cs +++ b/test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/TracerProviderBuilderExtensionsTests.cs @@ -19,7 +19,7 @@ using OpenTelemetry.Trace; using Xunit; -namespace OpenTelemetry.Extensions.DependencyInjection.Tests; +namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests; public class TracerProviderBuilderExtensionsTests {