From 92ab58250efaf420d07121f44301b3db9ef48ba6 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 10:58:42 -0800 Subject: [PATCH 01/15] Bump OTel 1.4.0-rc.3 --- CHANGELOG.md | 2 +- Directory.Packages.props | 10 ++-- docs/README.md | 2 +- docs/config.md | 6 +-- docs/plugins.md | 32 ++++++------- .../OpenTelemetry.AutoInstrumentation.nuspec | 48 +++++++++---------- src/Directory.Packages.props | 16 +++---- 7 files changed, 58 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa931a6160..ca27d87ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h This beta release is built on top of [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet): - [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): - [`1.4.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2) + [`1.4.0-rc.3`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.3) - `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0) ### Added diff --git a/Directory.Packages.props b/Directory.Packages.props index f22d87c72d..ef8f715999 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,11 +4,11 @@ - - - - - + + + + + diff --git a/docs/README.md b/docs/README.md index 1224849d11..d800ce5b5a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -18,7 +18,7 @@ OpenTelemetry .NET Automatic Instrumentation is built on top of [OpenTelemetry .NET](https://github.com/open-telemetry/opentelemetry-dotnet): - [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): -[`1.4.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2) +[`1.4.0-rc.3`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.3) - `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0) referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0) diff --git a/docs/config.md b/docs/config.md index 83e251dc87..213a42b512 100644 --- a/docs/config.md +++ b/docs/config.md @@ -221,7 +221,7 @@ To enable the OTLP exporter, set the `OTEL_TRACES_EXPORTER`/`OTEL_METRICS_EXPORT environment variable to `otlp`. To customize the OTLP exporter using environment variables, see the -[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.2/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables). +[OTLP exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.OpenTelemetryProtocol#environment-variables). Important environment variables include: | Environment variable | Description | Default value | @@ -266,7 +266,7 @@ The exporter exposes the metrics HTTP endpoint on `http://localhost:9464/metrics and it caches the responses for 300 milliseconds. See the -[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.2/src/OpenTelemetry.Exporter.Prometheus.HttpListener). +[Prometheus Exporter HttpListener documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.Prometheus.HttpListener). to learn more. ### Zipkin @@ -275,7 +275,7 @@ To enable the Zipkin exporter, set the `OTEL_TRACES_EXPORTER` environment variable to `zipkin`. To customize the Zipkin exporter using environment variables, -see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.2/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables). +see the [Zipkin exporter documentation](https://github.com/open-telemetry/opentelemetry-dotnet/tree/core-1.4.0-rc.3/src/OpenTelemetry.Exporter.Zipkin#configuration-using-environment-variables). Important environment variables include: | Environment variable | Description | Default value | diff --git a/docs/plugins.md b/docs/plugins.md index 7fe1b3d151..82a92ab447 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -78,29 +78,29 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |------------------------------------------------------------------------------------------------|---------------------------------------------------|---------------| -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.2 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 | | OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.7 | -| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.11 | +| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.12 | | OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.4 | -| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.0.0-rc9.11 | -| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.0.0-rc9.11 | +| OpenTelemetry.Instrumentation.GrpcNetClient.GrpcClientInstrumentationOptions | OpenTelemetry.Instrumentation.GrpcNetClient | 1.0.0-rc9.12 | +| OpenTelemetry.Instrumentation.Http.HttpClientInstrumentationOptions | OpenTelemetry.Instrumentation.Http | 1.0.0-rc9.12 | | OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-alpha.1 | -| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.11 | +| OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.0.0-rc9.12 | | OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisCallsInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.7 | -| OpenTelemetry.Instrumentation.MySqlData.MySqlDataInstrumentationOptions | OpenTelemetry.Instrumentation.MySqlData | 1.0.0-beta.4 | +| OpenTelemetry.Instrumentation.MySqlData.MySqlDataInstrumentationOptions | OpenTelemetry.Instrumentation.MySqlData | 1.0.0-beta.5 | | OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.8 | ### Metrics | Options type | NuGet package | NuGet version | |----------------------------------------------------------------------------------|------------------------------------------------|---------------| -| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.2 | -| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.11 | +| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 | +| OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.12 | | OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.1.0-beta.3 | | OpenTelemetry.Instrumentation.Process.ProcessInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-alpha.4 | @@ -108,9 +108,9 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |-----------------------------------------------|----------------------------------------------|---------------| -| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.2 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.2 | +| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.4.0-rc.3 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 | ## Requirements diff --git a/nuget/OpenTelemetry.AutoInstrumentation.nuspec b/nuget/OpenTelemetry.AutoInstrumentation.nuspec index 98a9aa4272..8318e7c1f7 100644 --- a/nuget/OpenTelemetry.AutoInstrumentation.nuspec +++ b/nuget/OpenTelemetry.AutoInstrumentation.nuspec @@ -13,43 +13,43 @@ - - - - - - - - - + + + + + + + + + - + - - - + + + - - - - - - - - - + + + + + + + + + - + - + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 91b37107df..d369fc7a4a 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -9,21 +9,21 @@ - - - - + + + + - + - + - + - + From 0b3f3c1fe7f7646b1061cbb57695cf1d01a01afe Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:02:35 -0800 Subject: [PATCH 02/15] Temporary suppress this warning for OpenTelemetry.Instrumentation.Runtime and OpenTelemetry.Instrumentation.Process because they require exact version --- .github/workflows/ci.yml | 2 +- .../OpenTelemetry.AutoInstrumentation.csproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99bcb9305f..1b32259dbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: path: nuget/bin-macos - name: Build NuGet package - run: nuget pack OpenTelemetry.AutoInstrumentation.nuspec -Properties NoWarn=NU5100,NU5123,NU5128 + run: nuget pack OpenTelemetry.AutoInstrumentation.nuspec -Properties NoWarn=NU5100,NU5123,NU5128,NU1608 working-directory: nuget - name: Upload Nuget diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj index f9199badeb..a19df4c195 100644 --- a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj @@ -4,6 +4,8 @@ 0.5.1 + + NU1608 From e3d3ef3f95564f915658b00b679f1dd9a0ab4ce4 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:05:42 -0800 Subject: [PATCH 03/15] Update versions in redirection .h file by running `nuke BuildTracer` --- .../netfx_assembly_redirection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 68f1626a82..11d98923db 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -27,12 +27,12 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"Microsoft.Win32.Primitives", {4, 0, 3, 0} }, { L"OpenTelemetry", {1, 0, 0, 0} }, { L"OpenTelemetry.Api", {1, 0, 0, 0} }, + { L"OpenTelemetry.Api.ProviderBuilderExtensions", {1, 0, 0, 0} }, { L"OpenTelemetry.AutoInstrumentation", {0, 5, 1, 0} }, { L"OpenTelemetry.Exporter.Console", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.OpenTelemetryProtocol", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.Prometheus.HttpListener", {1, 0, 0, 0} }, { L"OpenTelemetry.Exporter.Zipkin", {1, 0, 0, 0} }, - { L"OpenTelemetry.Extensions.DependencyInjection", {1, 0, 0, 0} }, { L"OpenTelemetry.Extensions.Propagators", {1, 0, 0, 0} }, { L"OpenTelemetry.Instrumentation.AspNet", {1, 0, 0, 7} }, { L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 0, 0, 7} }, From c0750e193969f8da8778e99c17e439648f51ade1 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:21:34 -0800 Subject: [PATCH 04/15] Another update on CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca27d87ad6..9614e7a3c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ This beta release is built on top of [OpenTelemetry .NET](https://github.com/ope ### Changed - Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): - [`1.4.0-rc.2`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.2) + [`1.4.0-rc.3`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.4.0-rc.3) - Move `OpenTelemetry.AutoInstrumentation.Native.so` to `linux-x64` directory in `tracer-home` for Linux glibc, `OpenTelemetry.AutoInstrumentation.Native.so` to `linux-musl-x64` for Linux musl and From c5472b07ade762dc4e53e4829c445d871bc6a25b Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:25:29 -0800 Subject: [PATCH 05/15] Add `OpenTelemetry.Api.ProviderBuilderExtensions` in LICENSE file. Sort libraries alphabetically and adjust minor markdown lint warnings/errors. --- LICENSE | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/LICENSE b/LICENSE index 9c74803e7d..b21b1cf6be 100644 --- a/LICENSE +++ b/LICENSE @@ -212,18 +212,22 @@ Copyright 2008 Google Inc. All rights reserved under BSD-3-Clause license (https://github.com/protocolbuffers/protobuf/blob/main/LICENSE). Libraries + - Google.Protobuf, -- Grpc.Net.Common, - Grpc.Net.Client +- Grpc.Net.Common, are under the following copyright: Copyright 2019 The gRPC Authors under Apache License Version 2.0 (https://github.com/grpc/grpc-dotnet/blob/master/LICENSE). Libraries + +- OpenTelemetry - OpenTelemetry.Api, +- OpenTelemetry.Api.ProviderBuilderExtensions, - OpenTelemetry.Exporter.Console, -- OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs, - OpenTelemetry.Exporter.OpenTelemetryProtocol, +- OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs, - OpenTelemetry.Exporter.Prometheus.HttpListener, - OpenTelemetry.Exporter.Zipkin, - OpenTelemetry.Extensions.DependencyInjection, @@ -233,12 +237,12 @@ Libraries - OpenTelemetry.Instrumentation.Http, - OpenTelemetry.Instrumentation.SqlClient, - OpenTelemetry.Shims.OpenTracing, -- OpenTelemetry are under the following copyright: Copyright The OpenTelemetry Authors under Apache License Version 2.0 (https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE). Libraries + - OpenTelemetry.Api, - OpenTelemetry.Instrumentation.EntityFrameworkCore, - OpenTelemetry.Instrumentation.MySqlData, @@ -256,25 +260,27 @@ Copyright The OpenTracing Authors under Apache License Version 2.0 (https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE). Libraries -- System.Diagnostics.DiagnosticSource, -- System.Security.Permissions, + +- Microsoft.Extensions.Configuration, - Microsoft.Extensions.Configuration.Abstractions, - Microsoft.Extensions.Configuration.Binder, - Microsoft.Extensions.Configuration.EnvironmentVariables, -- Microsoft.Extensions.Configuration, -- Microsoft.Extensions.DependencyInjection.Abstractions, - Microsoft.Extensions.DependencyInjection, +- Microsoft.Extensions.DependencyInjection.Abstractions, +- Microsoft.Extensions.Logging, - Microsoft.Extensions.Logging.Abstractions, - Microsoft.Extensions.Logging.Configuration, -- Microsoft.Extensions.Logging, -- Microsoft.Extensions.Options.ConfigurationExtensions, - Microsoft.Extensions.Options, +- Microsoft.Extensions.Options.ConfigurationExtensions, - Microsoft.Extensions.Primitives +- System.Diagnostics.DiagnosticSource, +- System.Security.Permissions, are under the following copyright: Copyright (c) .NET Foundation and Contributors under the MIT License (MIT) (https://github.com/dotnet/runtime/blob/main/LICENSE.TXT). Libraries + - System.Private.ServiceModel, - System.ServiceModel.Primitives, - System.ServiceModel @@ -287,20 +293,22 @@ Copyright The DnsClient.NET Authors under Apache License Version 2.0 (https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE). Libraries + - MongoDB.Bson, - MongoDB.Driver.Core, -- libzstd, -- snappy32, -- snappy64, - MongoDB.Libmongocrypt, - libmongocrypt, +- libzstd, - mongocrypt +- snappy32, +- snappy64, are under the following copyright: Copyright 2010-present MongoDB Inc. under Apache License Version 2.0 (https://github.com/mongodb/mongo-csharp-driver/blob/master/License.txt). Library MongoDB.Driver.Core.Extensions.DiagnosticSources is under the following copyright: -Copyright MongoDB.Driver.Core.Extensions.DiagnosticSources Authors under Apache License Version 2.0 +Copyright MongoDB.Driver.Core.Extensions.DiagnosticSources Authors under Apache +License Version 2.0 (https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources/blob/master/LICENSE). Library SharpCompress is under the following copyright: From bc6ac168deb5f7ec96e99ef29d78ecf51c0fb7b8 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:28:01 -0800 Subject: [PATCH 06/15] Fix MD034 no-bare-urls: https://github.com/DavidAnson/markdownlint/blob/v0.27.0/doc/md034.md --- LICENSE | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index b21b1cf6be..ceb7b40e5b 100644 --- a/LICENSE +++ b/LICENSE @@ -209,7 +209,7 @@ separate copyright notices and license terms: Library Google.Protobuf is under the following copyright: Copyright 2008 Google Inc. All rights reserved under BSD-3-Clause license -(https://github.com/protocolbuffers/protobuf/blob/main/LICENSE). +(). Libraries @@ -218,7 +218,7 @@ Libraries - Grpc.Net.Common, are under the following copyright: Copyright 2019 The gRPC Authors under Apache License Version 2.0 -(https://github.com/grpc/grpc-dotnet/blob/master/LICENSE). +(). Libraries @@ -239,7 +239,7 @@ Libraries - OpenTelemetry.Shims.OpenTracing, are under the following copyright: Copyright The OpenTelemetry Authors under Apache License Version 2.0 -(https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE). +(). Libraries @@ -253,11 +253,11 @@ Libraries - OpenTelemetry.Instrumentation.Wcf are under the following copyright: Copyright The OpenTelemetry Authors under Apache License Version 2.0 -(https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/LICENSE). +(). Library OpenTracing is under the following copyright: Copyright The OpenTracing Authors under Apache License Version 2.0 -(https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE). +(). Libraries @@ -277,7 +277,7 @@ Libraries - System.Security.Permissions, are under the following copyright: Copyright (c) .NET Foundation and Contributors under the MIT License (MIT) -(https://github.com/dotnet/runtime/blob/main/LICENSE.TXT). +(). Libraries @@ -286,11 +286,11 @@ Libraries - System.ServiceModel are under the following copyright: Copyright (c) .NET Foundation and Contributors under the MIT License (MIT) -(https://github.com/dotnet/wcf/blob/main/LICENSE.TXT). +(). Library DnsClient is under the following copyright: Copyright The DnsClient.NET Authors under Apache License Version 2.0 -(https://github.com/opentracing/opentracing-csharp/blob/master/LICENSE). +(). Libraries @@ -304,13 +304,13 @@ Libraries - snappy64, are under the following copyright: Copyright 2010-present MongoDB Inc. under Apache License Version 2.0 -(https://github.com/mongodb/mongo-csharp-driver/blob/master/License.txt). +(). Library MongoDB.Driver.Core.Extensions.DiagnosticSources is under the following copyright: Copyright MongoDB.Driver.Core.Extensions.DiagnosticSources Authors under Apache License Version 2.0 -(https://github.com/jbogard/MongoDB.Driver.Core.Extensions.DiagnosticSources/blob/master/LICENSE). +(). Library SharpCompress is under the following copyright: Copyright (c) 2014 Adam Hathcock under the MIT License (MIT) -(https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt). +(). From b5fb524485b27d6b7380c48ddcdebd2b5675ab69 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:53:14 -0800 Subject: [PATCH 07/15] Adjust dependencies for `DistributionStructure` --- .../BuildTests.DistributionStructure_alpine-linux.verified.txt | 2 +- .../BuildTests.DistributionStructure_linux.verified.txt | 2 +- .../BuildTests.DistributionStructure_osx.verified.txt | 2 +- .../BuildTests.DistributionStructure_windows.verified.txt | 2 +- test/IntegrationTests/BuildTests.cs | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index c815e50a7c..ba2ec40c27 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -9,6 +9,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.dll, /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.pdb, @@ -23,7 +24,6 @@ /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, /net/OpenTelemetry.Exporter.Zipkin.dll, - /net/OpenTelemetry.Extensions.DependencyInjection.dll, /net/OpenTelemetry.Extensions.Propagators.dll, /net/OpenTelemetry.Instrumentation.AspNetCore.dll, /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index 9dd53e2092..d2bb9d67aa 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -9,6 +9,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.dll, /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.pdb, @@ -23,7 +24,6 @@ /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, /net/OpenTelemetry.Exporter.Zipkin.dll, - /net/OpenTelemetry.Extensions.DependencyInjection.dll, /net/OpenTelemetry.Extensions.Propagators.dll, /net/OpenTelemetry.Instrumentation.AspNetCore.dll, /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 6c1ad5e6f4..16cd869712 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -8,6 +8,7 @@ /net/Grpc.Core.Api.dll, /net/Grpc.Net.Client.dll, /net/Grpc.Net.Common.dll, + /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, /net/OpenTelemetry.Api.dll, /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.dll, /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.pdb, @@ -22,7 +23,6 @@ /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, /net/OpenTelemetry.Exporter.Zipkin.dll, - /net/OpenTelemetry.Extensions.DependencyInjection.dll, /net/OpenTelemetry.Extensions.Propagators.dll, /net/OpenTelemetry.Instrumentation.AspNetCore.dll, /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index 5b0af4ecb6..4360ac3af7 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -8,6 +8,7 @@ \net\Grpc.Core.Api.dll, \net\Grpc.Net.Client.dll, \net\Grpc.Net.Common.dll, + \net\OpenTelemetry.Api.ProviderBuilderExtensions.dll, \net\OpenTelemetry.Api.dll, \net\OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.dll, \net\OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.pdb, @@ -22,7 +23,6 @@ \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, \net\OpenTelemetry.Exporter.Prometheus.HttpListener.dll, \net\OpenTelemetry.Exporter.Zipkin.dll, - \net\OpenTelemetry.Extensions.DependencyInjection.dll, \net\OpenTelemetry.Extensions.Propagators.dll, \net\OpenTelemetry.Instrumentation.AspNetCore.dll, \net\OpenTelemetry.Instrumentation.EntityFrameworkCore.dll, diff --git a/test/IntegrationTests/BuildTests.cs b/test/IntegrationTests/BuildTests.cs index 49ca259c16..2a1c6d5632 100644 --- a/test/IntegrationTests/BuildTests.cs +++ b/test/IntegrationTests/BuildTests.cs @@ -39,8 +39,7 @@ public Task DistributionStructure() var systemName = GetSystemName(); return Verifier.Verify(relativesPaths) - .UseTextForParameters(systemName) - .DisableDiff(); + .UseTextForParameters(systemName); } private static string GetSystemName() From 60f8baa5c82c691f3b6ca9ed60e3e6d09d921ef2 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:53:53 -0800 Subject: [PATCH 08/15] Adjust dependency checks for `DefinedTransientDeps_Are_MatchingGeneratedDeps` --- src/Directory.Packages.props | 2 +- .../OpenTelemetry.AutoInstrumentation.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index d369fc7a4a..4964ef6d46 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -48,7 +48,6 @@ - @@ -58,6 +57,7 @@ + diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj index a19df4c195..e799b495a5 100644 --- a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj @@ -50,7 +50,6 @@ - @@ -60,6 +59,7 @@ + From c80e8df92ab8df66ce72665287cbdf5b3c07d9b3 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 11:56:01 -0800 Subject: [PATCH 09/15] Another change for DistributionStructure --- .../BuildTests.DistributionStructure_windows.verified.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index 4360ac3af7..a4f084ebe4 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -60,6 +60,7 @@ \netfx\Microsoft.Extensions.Options.dll, \netfx\Microsoft.Extensions.Primitives.dll, \netfx\Microsoft.Win32.Primitives.dll, + \netfx\OpenTelemetry.Api.ProviderBuilderExtensions.dll, \netfx\OpenTelemetry.Api.dll, \netfx\OpenTelemetry.AutoInstrumentation.dll, \netfx\OpenTelemetry.AutoInstrumentation.pdb, @@ -67,7 +68,6 @@ \netfx\OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, \netfx\OpenTelemetry.Exporter.Prometheus.HttpListener.dll, \netfx\OpenTelemetry.Exporter.Zipkin.dll, - \netfx\OpenTelemetry.Extensions.DependencyInjection.dll, \netfx\OpenTelemetry.Extensions.Propagators.dll, \netfx\OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.dll, \netfx\OpenTelemetry.Instrumentation.AspNet.dll, From 62b605e5d26f40dcf6ea66b9f30215f0a4f98ac4 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 12:08:22 -0800 Subject: [PATCH 10/15] 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 From 3ab0d94f85745b9335ab6032281cddbe7e21e32a Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 12:11:23 -0800 Subject: [PATCH 11/15] Reran `nuke BuildTracer` --- .../netfx_assembly_redirection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 11d98923db..2b9c06f7fd 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -15,7 +15,6 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"Microsoft.Extensions.Configuration", {3, 1, 0, 0} }, { L"Microsoft.Extensions.Configuration.Abstractions", {3, 1, 0, 0} }, { L"Microsoft.Extensions.Configuration.Binder", {3, 1, 0, 0} }, - { L"Microsoft.Extensions.Configuration.EnvironmentVariables", {3, 1, 0, 0} }, { L"Microsoft.Extensions.DependencyInjection", {3, 1, 0, 0} }, { L"Microsoft.Extensions.DependencyInjection.Abstractions", {5, 0, 0, 0} }, { L"Microsoft.Extensions.Logging", {3, 1, 0, 0} }, @@ -52,6 +51,7 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"System.Collections.NonGeneric", {4, 0, 3, 0} }, { L"System.Collections.Specialized", {4, 0, 3, 0} }, { L"System.ComponentModel", {4, 0, 1, 0} }, + { L"System.ComponentModel.Annotations", {4, 2, 1, 0} }, { L"System.ComponentModel.EventBasedAsync", {4, 0, 11, 0} }, { L"System.ComponentModel.Primitives", {4, 1, 2, 0} }, { L"System.ComponentModel.TypeConverter", {4, 1, 2, 0} }, From 07788faea694b09f22d841834e8dc869332356c9 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 14:18:54 -0800 Subject: [PATCH 12/15] OTel SDK removed dependency for `Microsoft.Extensions.Configuration.EnvironmentVariables`: https://github.com/open-telemetry/opentelemetry-dotnet/pull/4092 --- LICENSE | 1 - .../Directory.Build.props | 1 - .../Directory.Packages.props | 1 - ...ildTests.DistributionStructure_alpine-linux.verified.txt | 4 ---- .../BuildTests.DistributionStructure_linux.verified.txt | 4 ---- .../BuildTests.DistributionStructure_osx.verified.txt | 4 ---- .../BuildTests.DistributionStructure_windows.verified.txt | 6 +----- 7 files changed, 1 insertion(+), 20 deletions(-) diff --git a/LICENSE b/LICENSE index 23cb6c4680..fec4b5aa89 100644 --- a/LICENSE +++ b/LICENSE @@ -263,7 +263,6 @@ Libraries - Microsoft.Extensions.Configuration, - Microsoft.Extensions.Configuration.Abstractions, - Microsoft.Extensions.Configuration.Binder, -- Microsoft.Extensions.Configuration.EnvironmentVariables, - Microsoft.Extensions.DependencyInjection, - Microsoft.Extensions.DependencyInjection.Abstractions, - Microsoft.Extensions.Logging, diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props index 4659de022b..22b0badac2 100644 --- a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props +++ b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Build.props @@ -3,7 +3,6 @@ - diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props index e3e4302534..251f43f5e1 100644 --- a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props +++ b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/Directory.Packages.props @@ -6,7 +6,6 @@ - diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index ba2ec40c27..4c2f618581 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -47,7 +47,6 @@ /store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, @@ -72,7 +71,6 @@ /store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, @@ -96,7 +94,6 @@ /store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, @@ -121,7 +118,6 @@ /store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index d2bb9d67aa..b2fbb1fa72 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -47,7 +47,6 @@ /store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, @@ -72,7 +71,6 @@ /store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, @@ -96,7 +94,6 @@ /store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, @@ -121,7 +118,6 @@ /store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 16cd869712..6babef55e9 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -47,7 +47,6 @@ /store/x64/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x64/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x64/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, /store/x64/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, @@ -72,7 +71,6 @@ /store/x64/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x64/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x64/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x64/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, /store/x64/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x64/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, @@ -96,7 +94,6 @@ /store/x86/net6.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x86/net6.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x86/net6.0/microsoft.extensions.configuration.binder/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net6.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x86/net6.0/microsoft.extensions.configuration/7.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, /store/x86/net6.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x86/net6.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, @@ -121,7 +118,6 @@ /store/x86/net7.0/dnsclient/1.4.0/lib/netstandard2.1/DnsClient.dll, /store/x86/net7.0/microsoft.extensions.configuration.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x86/net7.0/microsoft.extensions.configuration.binder/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/x86/net7.0/microsoft.extensions.configuration.environmentvariables/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll, /store/x86/net7.0/microsoft.extensions.configuration/7.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, /store/x86/net7.0/microsoft.extensions.dependencyinjection.abstractions/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, /store/x86/net7.0/microsoft.extensions.dependencyinjection/7.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index a4f084ebe4..9b8acfcb61 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -49,7 +49,6 @@ \netfx\Microsoft.Bcl.AsyncInterfaces.dll, \netfx\Microsoft.Extensions.Configuration.Abstractions.dll, \netfx\Microsoft.Extensions.Configuration.Binder.dll, - \netfx\Microsoft.Extensions.Configuration.EnvironmentVariables.dll, \netfx\Microsoft.Extensions.Configuration.dll, \netfx\Microsoft.Extensions.DependencyInjection.Abstractions.dll, \netfx\Microsoft.Extensions.DependencyInjection.dll, @@ -87,6 +86,7 @@ \netfx\System.Collections.NonGeneric.dll, \netfx\System.Collections.Specialized.dll, \netfx\System.Collections.dll, + \netfx\System.ComponentModel.Annotations.dll, \netfx\System.ComponentModel.EventBasedAsync.dll, \netfx\System.ComponentModel.Primitives.dll, \netfx\System.ComponentModel.TypeConverter.dll, @@ -191,7 +191,6 @@ \store\x64\net6.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll, \store\x64\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Abstractions.dll, \store\x64\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x64\net6.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll, \store\x64\net6.0\microsoft.extensions.configuration\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.dll, \store\x64\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, \store\x64\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll, @@ -216,7 +215,6 @@ \store\x64\net7.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll, \store\x64\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll, \store\x64\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x64\net7.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll, \store\x64\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll, \store\x64\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, \store\x64\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll, @@ -240,7 +238,6 @@ \store\x86\net6.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll, \store\x86\net6.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Abstractions.dll, \store\x86\net6.0\microsoft.extensions.configuration.binder\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x86\net6.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll, \store\x86\net6.0\microsoft.extensions.configuration\7.0.0\lib\net6.0\Microsoft.Extensions.Configuration.dll, \store\x86\net6.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, \store\x86\net6.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net6.0\Microsoft.Extensions.DependencyInjection.dll, @@ -265,7 +262,6 @@ \store\x86\net7.0\dnsclient\1.4.0\lib\netstandard2.1\DnsClient.dll, \store\x86\net7.0\microsoft.extensions.configuration.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Abstractions.dll, \store\x86\net7.0\microsoft.extensions.configuration.binder\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.Binder.dll, - \store\x86\net7.0\microsoft.extensions.configuration.environmentvariables\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll, \store\x86\net7.0\microsoft.extensions.configuration\7.0.0\lib\net7.0\Microsoft.Extensions.Configuration.dll, \store\x86\net7.0\microsoft.extensions.dependencyinjection.abstractions\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll, \store\x86\net7.0\microsoft.extensions.dependencyinjection\7.0.0\lib\net7.0\Microsoft.Extensions.DependencyInjection.dll, From fb629f5cb2e868697418ef1f7d50338e964870d3 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 14:27:05 -0800 Subject: [PATCH 13/15] Upgrade version for `OpenTelemetry.Instrumentation.Runtime` and `OpenTelemetry.Instrumentation.Process` --- .github/workflows/ci.yml | 2 +- docs/plugins.md | 4 ++-- nuget/OpenTelemetry.AutoInstrumentation.nuspec | 8 ++++---- src/Directory.Packages.props | 4 ++-- .../OpenTelemetry.AutoInstrumentation.csproj | 2 -- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b32259dbe..99bcb9305f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: path: nuget/bin-macos - name: Build NuGet package - run: nuget pack OpenTelemetry.AutoInstrumentation.nuspec -Properties NoWarn=NU5100,NU5123,NU5128,NU1608 + run: nuget pack OpenTelemetry.AutoInstrumentation.nuspec -Properties NoWarn=NU5100,NU5123,NU5128 working-directory: nuget - name: Upload Nuget diff --git a/docs/plugins.md b/docs/plugins.md index 82a92ab447..487da5282f 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -101,8 +101,8 @@ public class MyPlugin | OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.4.0-rc.3 | | OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.4.0-rc.3 | | OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.0.0-rc9.12 | -| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.1.0-beta.3 | -| OpenTelemetry.Instrumentation.Process.ProcessInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-alpha.4 | +| OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.1.0-beta.4 | +| OpenTelemetry.Instrumentation.Process.ProcessInstrumentationOptions | OpenTelemetry.Instrumentation.Process | 1.0.0-alpha.5 | ### Logs diff --git a/nuget/OpenTelemetry.AutoInstrumentation.nuspec b/nuget/OpenTelemetry.AutoInstrumentation.nuspec index 8318e7c1f7..239aa29983 100644 --- a/nuget/OpenTelemetry.AutoInstrumentation.nuspec +++ b/nuget/OpenTelemetry.AutoInstrumentation.nuspec @@ -23,8 +23,8 @@ - - + + @@ -45,8 +45,8 @@ - - + + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4964ef6d46..2b66b42e9c 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -18,9 +18,9 @@ - + - + diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj index e799b495a5..ffd79ebbab 100644 --- a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj @@ -4,8 +4,6 @@ 0.5.1 - - NU1608 From e94f5e46d45e4a9ee955636dafe93928d2beebb6 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 14:28:02 -0800 Subject: [PATCH 14/15] Update netfx_assembly_redirection.h by running `nuke BuildTracer` --- .../netfx_assembly_redirection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h index 2b9c06f7fd..9746fef348 100644 --- a/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h +++ b/src/OpenTelemetry.AutoInstrumentation.Native/netfx_assembly_redirection.h @@ -37,9 +37,9 @@ void CorProfiler::InitNetFxAssemblyRedirectsMap() { L"OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule", {1, 0, 0, 7} }, { L"OpenTelemetry.Instrumentation.GrpcNetClient", {1, 0, 0, 0} }, { L"OpenTelemetry.Instrumentation.Http", {1, 0, 0, 0} }, - { L"OpenTelemetry.Instrumentation.Process", {1, 0, 0, 4} }, + { L"OpenTelemetry.Instrumentation.Process", {1, 0, 0, 5} }, { L"OpenTelemetry.Instrumentation.Quartz", {1, 0, 0, 1} }, - { L"OpenTelemetry.Instrumentation.Runtime", {1, 1, 0, 3} }, + { L"OpenTelemetry.Instrumentation.Runtime", {1, 1, 0, 4} }, { L"OpenTelemetry.Instrumentation.SqlClient", {1, 0, 0, 0} }, { L"OpenTelemetry.Instrumentation.Wcf", {1, 0, 0, 8} }, { L"OpenTelemetry.Shims.OpenTracing", {1, 0, 0, 0} }, From 75a171714cdf059a1f700280ab8ab2d4e35c1ef3 Mon Sep 17 00:00:00 2001 From: xiang17 Date: Thu, 2 Feb 2023 15:03:43 -0800 Subject: [PATCH 15/15] Add back `DisableDiff()` --- test/IntegrationTests/BuildTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/IntegrationTests/BuildTests.cs b/test/IntegrationTests/BuildTests.cs index 2a1c6d5632..49ca259c16 100644 --- a/test/IntegrationTests/BuildTests.cs +++ b/test/IntegrationTests/BuildTests.cs @@ -39,7 +39,8 @@ public Task DistributionStructure() var systemName = GetSystemName(); return Verifier.Verify(relativesPaths) - .UseTextForParameters(systemName); + .UseTextForParameters(systemName) + .DisableDiff(); } private static string GetSystemName()