diff --git a/docs/trace/building-your-own-exporter/MyExporter.cs b/docs/trace/building-your-own-exporter/MyExporter.cs index 653b1a6552e..e55637f8d4e 100644 --- a/docs/trace/building-your-own-exporter/MyExporter.cs +++ b/docs/trace/building-your-own-exporter/MyExporter.cs @@ -19,9 +19,9 @@ using OpenTelemetry; using OpenTelemetry.Trace; -internal class MyExporter : ActivityExporterSync +internal class MyExporter : ActivityExporter { - public override ExportResultSync Export(in Batch batch) + public override ExportResult Export(in Batch batch) { // Exporter code which can generate further // telemetry should do so inside SuppressInstrumentation @@ -34,6 +34,6 @@ public override ExportResultSync Export(in Batch batch) Console.WriteLine($"{activity.DisplayName}"); } - return ExportResultSync.Success; + return ExportResult.Success; } } diff --git a/src/OpenTelemetry.Exporter.Console/ConsoleExporter.cs b/src/OpenTelemetry.Exporter.Console/ConsoleExporter.cs index 37a0319922a..5a0327f032b 100644 --- a/src/OpenTelemetry.Exporter.Console/ConsoleExporter.cs +++ b/src/OpenTelemetry.Exporter.Console/ConsoleExporter.cs @@ -24,7 +24,7 @@ namespace OpenTelemetry.Exporter.Console { - public class ConsoleExporter : ActivityExporterSync + public class ConsoleExporter : ActivityExporter { private readonly JsonSerializerOptions serializerOptions; private readonly bool displayAsJson; @@ -43,7 +43,7 @@ public ConsoleExporter(ConsoleExporterOptions options) this.serializerOptions.Converters.Add(new ActivityTraceIdConverter()); } - public override ExportResultSync Export(in Batch batch) + public override ExportResult Export(in Batch batch) { foreach (var activity in batch) { @@ -124,7 +124,7 @@ public override ExportResultSync Export(in Batch batch) } } - return ExportResultSync.Success; + return ExportResult.Success; } } } diff --git a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs index 4483cd9aa0b..ab2ee1452db 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs @@ -24,7 +24,7 @@ namespace OpenTelemetry.Exporter.Jaeger { - public class JaegerExporter : ActivityExporterSync + public class JaegerExporter : ActivityExporter { private bool libraryResourceApplied; private bool disposedValue; // To detect redundant dispose calls @@ -37,7 +37,7 @@ public JaegerExporter(JaegerExporterOptions options) internal JaegerUdpBatcher JaegerAgentUdpBatcher { get; } /// - public override ExportResultSync Export(in Batch activityBatch) + public override ExportResult Export(in Batch activityBatch) { var activities = new List(); foreach (var activity in activityBatch) @@ -57,7 +57,7 @@ public override ExportResultSync Export(in Batch activityBatch) this.JaegerAgentUdpBatcher.AppendBatchAsync(activities, default).GetAwaiter().GetResult(); // TODO jaeger status to ExportResult - return ExportResultSync.Success; + return ExportResult.Success; } /// diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporter.cs index 32e955b807e..a8879ea1699 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporter.cs +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporter.cs @@ -27,7 +27,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol /// Exporter consuming and exporting the data using /// the OpenTelemetry protocol (OTLP). /// - public class OtlpExporter : ActivityExporterSync + public class OtlpExporter : ActivityExporter { private readonly Channel channel; private readonly OtlpCollector.TraceService.TraceServiceClient traceClient; @@ -45,7 +45,7 @@ public OtlpExporter(OtlpExporterOptions options) } /// - public override ExportResultSync Export(in Batch activityBatch) + public override ExportResult Export(in Batch activityBatch) { var exporterRequest = new OtlpCollector.ExportTraceServiceRequest(); @@ -65,10 +65,10 @@ public override ExportResultSync Export(in Batch activityBatch) { OpenTelemetryProtocolExporterEventSource.Log.FailedToReachCollector(ex); - return ExportResultSync.Failure; + return ExportResult.Failure; } - return ExportResultSync.Success; + return ExportResult.Success; } } } diff --git a/src/OpenTelemetry.Exporter.ZPages/ZPagesExporter.cs b/src/OpenTelemetry.Exporter.ZPages/ZPagesExporter.cs index 47d885cb4b2..1a344acd672 100644 --- a/src/OpenTelemetry.Exporter.ZPages/ZPagesExporter.cs +++ b/src/OpenTelemetry.Exporter.ZPages/ZPagesExporter.cs @@ -25,7 +25,7 @@ namespace OpenTelemetry.Exporter.ZPages /// /// Implements ZPages exporter. /// - public class ZPagesExporter : ActivityExporterSync + public class ZPagesExporter : ActivityExporter { internal readonly ZPagesExporterOptions Options; private readonly Timer minuteTimer; @@ -53,10 +53,10 @@ public ZPagesExporter(ZPagesExporterOptions options) } /// - public override ExportResultSync Export(in Batch batch) + public override ExportResult Export(in Batch batch) { // var spanDatas = batch as SpanData[] ?? batch.ToArray(); - return ExportResultSync.Success; + return ExportResult.Success; } } } diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs index 38cb49b82ee..e1ae4cc9eb9 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 : ActivityExporterSync + public class ZipkinExporter : ActivityExporter { private readonly ZipkinExporterOptions options; private readonly HttpClient httpClient; @@ -57,7 +57,7 @@ public ZipkinExporter(ZipkinExporterOptions options, HttpClient client = null) internal ZipkinEndpoint LocalEndpoint { get; } /// - public override ExportResultSync Export(in Batch batch) + public override ExportResult Export(in Batch batch) { try { @@ -70,14 +70,14 @@ public override ExportResultSync Export(in Batch batch) this.SendBatchActivityAsync(activities, CancellationToken.None).GetAwaiter().GetResult(); - return ExportResultSync.Success; + return ExportResult.Success; } catch (Exception ex) { ZipkinExporterEventSource.Log.FailedExport(ex); // TODO distinguish retryable exceptions - return ExportResultSync.Failure; + return ExportResult.Failure; } } diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md index aac02b40db4..3bb44b82ecc 100644 --- a/src/OpenTelemetry/CHANGELOG.md +++ b/src/OpenTelemetry/CHANGELOG.md @@ -31,7 +31,8 @@ [#1087](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1087) [#1094](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1094) [#1113](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1113) - [#1127](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1127)) + [#1127](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1127) + [#1129](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1129)) ## 0.4.0-beta.2 diff --git a/src/OpenTelemetry/Internal/OpenTelemetrySdkEventSource.cs b/src/OpenTelemetry/Internal/OpenTelemetrySdkEventSource.cs index fa6e8eac5f8..d4c7839d9ec 100644 --- a/src/OpenTelemetry/Internal/OpenTelemetrySdkEventSource.cs +++ b/src/OpenTelemetry/Internal/OpenTelemetrySdkEventSource.cs @@ -95,7 +95,7 @@ public void ShutdownEvent(int spansLeftUnprocessed) } [Event(3, Message = "Exporter returned error '{0}'.", Level = EventLevel.Warning)] - public void ExporterErrorResult(ExportResultSync exportResult) + public void ExporterErrorResult(ExportResult exportResult) { this.WriteEvent(3, exportResult.ToString()); } diff --git a/src/OpenTelemetry/Trace/ActivityExporterSync.cs b/src/OpenTelemetry/Trace/ActivityExporter.cs similarity index 87% rename from src/OpenTelemetry/Trace/ActivityExporterSync.cs rename to src/OpenTelemetry/Trace/ActivityExporter.cs index 3f6d06eb83b..4c0aa6889bb 100644 --- a/src/OpenTelemetry/Trace/ActivityExporterSync.cs +++ b/src/OpenTelemetry/Trace/ActivityExporter.cs @@ -1,4 +1,4 @@ -// +// // Copyright The OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,7 +22,7 @@ namespace OpenTelemetry.Trace /// /// Enumeration used to define the result of an export operation. /// - public enum ExportResultSync + public enum ExportResult { /// /// Batch export succeeded. @@ -36,16 +36,16 @@ public enum ExportResultSync } /// - /// ActivityExporterSync base class. + /// ActivityExporter base class. /// - public abstract class ActivityExporterSync : IDisposable + public abstract class ActivityExporter : IDisposable { /// /// Export a batch of objects. /// /// Batch of objects to export. /// Result of export. - public abstract ExportResultSync Export(in Batch batch); + public abstract ExportResult Export(in Batch batch); /// /// Shuts down the exporter. diff --git a/src/OpenTelemetry/Trace/BatchExportActivityProcessor.cs b/src/OpenTelemetry/Trace/BatchExportActivityProcessor.cs index 03f6acb8796..93dd0c602d3 100644 --- a/src/OpenTelemetry/Trace/BatchExportActivityProcessor.cs +++ b/src/OpenTelemetry/Trace/BatchExportActivityProcessor.cs @@ -27,7 +27,7 @@ namespace OpenTelemetry.Trace /// public class BatchExportActivityProcessor : ActivityProcessor { - private readonly ActivityExporterSync exporter; + private readonly ActivityExporter exporter; private readonly CircularBuffer circularBuffer; private readonly int scheduledDelayMillis; private readonly int exporterTimeoutMillis; @@ -49,7 +49,7 @@ public class BatchExportActivityProcessor : ActivityProcessor /// How long the export can run before it is cancelled. The default value is 30000. /// The maximum batch size of every export. It must be smaller or equal to maxQueueSize. The default value is 512. public BatchExportActivityProcessor( - ActivityExporterSync exporter, + ActivityExporter exporter, int maxQueueSize = 2048, int scheduledDelayMillis = 5000, int exporterTimeoutMillis = 30000, diff --git a/src/OpenTelemetry/Trace/ReentrantExportActivityProcessor.cs b/src/OpenTelemetry/Trace/ReentrantExportActivityProcessor.cs index 1f24bf44a6d..c7847b138d4 100644 --- a/src/OpenTelemetry/Trace/ReentrantExportActivityProcessor.cs +++ b/src/OpenTelemetry/Trace/ReentrantExportActivityProcessor.cs @@ -27,14 +27,14 @@ namespace OpenTelemetry.Trace /// public class ReentrantExportActivityProcessor : ActivityProcessor { - private readonly ActivityExporterSync exporter; + private readonly ActivityExporter exporter; private bool stopped; /// /// Initializes a new instance of the class. /// /// Activity exporter instance. - public ReentrantExportActivityProcessor(ActivityExporterSync exporter) + public ReentrantExportActivityProcessor(ActivityExporter exporter) { this.exporter = exporter ?? throw new ArgumentNullException(nameof(exporter)); } diff --git a/src/OpenTelemetry/Trace/SimpleExportActivityProcessor.cs b/src/OpenTelemetry/Trace/SimpleExportActivityProcessor.cs index 9d2bd9ef3f9..83b4bfea946 100644 --- a/src/OpenTelemetry/Trace/SimpleExportActivityProcessor.cs +++ b/src/OpenTelemetry/Trace/SimpleExportActivityProcessor.cs @@ -29,7 +29,7 @@ public class SimpleExportActivityProcessor : ReentrantExportActivityProcessor /// Initializes a new instance of the class. /// /// Activity exporter instance. - public SimpleExportActivityProcessor(ActivityExporterSync exporter) + public SimpleExportActivityProcessor(ActivityExporter exporter) : base(exporter) { }