From 62b605e5d26f40dcf6ea66b9f30215f0a4f98ac4 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 12:08:22 -0800 Subject: [PATCH] Adjust dll dependency checks in ModuleTests: `OpenTelemetry.Extensions.DependencyInjection` was renamed to `OpenTelemetry.Api.ProviderBuilderExtensions` https://github.com/open-telemetry/opentelemetry-dotnet/pull/4125 --- LICENSE | 1 - .../IntegrationTests/ModuleTests.Default.NetCore.verified.txt | 2 +- test/IntegrationTests/ModuleTests.Default.NetFx.verified.txt | 2 +- .../ModuleTests.DefaultNoExporters.NetCore.verified.txt | 2 +- .../ModuleTests.DefaultNoExporters.NetFx.verified.txt | 2 +- .../IntegrationTests/ModuleTests.Minimal.NetCore.verified.txt | 4 ++-- test/IntegrationTests/ModuleTests.Minimal.NetFx.verified.txt | 4 ++-- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index ceb7b40e5b..23cb6c4680 100644 --- a/LICENSE +++ b/LICENSE @@ -230,7 +230,6 @@ Libraries - OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs, - OpenTelemetry.Exporter.Prometheus.HttpListener, - OpenTelemetry.Exporter.Zipkin, -- OpenTelemetry.Extensions.DependencyInjection, - OpenTelemetry.Extensions.Propagators, - OpenTelemetry.Instrumentation.AspNetCore, - OpenTelemetry.Instrumentation.GrpcNetClient, diff --git a/test/IntegrationTests/ModuleTests.Default.NetCore.verified.txt b/test/IntegrationTests/ModuleTests.Default.NetCore.verified.txt index cb876d473a..ad00d12726 100644 --- a/test/IntegrationTests/ModuleTests.Default.NetCore.verified.txt +++ b/test/IntegrationTests/ModuleTests.Default.NetCore.verified.txt @@ -1,11 +1,11 @@ [ OpenTelemetry, OpenTelemetry.Api, + OpenTelemetry.Api.ProviderBuilderExtensions, OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, OpenTelemetry.AutoInstrumentation.StartupHook, OpenTelemetry.Exporter.OpenTelemetryProtocol, - OpenTelemetry.Extensions.DependencyInjection, OpenTelemetry.Instrumentation.Http, OpenTelemetry.Instrumentation.Process, OpenTelemetry.Instrumentation.Runtime diff --git a/test/IntegrationTests/ModuleTests.Default.NetFx.verified.txt b/test/IntegrationTests/ModuleTests.Default.NetFx.verified.txt index badf5e2d3b..107812a77e 100644 --- a/test/IntegrationTests/ModuleTests.Default.NetFx.verified.txt +++ b/test/IntegrationTests/ModuleTests.Default.NetFx.verified.txt @@ -1,10 +1,10 @@ [ OpenTelemetry, OpenTelemetry.Api, + OpenTelemetry.Api.ProviderBuilderExtensions, OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, OpenTelemetry.Exporter.OpenTelemetryProtocol, - OpenTelemetry.Extensions.DependencyInjection, OpenTelemetry.Instrumentation.Http, OpenTelemetry.Instrumentation.Process, OpenTelemetry.Instrumentation.Runtime diff --git a/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetCore.verified.txt b/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetCore.verified.txt index 7c9b62a6a1..6b8c55596e 100644 --- a/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetCore.verified.txt +++ b/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetCore.verified.txt @@ -1,11 +1,11 @@ [ OpenTelemetry, OpenTelemetry.Api, + OpenTelemetry.Api.ProviderBuilderExtensions, OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, OpenTelemetry.AutoInstrumentation.StartupHook, OpenTelemetry.Exporter.OpenTelemetryProtocol, - OpenTelemetry.Extensions.DependencyInjection, OpenTelemetry.Instrumentation.Process, OpenTelemetry.Instrumentation.Runtime ] \ No newline at end of file diff --git a/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetFx.verified.txt b/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetFx.verified.txt index e957461743..c3a5c9d244 100644 --- a/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetFx.verified.txt +++ b/test/IntegrationTests/ModuleTests.DefaultNoExporters.NetFx.verified.txt @@ -1,10 +1,10 @@ [ OpenTelemetry, OpenTelemetry.Api, + OpenTelemetry.Api.ProviderBuilderExtensions, OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, OpenTelemetry.Exporter.OpenTelemetryProtocol, - OpenTelemetry.Extensions.DependencyInjection, OpenTelemetry.Instrumentation.Process, OpenTelemetry.Instrumentation.Runtime ] \ No newline at end of file diff --git a/test/IntegrationTests/ModuleTests.Minimal.NetCore.verified.txt b/test/IntegrationTests/ModuleTests.Minimal.NetCore.verified.txt index 518ebb55eb..bf81165da9 100644 --- a/test/IntegrationTests/ModuleTests.Minimal.NetCore.verified.txt +++ b/test/IntegrationTests/ModuleTests.Minimal.NetCore.verified.txt @@ -1,9 +1,9 @@ [ OpenTelemetry, OpenTelemetry.Api, + OpenTelemetry.Api.ProviderBuilderExtensions, OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, OpenTelemetry.AutoInstrumentation.StartupHook, - OpenTelemetry.Exporter.OpenTelemetryProtocol, - OpenTelemetry.Extensions.DependencyInjection + OpenTelemetry.Exporter.OpenTelemetryProtocol ] \ No newline at end of file diff --git a/test/IntegrationTests/ModuleTests.Minimal.NetFx.verified.txt b/test/IntegrationTests/ModuleTests.Minimal.NetFx.verified.txt index 84cbe3ca55..2acd726e73 100644 --- a/test/IntegrationTests/ModuleTests.Minimal.NetFx.verified.txt +++ b/test/IntegrationTests/ModuleTests.Minimal.NetFx.verified.txt @@ -1,8 +1,8 @@ [ OpenTelemetry, OpenTelemetry.Api, + OpenTelemetry.Api.ProviderBuilderExtensions, OpenTelemetry.AutoInstrumentation, OpenTelemetry.AutoInstrumentation.Loader, - OpenTelemetry.Exporter.OpenTelemetryProtocol, - OpenTelemetry.Extensions.DependencyInjection + OpenTelemetry.Exporter.OpenTelemetryProtocol ] \ No newline at end of file