From b3b04bff0e9b1556c5ee8071de0120798a0ede3e Mon Sep 17 00:00:00 2001 From: Alan West <3676547+alanwest@users.noreply.github.com> Date: Fri, 13 Nov 2020 15:52:54 -0800 Subject: [PATCH 1/3] Make ZipkinExporter internal --- .../.publicApi/net452/PublicAPI.Unshipped.txt | 2 -- .../.publicApi/net461/PublicAPI.Unshipped.txt | 2 -- .../.publicApi/netstandard2.0/PublicAPI.Unshipped.txt | 2 -- src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net452/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net452/PublicAPI.Unshipped.txt index aeffcfd41fd..ae906f714ba 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net452/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net452/PublicAPI.Unshipped.txt @@ -1,4 +1,3 @@ -OpenTelemetry.Exporter.Zipkin.ZipkinExporter OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.BatchExportProcessorOptions.get -> OpenTelemetry.BatchExportProcessorOptions OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.BatchExportProcessorOptions.set -> void @@ -12,5 +11,4 @@ OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.UseShortTraceIds.get -> bool OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.UseShortTraceIds.set -> void OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.ZipkinExporterOptions() -> void OpenTelemetry.Trace.ZipkinExporterHelperExtensions -override OpenTelemetry.Exporter.Zipkin.ZipkinExporter.Export(in OpenTelemetry.Batch batch) -> OpenTelemetry.ExportResult static OpenTelemetry.Trace.ZipkinExporterHelperExtensions.AddZipkinExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder diff --git a/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net461/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net461/PublicAPI.Unshipped.txt index cfe22a6e116..30044d78a18 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net461/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Exporter.Zipkin/.publicApi/net461/PublicAPI.Unshipped.txt @@ -1,4 +1,3 @@ -OpenTelemetry.Exporter.Zipkin.ZipkinExporter OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.BatchExportProcessorOptions.get -> OpenTelemetry.BatchExportProcessorOptions OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.BatchExportProcessorOptions.set -> void @@ -14,5 +13,4 @@ OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.UseShortTraceIds.get -> bool OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.UseShortTraceIds.set -> void OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.ZipkinExporterOptions() -> void OpenTelemetry.Trace.ZipkinExporterHelperExtensions -override OpenTelemetry.Exporter.Zipkin.ZipkinExporter.Export(in OpenTelemetry.Batch batch) -> OpenTelemetry.ExportResult static OpenTelemetry.Trace.ZipkinExporterHelperExtensions.AddZipkinExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder diff --git a/src/OpenTelemetry.Exporter.Zipkin/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.Zipkin/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index cfe22a6e116..30044d78a18 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Exporter.Zipkin/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -1,4 +1,3 @@ -OpenTelemetry.Exporter.Zipkin.ZipkinExporter OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.BatchExportProcessorOptions.get -> OpenTelemetry.BatchExportProcessorOptions OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.BatchExportProcessorOptions.set -> void @@ -14,5 +13,4 @@ OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.UseShortTraceIds.get -> bool OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.UseShortTraceIds.set -> void OpenTelemetry.Exporter.Zipkin.ZipkinExporterOptions.ZipkinExporterOptions() -> void OpenTelemetry.Trace.ZipkinExporterHelperExtensions -override OpenTelemetry.Exporter.Zipkin.ZipkinExporter.Export(in OpenTelemetry.Batch batch) -> OpenTelemetry.ExportResult static OpenTelemetry.Trace.ZipkinExporterHelperExtensions.AddZipkinExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs index 69c10d58991..a0f8d645710 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs +++ b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs @@ -37,7 +37,7 @@ namespace OpenTelemetry.Exporter.Zipkin /// /// Zipkin exporter. /// - public class ZipkinExporter : BaseExporter + internal class ZipkinExporter : BaseExporter { private readonly ZipkinExporterOptions options; #if !NET452 From ef86432a462c56cfb6ed2124e3b61be3dd496d42 Mon Sep 17 00:00:00 2001 From: Alan West <3676547+alanwest@users.noreply.github.com> Date: Fri, 13 Nov 2020 15:53:50 -0800 Subject: [PATCH 2/3] Make JaegerExporter internal --- .../.publicApi/net46/PublicAPI.Unshipped.txt | 2 -- .../.publicApi/netstandard2.0/PublicAPI.Unshipped.txt | 2 -- .../.publicApi/netstandard2.1/PublicAPI.Unshipped.txt | 2 -- src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/OpenTelemetry.Exporter.Jaeger/.publicApi/net46/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.Jaeger/.publicApi/net46/PublicAPI.Unshipped.txt index 21f5aafcd41..b35791e4d44 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/.publicApi/net46/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Exporter.Jaeger/.publicApi/net46/PublicAPI.Unshipped.txt @@ -1,4 +1,3 @@ -OpenTelemetry.Exporter.Jaeger.JaegerExporter OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.AgentHost.get -> string OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.AgentHost.set -> void @@ -12,5 +11,4 @@ OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ProcessTags.set -> void OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ServiceName.get -> string OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ServiceName.set -> void OpenTelemetry.Trace.JaegerExporterHelperExtensions -override OpenTelemetry.Exporter.Jaeger.JaegerExporter.Export(in OpenTelemetry.Batch activityBatch) -> OpenTelemetry.ExportResult static OpenTelemetry.Trace.JaegerExporterHelperExtensions.AddJaegerExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder diff --git a/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt index 21f5aafcd41..b35791e4d44 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt @@ -1,4 +1,3 @@ -OpenTelemetry.Exporter.Jaeger.JaegerExporter OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.AgentHost.get -> string OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.AgentHost.set -> void @@ -12,5 +11,4 @@ OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ProcessTags.set -> void OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ServiceName.get -> string OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ServiceName.set -> void OpenTelemetry.Trace.JaegerExporterHelperExtensions -override OpenTelemetry.Exporter.Jaeger.JaegerExporter.Export(in OpenTelemetry.Batch activityBatch) -> OpenTelemetry.ExportResult static OpenTelemetry.Trace.JaegerExporterHelperExtensions.AddJaegerExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder diff --git a/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt index 21f5aafcd41..b35791e4d44 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt +++ b/src/OpenTelemetry.Exporter.Jaeger/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt @@ -1,4 +1,3 @@ -OpenTelemetry.Exporter.Jaeger.JaegerExporter OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.AgentHost.get -> string OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.AgentHost.set -> void @@ -12,5 +11,4 @@ OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ProcessTags.set -> void OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ServiceName.get -> string OpenTelemetry.Exporter.Jaeger.JaegerExporterOptions.ServiceName.set -> void OpenTelemetry.Trace.JaegerExporterHelperExtensions -override OpenTelemetry.Exporter.Jaeger.JaegerExporter.Export(in OpenTelemetry.Batch activityBatch) -> OpenTelemetry.ExportResult static OpenTelemetry.Trace.JaegerExporterHelperExtensions.AddJaegerExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder diff --git a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs index f6c7c780fc1..15e7de94b30 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs @@ -26,7 +26,7 @@ namespace OpenTelemetry.Exporter.Jaeger { - public class JaegerExporter : BaseExporter + internal class JaegerExporter : BaseExporter { private readonly int maxPayloadSizeInBytes; private readonly TProtocolFactory protocolFactory; From 8fa1c6d0708d6d70fc79fe58e2e055184b88e87f Mon Sep 17 00:00:00 2001 From: Alan West <3676547+alanwest@users.noreply.github.com> Date: Fri, 13 Nov 2020 16:10:34 -0800 Subject: [PATCH 3/3] Update changelog --- src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md | 2 ++ src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md b/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md index 3fad0ec95bf..30144f14ee1 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Jaeger/CHANGELOG.md @@ -5,6 +5,8 @@ * Jaeger tags used for InstrumentationLibrary changed from library.name, library.version to otel.library.name, otel.library.version respectively. ([#1513](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1513)) +* The `JaegerExporter` class has been made internal. + ([#1540](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1540)) ## 0.8.0-beta.1 diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md index 7c4d75a4db1..e5e85874037 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md @@ -8,6 +8,8 @@ library.version to otel.library.name, otel.library.version respectively. * Sending `service.namespace` as Zipkin tag. ([#1521](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1521)) +* The `ZipkinExporter` class has been made internal. + ([#1540](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1540)) ## 0.8.0-beta.1