From 82b5624d8b32b465c5c63231cdaae65d07a2eb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 7 Sep 2023 10:53:07 +0200 Subject: [PATCH] Bump OpenTelemetry to 1.6.0 (#2925) * Bump OpenTelemetry from 1.5.1 to 1.6.0 Bumps [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-dotnet) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.5.1...core-1.6.0) --- updated-dependencies: - dependency-name: OpenTelemetry dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump OpenTelemetry.Exporter.OpenTelemetryProtocol from 1.5.1 to 1.6.0 Bumps [OpenTelemetry.Exporter.OpenTelemetryProtocol](https://github.com/open-telemetry/opentelemetry-dotnet) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.5.1...core-1.6.0) --- updated-dependencies: - dependency-name: OpenTelemetry.Exporter.OpenTelemetryProtocol dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump OpenTelemetry.Exporter.Zipkin from 1.5.1 to 1.6.0 Bumps [OpenTelemetry.Exporter.Zipkin](https://github.com/open-telemetry/opentelemetry-dotnet) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.5.1...core-1.6.0) --- updated-dependencies: - dependency-name: OpenTelemetry.Exporter.Zipkin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump OpenTelemetry.Extensions.Propagators from 1.5.1 to 1.6.0 Bumps [OpenTelemetry.Extensions.Propagators](https://github.com/open-telemetry/opentelemetry-dotnet) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.5.1...core-1.6.0) --- updated-dependencies: - dependency-name: OpenTelemetry.Extensions.Propagators dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump OpenTelemetry.Api from 1.5.1 to 1.6.0 Bumps [OpenTelemetry.Api](https://github.com/open-telemetry/opentelemetry-dotnet) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.5.1...core-1.6.0) --- updated-dependencies: - dependency-name: OpenTelemetry.Api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump OpenTelemetry.Exporter.Console from 1.5.1 to 1.6.0 Bumps [OpenTelemetry.Exporter.Console](https://github.com/open-telemetry/opentelemetry-dotnet) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-dotnet/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-dotnet/compare/core-1.5.1...core-1.6.0) --- updated-dependencies: - dependency-name: OpenTelemetry.Exporter.Console dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump OpenTelemetry.Shims.OpenTracing from 1.5.0-beta.1 to 1.6.0-beta.1 * Cleanup OTLP protocol references * Fix OpenTracing Shim integration * Bump OpenTelemetry.Exporter.Prometheus.HttpListener to 1.6.0-rc.1 * Changelog + documentation * Fix Quartz and MassTransit tests --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- CHANGELOG.md | 10 +++ Directory.Packages.props | 8 +-- LICENSE | 1 - docs/README.md | 4 +- docs/manual-instrumentation.md | 4 +- docs/plugins.md | 22 +++--- src/Directory.Packages.props | 11 ++- .../EnvironmentConfigurationTracerHelper.cs | 5 ++ .../Instrumentation.cs | 42 +----------- .../OpenTelemetry.AutoInstrumentation.csproj | 3 - .../OpenTracingHelper.cs | 67 +++++++++++++++++++ ...ibutionStructure_alpine-linux.verified.txt | 1 - ...s.DistributionStructure_linux.verified.txt | 1 - ...sts.DistributionStructure_osx.verified.txt | 1 - ...DistributionStructure_windows.verified.txt | 1 - test/IntegrationTests/OpenTracingTests.cs | 2 +- .../TestApplication.MassTransit.csproj | 2 + .../TestApplication.Quartz.csproj | 2 + 18 files changed, 111 insertions(+), 76 deletions(-) create mode 100644 src/OpenTelemetry.AutoInstrumentation/OpenTracingHelper.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e8f55f76..c32d709c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h ## [Unreleased](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/compare/v1.0.0-rc.2...HEAD) +This 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.6.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.6.0) +- `System.Diagnostics.DiagnosticSource`: [`7.0.2`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.2) + ### Added - Added support for Azure SDK traces instrumentation on .NET Framework. @@ -14,8 +20,12 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h ### Changed +- Updated [Core components](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/VERSIONING.md#core-components): + [`1.6.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.6.0). - [MySql.Data](https://www.nuget.org/packages/MySql.Data/) instrumentation is now supported from version 8.1.0 working on .NET. +- OpenTracing spans are registered under `opentracing-shim` name + instead of `OpenTelemetry.AutoInstrumentation.OpenTracingShim`. ### Deprecated diff --git a/Directory.Packages.props b/Directory.Packages.props index d9ec3a68e..35cd76395 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/LICENSE b/LICENSE index cc5f84e48..c06314358 100644 --- a/LICENSE +++ b/LICENSE @@ -227,7 +227,6 @@ Libraries - OpenTelemetry.Api.ProviderBuilderExtensions, - OpenTelemetry.Exporter.Console, - OpenTelemetry.Exporter.OpenTelemetryProtocol, -- OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs, - OpenTelemetry.Exporter.Prometheus.HttpListener, - OpenTelemetry.Exporter.Zipkin, - OpenTelemetry.Extensions.Propagators, diff --git a/docs/README.md b/docs/README.md index 5d34f08c4..072280dbf 100644 --- a/docs/README.md +++ b/docs/README.md @@ -41,8 +41,8 @@ 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.5.1`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.5.1) -- `System.Diagnostics.DiagnosticSource`: [`7.0.0`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.0) +[`1.6.0`](https://github.com/open-telemetry/opentelemetry-dotnet/releases/tag/core-1.6.0) +- `System.Diagnostics.DiagnosticSource`: [`7.0.2`](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/7.0.2) referencing `System.Runtime.CompilerServices.Unsafe`: [`6.0.0`](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/6.0.0) You can find all references in diff --git a/docs/manual-instrumentation.md b/docs/manual-instrumentation.md index ebbc86c41..68d054d70 100644 --- a/docs/manual-instrumentation.md +++ b/docs/manual-instrumentation.md @@ -12,7 +12,7 @@ To create your custom traces manually, follow these steps: 1. Add the `System.Diagnostics.DiagnosticSource` dependency to your project: ```xml - + ``` 2. Create an `ActivitySource` instance: @@ -48,7 +48,7 @@ To create your custom metrics manually, follow these steps: 1. Add the `System.Diagnostics.DiagnosticSource` dependency to your project: ```xml - + ``` 2. Create a `Meter` instance: diff --git a/docs/plugins.md b/docs/plugins.md index bce11fada..786001903 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -108,9 +108,9 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |-------------------------------------------------------------------------------------------|---------------------------------------------------|---------------| -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.5.1 | -| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.5.1 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.5.1 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.6.0 | +| OpenTelemetry.Exporter.ZipkinExporterOptions | OpenTelemetry.Exporter.Zipkin | 1.6.0 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.6.0 | | OpenTelemetry.Instrumentation.AspNet.AspNetInstrumentationOptions | OpenTelemetry.Instrumentation.AspNet | 1.0.0-rc9.9 | | OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.5.1-beta.1 | | OpenTelemetry.Instrumentation.EntityFrameworkCore.EntityFrameworkInstrumentationOptions | OpenTelemetry.Instrumentation.EntityFrameworkCore | 1.0.0-beta.7 | @@ -119,16 +119,16 @@ public class MyPlugin | OpenTelemetry.Instrumentation.Quartz.QuartzInstrumentationOptions | OpenTelemetry.Instrumentation.Quartz | 1.0.0-alpha.3 | | OpenTelemetry.Instrumentation.SqlClient.SqlClientInstrumentationOptions | OpenTelemetry.Instrumentation.SqlClient | 1.5.1-beta.1 | | OpenTelemetry.Instrumentation.StackExchangeRedis.StackExchangeRedisInstrumentationOptions | OpenTelemetry.Instrumentation.StackExchangeRedis | 1.0.0-rc9.10 | -| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.10 | +| OpenTelemetry.Instrumentation.Wcf.WcfInstrumentationOptions | OpenTelemetry.Instrumentation.Wcf | 1.0.0-rc.12 | ### Metrics | Options type | NuGet package | NuGet version | |----------------------------------------------------------------------------------|------------------------------------------------|---------------| -| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.5.1 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.5.1 | -| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.5.0-rc.1 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.5.1 | +| OpenTelemetry.Metrics.MetricReaderOptions | OpenTelemetry | 1.6.0 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.6.0 | +| OpenTelemetry.Exporter.PrometheusExporterOptions | OpenTelemetry.Exporter.Prometheus.HttpListener | 1.6.0-rc.1 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.6.0 | | OpenTelemetry.Instrumentation.AspNetCore.AspNetCoreMetricsInstrumentationOptions | OpenTelemetry.Instrumentation.AspNetCore | 1.5.1-beta.1 | | OpenTelemetry.Instrumentation.Runtime.RuntimeInstrumentationOptions | OpenTelemetry.Instrumentation.Runtime | 1.5.1 | @@ -136,9 +136,9 @@ public class MyPlugin | Options type | NuGet package | NuGet version | |-----------------------------------------------|----------------------------------------------|---------------| -| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.5.0-rc.1 | -| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.5.1 | -| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.5.1 | +| OpenTelemetry.Logs.OpenTelemetryLoggerOptions | OpenTelemetry | 1.6.0 | +| OpenTelemetry.Exporter.ConsoleExporterOptions | OpenTelemetry.Exporter.Console | 1.6.0 | +| OpenTelemetry.Exporter.OtlpExporterOptions | OpenTelemetry.Exporter.OpenTelemetryProtocol | 1.6.0 | ## Requirements diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 28ae9e4c6..b7f9a302f 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -12,13 +12,10 @@ - - - - - - + + + @@ -28,7 +25,7 @@ - + diff --git a/src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs b/src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs index 13b771b99..6bf61758c 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs @@ -64,6 +64,11 @@ internal static class EnvironmentConfigurationTracerHelper }; } + if (settings.OpenTracingEnabled) + { + builder.AddOpenTracingShimSource(); + } + builder .SetSampler(settings) // Exporters can cause dependency loads. diff --git a/src/OpenTelemetry.AutoInstrumentation/Instrumentation.cs b/src/OpenTelemetry.AutoInstrumentation/Instrumentation.cs index 9bf4f0b4b..f7a612430 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Instrumentation.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Instrumentation.cs @@ -19,7 +19,6 @@ using OpenTelemetry.AutoInstrumentation.Diagnostics; using OpenTelemetry.AutoInstrumentation.Loading; using OpenTelemetry.AutoInstrumentation.Logging; using OpenTelemetry.AutoInstrumentation.Plugins; -using OpenTelemetry.Context.Propagation; using OpenTelemetry.Metrics; using OpenTelemetry.Shims.OpenTracing; using OpenTelemetry.Trace; @@ -200,7 +199,7 @@ internal static class Instrumentation if (TracerSettings.Value.OpenTracingEnabled) { - EnableOpenTracing(); + OpenTracingHelper.EnableOpenTracing(_tracerProvider); } } @@ -404,43 +403,4 @@ internal static class Instrumentation } } } - - private static void EnableOpenTracing() - { - try - { - if (_tracerProvider is not null) - { - const string OpenTracingShimActivitySourceName = "OpenTelemetry.AutoInstrumentation.OpenTracingShim"; - - // Instantiate the OpenTracing shim. The underlying OpenTelemetry tracer will create - // spans using the OpenTracingShimActivitySourceName source. - var openTracingShim = new TracerShim( - _tracerProvider.GetTracer(OpenTracingShimActivitySourceName), - Propagators.DefaultTextMapPropagator); - - // This registration must occur prior to any reference to the OpenTracing tracer: - // otherwise the no-op tracer is going to be used by OpenTracing instead. - if (GlobalTracer.RegisterIfAbsent(openTracingShim)) - { - Logger.Information("OpenTracingShim registered as the OpenTracing global tracer."); - } - else - { - Logger.Error( - "OpenTracingShim could not be registered as the OpenTracing global tracer." + - "Another tracer was already registered. OpenTracing signals will not be captured."); - } - } - else - { - Logger.Information("OpenTracingShim was not loaded as the provider is not initialized."); - } - } - catch (Exception ex) - { - Logger.Error(ex, "OpenTracingShim exception."); - throw; - } - } } diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj index 19cd28b1a..4084399cd 100644 --- a/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTelemetry.AutoInstrumentation.csproj @@ -51,9 +51,6 @@ - - - diff --git a/src/OpenTelemetry.AutoInstrumentation/OpenTracingHelper.cs b/src/OpenTelemetry.AutoInstrumentation/OpenTracingHelper.cs new file mode 100644 index 000000000..9ea29966f --- /dev/null +++ b/src/OpenTelemetry.AutoInstrumentation/OpenTracingHelper.cs @@ -0,0 +1,67 @@ +// +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using OpenTelemetry.AutoInstrumentation.Logging; +using OpenTelemetry.Shims.OpenTracing; +using OpenTelemetry.Trace; +using OpenTracing.Util; + +namespace OpenTelemetry.AutoInstrumentation; + +internal static class OpenTracingHelper +{ + private static readonly IOtelLogger Logger = OtelLogging.GetLogger(); + + public static TracerProviderBuilder AddOpenTracingShimSource(this TracerProviderBuilder tracerProviderBuilder) + { + return tracerProviderBuilder.AddSource("opentracing-shim"); + } + + public static void EnableOpenTracing(TracerProvider? tracerProvider) + { + try + { + if (tracerProvider is not null) + { + // Instantiate the OpenTracing shim. The underlying OpenTelemetry tracer will create + // spans using the opentracing-shim source. + var openTracingShim = new TracerShim(tracerProvider); + + // This registration must occur prior to any reference to the OpenTracing tracer: + // otherwise the no-op tracer is going to be used by OpenTracing instead. + if (GlobalTracer.RegisterIfAbsent(openTracingShim)) + { + Logger.Information("OpenTracingShim registered as the OpenTracing global tracer."); + } + else + { + Logger.Error( + "OpenTracingShim could not be registered as the OpenTracing global tracer." + + "Another tracer was already registered. OpenTracing signals will not be captured."); + } + } + else + { + Logger.Information("OpenTracingShim was not loaded as the provider is not initialized."); + } + } + catch (Exception ex) + { + Logger.Error(ex, "OpenTracingShim exception."); + throw; + } + } +} diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index 1c6a7d5b0..f24f1c57d 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -20,7 +20,6 @@ /net/OpenTelemetry.AutoInstrumentation.dll, /net/OpenTelemetry.AutoInstrumentation.pdb, /net/OpenTelemetry.Exporter.Console.dll, - /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, /net/OpenTelemetry.Exporter.Zipkin.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index 547e56ff0..8a958eefd 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -20,7 +20,6 @@ /net/OpenTelemetry.AutoInstrumentation.dll, /net/OpenTelemetry.AutoInstrumentation.pdb, /net/OpenTelemetry.Exporter.Console.dll, - /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, /net/OpenTelemetry.Exporter.Zipkin.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 51de0da74..be5bfb616 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -19,7 +19,6 @@ /net/OpenTelemetry.AutoInstrumentation.dll, /net/OpenTelemetry.AutoInstrumentation.pdb, /net/OpenTelemetry.Exporter.Console.dll, - /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, /net/OpenTelemetry.Exporter.Zipkin.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index ab12806b8..3240b2572 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -19,7 +19,6 @@ \net\OpenTelemetry.AutoInstrumentation.dll, \net\OpenTelemetry.AutoInstrumentation.pdb, \net\OpenTelemetry.Exporter.Console.dll, - \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs.dll, \net\OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, \net\OpenTelemetry.Exporter.Prometheus.HttpListener.dll, \net\OpenTelemetry.Exporter.Zipkin.dll, diff --git a/test/IntegrationTests/OpenTracingTests.cs b/test/IntegrationTests/OpenTracingTests.cs index b4725c063..8dba9f134 100644 --- a/test/IntegrationTests/OpenTracingTests.cs +++ b/test/IntegrationTests/OpenTracingTests.cs @@ -32,7 +32,7 @@ public class OpenTracingTests : TestHelper { using var collector = new MockSpansCollector(Output); SetExporter(collector); - collector.Expect("OpenTelemetry.AutoInstrumentation.OpenTracingShim"); + collector.Expect("opentracing-shim"); SetEnvironmentVariable("OTEL_DOTNET_AUTO_OPENTRACING_ENABLED", "true"); RunTestApplication(); diff --git a/test/test-applications/integrations/TestApplication.MassTransit/TestApplication.MassTransit.csproj b/test/test-applications/integrations/TestApplication.MassTransit/TestApplication.MassTransit.csproj index 3c3c23136..3d9b84a93 100644 --- a/test/test-applications/integrations/TestApplication.MassTransit/TestApplication.MassTransit.csproj +++ b/test/test-applications/integrations/TestApplication.MassTransit/TestApplication.MassTransit.csproj @@ -7,5 +7,7 @@ + + diff --git a/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj b/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj index 8a827827b..a9c2902ff 100644 --- a/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj +++ b/test/test-applications/integrations/TestApplication.Quartz/TestApplication.Quartz.csproj @@ -11,6 +11,8 @@ + +