Added SimpleExporter and BatchExporter for Activity and LogRecord (#1622)
* Added SimpleExporter and BatchExporter for Activity and LogRecord * Updated the .publicApi text files * Updated the README to use SimpleActivityExportProcessor instead of SimpleExportProcessor<Activity> * Updated CHANGELOG.md * Updated CHANGELOG.md Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
This commit is contained in:
parent
c188edb48f
commit
e2a908e089
|
|
@ -27,6 +27,6 @@ internal static class LoggerExtensions
|
|||
throw new ArgumentNullException(nameof(options));
|
||||
}
|
||||
|
||||
return options.AddProcessor(new BatchExportProcessor<LogRecord>(new MyExporter()));
|
||||
return options.AddProcessor(new BatchLogRecordExportProcessor(new MyExporter()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public class Program
|
|||
builder.AddOpenTelemetry(options => options
|
||||
.AddProcessor(new MyProcessor("ProcessorA"))
|
||||
.AddProcessor(new MyProcessor("ProcessorB"))
|
||||
.AddProcessor(new SimpleExportProcessor<LogRecord>(new MyExporter("ExporterX")))
|
||||
.AddProcessor(new SimpleLogRecordExportProcessor(new MyExporter("ExporterX")))
|
||||
.AddMyExporter());
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ internal static class MyExporterHelperExtensions
|
|||
throw new ArgumentNullException(nameof(builder));
|
||||
}
|
||||
|
||||
return builder.AddProcessor(new BatchExportProcessor<Activity>(new MyExporter()));
|
||||
return builder.AddProcessor(new BatchActivityExportProcessor(new MyExporter()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public class Program
|
|||
.AddSource("OTel.Demo")
|
||||
.AddProcessor(new MyProcessor("ProcessorA"))
|
||||
.AddProcessor(new MyProcessor("ProcessorB"))
|
||||
.AddProcessor(new SimpleExportProcessor<Activity>(new MyExporter("ExporterX")))
|
||||
.AddProcessor(new SimpleActivityExportProcessor(new MyExporter("ExporterX")))
|
||||
.AddMyExporter()
|
||||
.Build();
|
||||
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ register the exporter, they must be registered manually as shown below:
|
|||
.SetSampler(new MySampler())
|
||||
.AddSource("OTel.Demo")
|
||||
.AddProcessor(new MyFilteringProcessor(
|
||||
new SimpleExportProcessor<Activity>(new MyExporter("ExporterX")),
|
||||
new SimpleActivityExportProcessor(new MyExporter("ExporterX")),
|
||||
(act) => true))
|
||||
.Build();
|
||||
```
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ namespace OpenTelemetry.Trace
|
|||
|
||||
var options = new ConsoleExporterOptions();
|
||||
configure?.Invoke(options);
|
||||
return builder.AddProcessor(new SimpleExportProcessor<Activity>(new ConsoleActivityExporter(options)));
|
||||
return builder.AddProcessor(new SimpleActivityExportProcessor(new ConsoleActivityExporter(options)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ namespace OpenTelemetry.Logs
|
|||
|
||||
var options = new ConsoleExporterOptions();
|
||||
configure?.Invoke(options);
|
||||
return loggerOptions.AddProcessor(new SimpleExportProcessor<LogRecord>(new ConsoleLogRecordExporter(options)));
|
||||
return loggerOptions.AddProcessor(new SimpleLogRecordExportProcessor(new ConsoleLogRecordExporter(options)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ namespace OpenTelemetry.Trace
|
|||
throw new ArgumentNullException(nameof(exportedItems));
|
||||
}
|
||||
|
||||
return builder.AddProcessor(new SimpleExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems)));
|
||||
return builder.AddProcessor(new SimpleActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace OpenTelemetry.Logs
|
|||
throw new ArgumentNullException(nameof(exportedItems));
|
||||
}
|
||||
|
||||
return loggerOptions.AddProcessor(new SimpleExportProcessor<LogRecord>(new InMemoryExporter<LogRecord>(exportedItems)));
|
||||
return loggerOptions.AddProcessor(new SimpleLogRecordExportProcessor(new InMemoryExporter<LogRecord>(exportedItems)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ namespace OpenTelemetry.Trace
|
|||
|
||||
if (exporterOptions.ExportProcessorType == ExportProcessorType.Simple)
|
||||
{
|
||||
return builder.AddProcessor(new SimpleExportProcessor<Activity>(jaegerExporter));
|
||||
return builder.AddProcessor(new SimpleActivityExportProcessor(jaegerExporter));
|
||||
}
|
||||
else
|
||||
{
|
||||
return builder.AddProcessor(new BatchExportProcessor<Activity>(
|
||||
return builder.AddProcessor(new BatchActivityExportProcessor(
|
||||
jaegerExporter,
|
||||
exporterOptions.BatchExportProcessorOptions.MaxQueueSize,
|
||||
exporterOptions.BatchExportProcessorOptions.ScheduledDelayMilliseconds,
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ namespace OpenTelemetry.Trace
|
|||
|
||||
if (exporterOptions.ExportProcessorType == ExportProcessorType.Simple)
|
||||
{
|
||||
return builder.AddProcessor(new SimpleExportProcessor<Activity>(otlpExporter));
|
||||
return builder.AddProcessor(new SimpleActivityExportProcessor(otlpExporter));
|
||||
}
|
||||
else
|
||||
{
|
||||
return builder.AddProcessor(new BatchExportProcessor<Activity>(
|
||||
return builder.AddProcessor(new BatchActivityExportProcessor(
|
||||
otlpExporter,
|
||||
exporterOptions.BatchExportProcessorOptions.MaxQueueSize,
|
||||
exporterOptions.BatchExportProcessorOptions.ScheduledDelayMilliseconds,
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ namespace OpenTelemetry.Trace
|
|||
|
||||
if (exporterOptions.ExportProcessorType == ExportProcessorType.Simple)
|
||||
{
|
||||
return builder.AddProcessor(new SimpleExportProcessor<Activity>(zipkinExporter));
|
||||
return builder.AddProcessor(new SimpleActivityExportProcessor(zipkinExporter));
|
||||
}
|
||||
else
|
||||
{
|
||||
return builder.AddProcessor(new BatchExportProcessor<Activity>(
|
||||
return builder.AddProcessor(new BatchActivityExportProcessor(
|
||||
zipkinExporter,
|
||||
exporterOptions.BatchExportProcessorOptions.MaxQueueSize,
|
||||
exporterOptions.BatchExportProcessorOptions.ScheduledDelayMilliseconds,
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ OpenTelemetry.Batch<T>.Enumerator.Enumerator() -> void
|
|||
OpenTelemetry.Batch<T>.Enumerator.MoveNext() -> bool
|
||||
OpenTelemetry.Batch<T>.Enumerator.Reset() -> void
|
||||
OpenTelemetry.Batch<T>.GetEnumerator() -> OpenTelemetry.Batch<T>.Enumerator
|
||||
OpenTelemetry.BatchActivityExportProcessor
|
||||
OpenTelemetry.BatchActivityExportProcessor.BatchActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessor<T>
|
||||
OpenTelemetry.BatchExportProcessor<T>.BatchExportProcessor(OpenTelemetry.BaseExporter<T> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>
|
||||
|
|
@ -130,6 +132,8 @@ OpenTelemetry.Resources.ResourceBuilder.Build() -> OpenTelemetry.Resources.Resou
|
|||
OpenTelemetry.Resources.ResourceBuilder.Clear() -> OpenTelemetry.Resources.ResourceBuilder
|
||||
OpenTelemetry.Resources.ResourceBuilderExtensions
|
||||
OpenTelemetry.Sdk
|
||||
OpenTelemetry.SimpleActivityExportProcessor
|
||||
OpenTelemetry.SimpleActivityExportProcessor.SimpleActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter) -> void
|
||||
OpenTelemetry.SimpleExportProcessor<T>
|
||||
OpenTelemetry.SimpleExportProcessor<T>.SimpleExportProcessor(OpenTelemetry.BaseExporter<T> exporter) -> void
|
||||
OpenTelemetry.SuppressInstrumentationScope
|
||||
|
|
@ -179,7 +183,9 @@ abstract OpenTelemetry.Metrics.Export.MetricProcessor.FinishCollectionCycle(out
|
|||
abstract OpenTelemetry.Metrics.Export.MetricProcessor.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
abstract OpenTelemetry.Trace.Sampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.BaseExportProcessor<T>.Dispose(bool disposing) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnForceFlush(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
|
|
@ -214,6 +220,7 @@ override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.
|
|||
override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.Update(long value) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.FinishCollectionCycle(out System.Collections.Generic.IEnumerable<OpenTelemetry.Metrics.Export.Metric> metrics) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
override OpenTelemetry.SimpleActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.SimpleExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.Trace.AlwaysOffSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.Trace.AlwaysOnSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
|
|
@ -222,7 +229,6 @@ override OpenTelemetry.Trace.SamplingResult.Equals(object obj) -> bool
|
|||
override OpenTelemetry.Trace.SamplingResult.GetHashCode() -> int
|
||||
override OpenTelemetry.Trace.TraceIdRatioBasedSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
abstract OpenTelemetry.BaseExportProcessor<T>.OnExport(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnStart(T data) -> void
|
||||
readonly OpenTelemetry.BaseExportProcessor<T>.exporter -> OpenTelemetry.BaseExporter<T>
|
||||
static OpenTelemetry.ProviderExtensions.GetResource(this OpenTelemetry.BaseProvider baseProvider) -> OpenTelemetry.Resources.Resource
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ OpenTelemetry.Batch<T>.Enumerator.Enumerator() -> void
|
|||
OpenTelemetry.Batch<T>.Enumerator.MoveNext() -> bool
|
||||
OpenTelemetry.Batch<T>.Enumerator.Reset() -> void
|
||||
OpenTelemetry.Batch<T>.GetEnumerator() -> OpenTelemetry.Batch<T>.Enumerator
|
||||
OpenTelemetry.BatchActivityExportProcessor
|
||||
OpenTelemetry.BatchActivityExportProcessor.BatchActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessor<T>
|
||||
OpenTelemetry.BatchExportProcessor<T>.BatchExportProcessor(OpenTelemetry.BaseExporter<T> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>
|
||||
|
|
@ -130,6 +132,8 @@ OpenTelemetry.Resources.ResourceBuilder.Build() -> OpenTelemetry.Resources.Resou
|
|||
OpenTelemetry.Resources.ResourceBuilder.Clear() -> OpenTelemetry.Resources.ResourceBuilder
|
||||
OpenTelemetry.Resources.ResourceBuilderExtensions
|
||||
OpenTelemetry.Sdk
|
||||
OpenTelemetry.SimpleActivityExportProcessor
|
||||
OpenTelemetry.SimpleActivityExportProcessor.SimpleActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter) -> void
|
||||
OpenTelemetry.SimpleExportProcessor<T>
|
||||
OpenTelemetry.SimpleExportProcessor<T>.SimpleExportProcessor(OpenTelemetry.BaseExporter<T> exporter) -> void
|
||||
OpenTelemetry.SuppressInstrumentationScope
|
||||
|
|
@ -179,7 +183,9 @@ abstract OpenTelemetry.Metrics.Export.MetricProcessor.FinishCollectionCycle(out
|
|||
abstract OpenTelemetry.Metrics.Export.MetricProcessor.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
abstract OpenTelemetry.Trace.Sampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.BaseExportProcessor<T>.Dispose(bool disposing) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnForceFlush(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
|
|
@ -214,6 +220,7 @@ override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.
|
|||
override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.Update(long value) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.FinishCollectionCycle(out System.Collections.Generic.IEnumerable<OpenTelemetry.Metrics.Export.Metric> metrics) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
override OpenTelemetry.SimpleActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.SimpleExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.Trace.AlwaysOffSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.Trace.AlwaysOnSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
|
|
@ -222,7 +229,6 @@ override OpenTelemetry.Trace.SamplingResult.Equals(object obj) -> bool
|
|||
override OpenTelemetry.Trace.SamplingResult.GetHashCode() -> int
|
||||
override OpenTelemetry.Trace.TraceIdRatioBasedSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
abstract OpenTelemetry.BaseExportProcessor<T>.OnExport(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnStart(T data) -> void
|
||||
readonly OpenTelemetry.BaseExportProcessor<T>.exporter -> OpenTelemetry.BaseExporter<T>
|
||||
static OpenTelemetry.ProviderExtensions.GetResource(this OpenTelemetry.BaseProvider baseProvider) -> OpenTelemetry.Resources.Resource
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ OpenTelemetry.Batch<T>.Enumerator.Enumerator() -> void
|
|||
OpenTelemetry.Batch<T>.Enumerator.MoveNext() -> bool
|
||||
OpenTelemetry.Batch<T>.Enumerator.Reset() -> void
|
||||
OpenTelemetry.Batch<T>.GetEnumerator() -> OpenTelemetry.Batch<T>.Enumerator
|
||||
OpenTelemetry.BatchActivityExportProcessor
|
||||
OpenTelemetry.BatchActivityExportProcessor.BatchActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessor<T>
|
||||
OpenTelemetry.BatchExportProcessor<T>.BatchExportProcessor(OpenTelemetry.BaseExporter<T> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>
|
||||
|
|
@ -33,6 +35,8 @@ OpenTelemetry.BatchExportProcessorOptions<T>.MaxQueueSize.get -> int
|
|||
OpenTelemetry.BatchExportProcessorOptions<T>.MaxQueueSize.set -> void
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>.ScheduledDelayMilliseconds.get -> int
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>.ScheduledDelayMilliseconds.set -> void
|
||||
OpenTelemetry.BatchLogRecordExportProcessor
|
||||
OpenTelemetry.BatchLogRecordExportProcessor.BatchLogRecordExportProcessor(OpenTelemetry.BaseExporter<OpenTelemetry.Logs.LogRecord> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.CompositeProcessor<T>
|
||||
OpenTelemetry.CompositeProcessor<T>.AddProcessor(OpenTelemetry.BaseProcessor<T> processor) -> OpenTelemetry.CompositeProcessor<T>
|
||||
OpenTelemetry.CompositeProcessor<T>.CompositeProcessor(System.Collections.Generic.IEnumerable<OpenTelemetry.BaseProcessor<T>> processors) -> void
|
||||
|
|
@ -149,8 +153,12 @@ OpenTelemetry.Resources.ResourceBuilder.Build() -> OpenTelemetry.Resources.Resou
|
|||
OpenTelemetry.Resources.ResourceBuilder.Clear() -> OpenTelemetry.Resources.ResourceBuilder
|
||||
OpenTelemetry.Resources.ResourceBuilderExtensions
|
||||
OpenTelemetry.Sdk
|
||||
OpenTelemetry.SimpleActivityExportProcessor
|
||||
OpenTelemetry.SimpleActivityExportProcessor.SimpleActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter) -> void
|
||||
OpenTelemetry.SimpleExportProcessor<T>
|
||||
OpenTelemetry.SimpleExportProcessor<T>.SimpleExportProcessor(OpenTelemetry.BaseExporter<T> exporter) -> void
|
||||
OpenTelemetry.SimpleLogRecordExportProcessor
|
||||
OpenTelemetry.SimpleLogRecordExportProcessor.SimpleLogRecordExportProcessor(OpenTelemetry.BaseExporter<OpenTelemetry.Logs.LogRecord> exporter) -> void
|
||||
OpenTelemetry.SuppressInstrumentationScope
|
||||
OpenTelemetry.SuppressInstrumentationScope.Dispose() -> void
|
||||
OpenTelemetry.Trace.AlwaysOffSampler
|
||||
|
|
@ -198,7 +206,9 @@ abstract OpenTelemetry.Metrics.Export.MetricProcessor.FinishCollectionCycle(out
|
|||
abstract OpenTelemetry.Metrics.Export.MetricProcessor.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
abstract OpenTelemetry.Trace.Sampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.BaseExportProcessor<T>.Dispose(bool disposing) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnForceFlush(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
|
|
@ -233,6 +243,7 @@ override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.
|
|||
override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.Update(long value) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.FinishCollectionCycle(out System.Collections.Generic.IEnumerable<OpenTelemetry.Metrics.Export.Metric> metrics) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
override OpenTelemetry.SimpleActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.SimpleExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.Trace.AlwaysOffSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.Trace.AlwaysOnSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
|
|
@ -241,7 +252,6 @@ override OpenTelemetry.Trace.SamplingResult.Equals(object obj) -> bool
|
|||
override OpenTelemetry.Trace.SamplingResult.GetHashCode() -> int
|
||||
override OpenTelemetry.Trace.TraceIdRatioBasedSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
abstract OpenTelemetry.BaseExportProcessor<T>.OnExport(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnStart(T data) -> void
|
||||
readonly OpenTelemetry.BaseExportProcessor<T>.exporter -> OpenTelemetry.BaseExporter<T>
|
||||
static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action<OpenTelemetry.Logs.OpenTelemetryLoggerOptions> configure = null) -> Microsoft.Extensions.Logging.ILoggingBuilder
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ OpenTelemetry.Batch<T>.Enumerator.Enumerator() -> void
|
|||
OpenTelemetry.Batch<T>.Enumerator.MoveNext() -> bool
|
||||
OpenTelemetry.Batch<T>.Enumerator.Reset() -> void
|
||||
OpenTelemetry.Batch<T>.GetEnumerator() -> OpenTelemetry.Batch<T>.Enumerator
|
||||
OpenTelemetry.BatchActivityExportProcessor
|
||||
OpenTelemetry.BatchActivityExportProcessor.BatchActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessor<T>
|
||||
OpenTelemetry.BatchExportProcessor<T>.BatchExportProcessor(OpenTelemetry.BaseExporter<T> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>
|
||||
|
|
@ -33,6 +35,8 @@ OpenTelemetry.BatchExportProcessorOptions<T>.MaxQueueSize.get -> int
|
|||
OpenTelemetry.BatchExportProcessorOptions<T>.MaxQueueSize.set -> void
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>.ScheduledDelayMilliseconds.get -> int
|
||||
OpenTelemetry.BatchExportProcessorOptions<T>.ScheduledDelayMilliseconds.set -> void
|
||||
OpenTelemetry.BatchLogRecordExportProcessor
|
||||
OpenTelemetry.BatchLogRecordExportProcessor.BatchLogRecordExportProcessor(OpenTelemetry.BaseExporter<OpenTelemetry.Logs.LogRecord> exporter, int maxQueueSize = 2048, int scheduledDelayMilliseconds = 5000, int exporterTimeoutMilliseconds = 30000, int maxExportBatchSize = 512) -> void
|
||||
OpenTelemetry.CompositeProcessor<T>
|
||||
OpenTelemetry.CompositeProcessor<T>.AddProcessor(OpenTelemetry.BaseProcessor<T> processor) -> OpenTelemetry.CompositeProcessor<T>
|
||||
OpenTelemetry.CompositeProcessor<T>.CompositeProcessor(System.Collections.Generic.IEnumerable<OpenTelemetry.BaseProcessor<T>> processors) -> void
|
||||
|
|
@ -149,8 +153,12 @@ OpenTelemetry.Resources.ResourceBuilder.Build() -> OpenTelemetry.Resources.Resou
|
|||
OpenTelemetry.Resources.ResourceBuilder.Clear() -> OpenTelemetry.Resources.ResourceBuilder
|
||||
OpenTelemetry.Resources.ResourceBuilderExtensions
|
||||
OpenTelemetry.Sdk
|
||||
OpenTelemetry.SimpleActivityExportProcessor
|
||||
OpenTelemetry.SimpleActivityExportProcessor.SimpleActivityExportProcessor(OpenTelemetry.BaseExporter<System.Diagnostics.Activity> exporter) -> void
|
||||
OpenTelemetry.SimpleExportProcessor<T>
|
||||
OpenTelemetry.SimpleExportProcessor<T>.SimpleExportProcessor(OpenTelemetry.BaseExporter<T> exporter) -> void
|
||||
OpenTelemetry.SimpleLogRecordExportProcessor
|
||||
OpenTelemetry.SimpleLogRecordExportProcessor.SimpleLogRecordExportProcessor(OpenTelemetry.BaseExporter<OpenTelemetry.Logs.LogRecord> exporter) -> void
|
||||
OpenTelemetry.SuppressInstrumentationScope
|
||||
OpenTelemetry.SuppressInstrumentationScope.Dispose() -> void
|
||||
OpenTelemetry.Trace.AlwaysOffSampler
|
||||
|
|
@ -198,7 +206,9 @@ abstract OpenTelemetry.Metrics.Export.MetricProcessor.FinishCollectionCycle(out
|
|||
abstract OpenTelemetry.Metrics.Export.MetricProcessor.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
abstract OpenTelemetry.Trace.Sampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.BaseExportProcessor<T>.Dispose(bool disposing) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override OpenTelemetry.BaseExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnForceFlush(int timeoutMilliseconds) -> bool
|
||||
override OpenTelemetry.BatchExportProcessor<T>.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
|
|
@ -233,6 +243,7 @@ override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.
|
|||
override OpenTelemetry.Metrics.Aggregators.Int64MeasureMinMaxSumCountAggregator.Update(long value) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.FinishCollectionCycle(out System.Collections.Generic.IEnumerable<OpenTelemetry.Metrics.Export.Metric> metrics) -> void
|
||||
override OpenTelemetry.Metrics.Export.UngroupedBatcher.Process(OpenTelemetry.Metrics.Export.Metric metric) -> void
|
||||
override OpenTelemetry.SimpleActivityExportProcessor.OnEnd(System.Diagnostics.Activity data) -> void
|
||||
override OpenTelemetry.SimpleExportProcessor<T>.OnExport(T data) -> void
|
||||
override OpenTelemetry.Trace.AlwaysOffSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
override OpenTelemetry.Trace.AlwaysOnSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
|
|
@ -241,7 +252,6 @@ override OpenTelemetry.Trace.SamplingResult.Equals(object obj) -> bool
|
|||
override OpenTelemetry.Trace.SamplingResult.GetHashCode() -> int
|
||||
override OpenTelemetry.Trace.TraceIdRatioBasedSampler.ShouldSample(in OpenTelemetry.Trace.SamplingParameters samplingParameters) -> OpenTelemetry.Trace.SamplingResult
|
||||
abstract OpenTelemetry.BaseExportProcessor<T>.OnExport(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnEnd(T data) -> void
|
||||
override sealed OpenTelemetry.BaseExportProcessor<T>.OnStart(T data) -> void
|
||||
readonly OpenTelemetry.BaseExportProcessor<T>.exporter -> OpenTelemetry.BaseExporter<T>
|
||||
static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action<OpenTelemetry.Logs.OpenTelemetryLoggerOptions> configure = null) -> Microsoft.Extensions.Logging.ILoggingBuilder
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace OpenTelemetry
|
|||
/// Initializes a new instance of the <see cref="BaseExportProcessor{T}"/> class.
|
||||
/// </summary>
|
||||
/// <param name="exporter">Exporter instance.</param>
|
||||
public BaseExportProcessor(BaseExporter<T> exporter)
|
||||
protected BaseExportProcessor(BaseExporter<T> exporter)
|
||||
{
|
||||
this.exporter = exporter ?? throw new ArgumentNullException(nameof(exporter));
|
||||
}
|
||||
|
|
@ -44,19 +44,11 @@ namespace OpenTelemetry
|
|||
{
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public sealed override void OnEnd(T data)
|
||||
public override void OnEnd(T data)
|
||||
{
|
||||
if (data is Activity activity && activity.ActivityTraceFlags == ActivityTraceFlags.None)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.OnExport(data);
|
||||
}
|
||||
|
||||
public abstract void OnExport(T data);
|
||||
|
||||
internal override void SetParentProvider(BaseProvider parentProvider)
|
||||
{
|
||||
base.SetParentProvider(parentProvider);
|
||||
|
|
@ -64,6 +56,8 @@ namespace OpenTelemetry
|
|||
this.exporter.ParentProvider = parentProvider;
|
||||
}
|
||||
|
||||
protected abstract void OnExport(T data);
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override bool OnShutdown(int timeoutMilliseconds)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
// <copyright file="BatchActivityExportProcessor.cs" company="OpenTelemetry Authors">
|
||||
// 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.
|
||||
// </copyright>
|
||||
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace OpenTelemetry
|
||||
{
|
||||
public class BatchActivityExportProcessor : BatchExportProcessor<Activity>
|
||||
{
|
||||
public BatchActivityExportProcessor(
|
||||
BaseExporter<Activity> exporter,
|
||||
int maxQueueSize = DefaultMaxQueueSize,
|
||||
int scheduledDelayMilliseconds = DefaultScheduledDelayMilliseconds,
|
||||
int exporterTimeoutMilliseconds = DefaultExporterTimeoutMilliseconds,
|
||||
int maxExportBatchSize = DefaultMaxExportBatchSize)
|
||||
: base(
|
||||
exporter,
|
||||
maxQueueSize,
|
||||
scheduledDelayMilliseconds,
|
||||
exporterTimeoutMilliseconds,
|
||||
maxExportBatchSize)
|
||||
{
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnEnd(Activity data)
|
||||
{
|
||||
if (!data.Recorded)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.OnExport(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ namespace OpenTelemetry
|
|||
/// Implements processor that batches telemetry objects before calling exporter.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of telemetry object to be exported.</typeparam>
|
||||
public class BatchExportProcessor<T> : BaseExportProcessor<T>
|
||||
public abstract class BatchExportProcessor<T> : BaseExportProcessor<T>
|
||||
where T : class
|
||||
{
|
||||
internal const int DefaultMaxQueueSize = 2048;
|
||||
|
|
@ -52,7 +52,7 @@ namespace OpenTelemetry
|
|||
/// <param name="scheduledDelayMilliseconds">The delay interval in milliseconds between two consecutive exports. The default value is 5000.</param>
|
||||
/// <param name="exporterTimeoutMilliseconds">How long the export can run before it is cancelled. The default value is 30000.</param>
|
||||
/// <param name="maxExportBatchSize">The maximum batch size of every export. It must be smaller or equal to maxQueueSize. The default value is 512.</param>
|
||||
public BatchExportProcessor(
|
||||
protected BatchExportProcessor(
|
||||
BaseExporter<T> exporter,
|
||||
int maxQueueSize = DefaultMaxQueueSize,
|
||||
int scheduledDelayMilliseconds = DefaultScheduledDelayMilliseconds,
|
||||
|
|
@ -108,7 +108,7 @@ namespace OpenTelemetry
|
|||
internal long ProcessedCount => this.circularBuffer.RemovedCount;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override void OnExport(T data)
|
||||
protected override void OnExport(T data)
|
||||
{
|
||||
if (this.circularBuffer.TryAdd(data, maxSpinCount: 50000))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
// <copyright file="BatchLogRecordExportProcessor.cs" company="OpenTelemetry Authors">
|
||||
// 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.
|
||||
// </copyright>
|
||||
|
||||
#if NET461 || NETSTANDARD2_0
|
||||
using OpenTelemetry.Logs;
|
||||
|
||||
namespace OpenTelemetry
|
||||
{
|
||||
public class BatchLogRecordExportProcessor : BatchExportProcessor<LogRecord>
|
||||
{
|
||||
public BatchLogRecordExportProcessor(
|
||||
BaseExporter<LogRecord> exporter,
|
||||
int maxQueueSize = DefaultMaxQueueSize,
|
||||
int scheduledDelayMilliseconds = DefaultScheduledDelayMilliseconds,
|
||||
int exporterTimeoutMilliseconds = DefaultExporterTimeoutMilliseconds,
|
||||
int maxExportBatchSize = DefaultMaxExportBatchSize)
|
||||
: base(
|
||||
exporter,
|
||||
maxQueueSize,
|
||||
scheduledDelayMilliseconds,
|
||||
exporterTimeoutMilliseconds,
|
||||
maxExportBatchSize)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -13,6 +13,12 @@
|
|||
[#1501](https://github.com/open-telemetry/opentelemetry-dotnet/issues/1501)
|
||||
for more information.
|
||||
([#1611](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1611))
|
||||
* Modified SimpleExportProcessor and BatchExportProcessor to abstract classes;
|
||||
Added SimpleActivityExportProcessor, SimpleLogRecordExportProcessor,
|
||||
BatchActivityExportProcessor, BatchLogRecordExportProcessor; Added the check
|
||||
for Activity.Recorded in SimpleActivityExportProcessor and
|
||||
BatchActivityExportProcessor
|
||||
([#1622](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1622))
|
||||
|
||||
## 1.0.0-rc1.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
// <copyright file="SimpleActivityExportProcessor.cs" company="OpenTelemetry Authors">
|
||||
// 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.
|
||||
// </copyright>
|
||||
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace OpenTelemetry
|
||||
{
|
||||
public class SimpleActivityExportProcessor : SimpleExportProcessor<Activity>
|
||||
{
|
||||
public SimpleActivityExportProcessor(BaseExporter<Activity> exporter)
|
||||
: base(exporter)
|
||||
{
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnEnd(Activity data)
|
||||
{
|
||||
if (!data.Recorded)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.OnExport(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -23,7 +23,7 @@ namespace OpenTelemetry
|
|||
/// Implements processor that exports telemetry data at each OnEnd call.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of telemetry object to be exported.</typeparam>
|
||||
public class SimpleExportProcessor<T> : BaseExportProcessor<T>
|
||||
public abstract class SimpleExportProcessor<T> : BaseExportProcessor<T>
|
||||
where T : class
|
||||
{
|
||||
private readonly object syncObject = new object();
|
||||
|
|
@ -32,13 +32,13 @@ namespace OpenTelemetry
|
|||
/// Initializes a new instance of the <see cref="SimpleExportProcessor{T}"/> class.
|
||||
/// </summary>
|
||||
/// <param name="exporter">Exporter instance.</param>
|
||||
public SimpleExportProcessor(BaseExporter<T> exporter)
|
||||
protected SimpleExportProcessor(BaseExporter<T> exporter)
|
||||
: base(exporter)
|
||||
{
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnExport(T data)
|
||||
protected override void OnExport(T data)
|
||||
{
|
||||
lock (this.syncObject)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
// <copyright file="SimpleLogRecordExportProcessor.cs" company="OpenTelemetry Authors">
|
||||
// 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.
|
||||
// </copyright>
|
||||
|
||||
#if NET461 || NETSTANDARD2_0
|
||||
using OpenTelemetry.Logs;
|
||||
|
||||
namespace OpenTelemetry
|
||||
{
|
||||
public class SimpleLogRecordExportProcessor : SimpleExportProcessor<LogRecord>
|
||||
{
|
||||
public SimpleLogRecordExportProcessor(BaseExporter<LogRecord> exporter)
|
||||
: base(exporter)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -96,7 +96,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
|
|||
|
||||
using var openTelemetrySdk = builder.Build();
|
||||
|
||||
var processor = new BatchExportProcessor<Activity>(new TestExporter<Activity>(RunTest));
|
||||
var processor = new BatchActivityExportProcessor(new TestExporter<Activity>(RunTest));
|
||||
const int numOfSpans = 10;
|
||||
bool isEven;
|
||||
for (var i = 0; i < numOfSpans; i++)
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Tests
|
|||
Endpoint = new Uri($"http://{this.testServerHost}:{this.testServerPort}/api/v2/spans?requestId={requestId}"),
|
||||
};
|
||||
var zipkinExporter = new ZipkinExporter(exporterOptions);
|
||||
var exportActivityProcessor = new BatchExportProcessor<Activity>(zipkinExporter);
|
||||
var exportActivityProcessor = new BatchActivityExportProcessor(zipkinExporter);
|
||||
|
||||
var openTelemetrySdk = Sdk.CreateTracerProviderBuilder()
|
||||
.AddSource(ActivitySourceName)
|
||||
|
|
@ -196,7 +196,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Tests
|
|||
activity.SetTag(ZipkinActivityConversionExtensions.ZipkinErrorFlagTagName, "This should be removed.");
|
||||
}
|
||||
|
||||
var processor = new SimpleExportProcessor<Activity>(exporter);
|
||||
var processor = new SimpleActivityExportProcessor(exporter);
|
||||
|
||||
processor.OnEnd(activity);
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ namespace OpenTelemetry.Tests.Logs
|
|||
public LogRecordTest()
|
||||
{
|
||||
this.exporter = new InMemoryExporter<LogRecord>(this.exportedItems);
|
||||
this.processor = new SimpleExportProcessor<LogRecord>(this.exporter);
|
||||
this.processor = new SimpleLogRecordExportProcessor(this.exporter);
|
||||
#if NETCOREAPP2_1
|
||||
var serviceCollection = new ServiceCollection().AddLogging(builder =>
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// <copyright file="TestExportProcessor.cs" company="OpenTelemetry Authors">
|
||||
// <copyright file="TestActivityExportProcessor.cs" company="OpenTelemetry Authors">
|
||||
// Copyright The OpenTelemetry Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
|
@ -15,20 +15,20 @@
|
|||
// </copyright>
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace OpenTelemetry.Tests
|
||||
{
|
||||
internal class TestExportProcessor<T> : BaseExportProcessor<T>
|
||||
where T : class
|
||||
internal class TestActivityExportProcessor : SimpleActivityExportProcessor
|
||||
{
|
||||
public List<T> ExportedItems = new List<T>();
|
||||
public List<Activity> ExportedItems = new List<Activity>();
|
||||
|
||||
public TestExportProcessor(BaseExporter<T> exporter)
|
||||
public TestActivityExportProcessor(BaseExporter<Activity> exporter)
|
||||
: base(exporter)
|
||||
{
|
||||
}
|
||||
|
||||
public override void OnExport(T data)
|
||||
protected override void OnExport(Activity data)
|
||||
{
|
||||
this.ExportedItems.Add(data);
|
||||
}
|
||||
|
|
@ -28,18 +28,18 @@ namespace OpenTelemetry.Trace.Tests
|
|||
[Fact]
|
||||
public void CheckNullExporter()
|
||||
{
|
||||
Assert.Throws<ArgumentNullException>(() => new BatchExportProcessor<Activity>(null));
|
||||
Assert.Throws<ArgumentNullException>(() => new BatchActivityExportProcessor(null));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CheckConstructorWithInvalidValues()
|
||||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems), maxQueueSize: 0));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems), maxExportBatchSize: 0));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems), maxQueueSize: 1, maxExportBatchSize: 2049));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems), scheduledDelayMilliseconds: 0));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems), exporterTimeoutMilliseconds: -1));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems), maxQueueSize: 0));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems), maxExportBatchSize: 0));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems), maxQueueSize: 1, maxExportBatchSize: 2049));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems), scheduledDelayMilliseconds: 0));
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => new BatchActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems), exporterTimeoutMilliseconds: -1));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -47,7 +47,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new BatchExportProcessor<Activity>(
|
||||
using var processor = new BatchActivityExportProcessor(
|
||||
exporter,
|
||||
maxQueueSize: 1,
|
||||
maxExportBatchSize: 1,
|
||||
|
|
@ -75,7 +75,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new BatchExportProcessor<Activity>(exporter, maxQueueSize: 2, maxExportBatchSize: 1);
|
||||
using var processor = new BatchActivityExportProcessor(exporter, maxQueueSize: 2, maxExportBatchSize: 1);
|
||||
Assert.Throws<ArgumentOutOfRangeException>(() => processor.ForceFlush(-2));
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new BatchExportProcessor<Activity>(
|
||||
using var processor = new BatchActivityExportProcessor(
|
||||
exporter,
|
||||
maxQueueSize: 3,
|
||||
maxExportBatchSize: 3,
|
||||
|
|
@ -132,7 +132,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new BatchExportProcessor<Activity>(
|
||||
using var processor = new BatchActivityExportProcessor(
|
||||
exporter,
|
||||
maxQueueSize: 3,
|
||||
maxExportBatchSize: 3,
|
||||
|
|
@ -162,7 +162,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new BatchExportProcessor<Activity>(
|
||||
using var processor = new BatchActivityExportProcessor(
|
||||
exporter,
|
||||
maxQueueSize: 1,
|
||||
maxExportBatchSize: 1);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace OpenTelemetry.Tests.Trace
|
|||
public void ExportProcessorIgnoresActivityWhenDropped()
|
||||
{
|
||||
var sampler = new AlwaysOffSampler();
|
||||
var processor = new TestExportProcessor<Activity>(new ConsoleActivityExporter(null));
|
||||
var processor = new TestActivityExportProcessor(new ConsoleActivityExporter(null));
|
||||
using var activitySource = new ActivitySource(ActivitySourceName);
|
||||
using var sdk = Sdk.CreateTracerProviderBuilder()
|
||||
.AddSource(ActivitySourceName)
|
||||
|
|
@ -52,7 +52,7 @@ namespace OpenTelemetry.Tests.Trace
|
|||
public void ExportProcessorIgnoresActivityMarkedAsRecordOnly()
|
||||
{
|
||||
var sampler = new RecordOnlySampler();
|
||||
var processor = new TestExportProcessor<Activity>(new ConsoleActivityExporter(null));
|
||||
var processor = new TestActivityExportProcessor(new ConsoleActivityExporter(null));
|
||||
using var activitySource = new ActivitySource(ActivitySourceName);
|
||||
using var sdk = Sdk.CreateTracerProviderBuilder()
|
||||
.AddSource(ActivitySourceName)
|
||||
|
|
@ -73,7 +73,7 @@ namespace OpenTelemetry.Tests.Trace
|
|||
public void ExportProcessorExportsActivityMarkedAsRecordAndSample()
|
||||
{
|
||||
var sampler = new AlwaysOnSampler();
|
||||
var processor = new TestExportProcessor<Activity>(new ConsoleActivityExporter(null));
|
||||
var processor = new TestActivityExportProcessor(new ConsoleActivityExporter(null));
|
||||
using var activitySource = new ActivitySource(ActivitySourceName);
|
||||
using var sdk = Sdk.CreateTracerProviderBuilder()
|
||||
.AddSource(ActivitySourceName)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
[Fact]
|
||||
public void CheckNullExporter()
|
||||
{
|
||||
Assert.Throws<ArgumentNullException>(() => new SimpleExportProcessor<Activity>(null));
|
||||
Assert.Throws<ArgumentNullException>(() => new SimpleActivityExportProcessor(null));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -36,7 +36,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new SimpleExportProcessor<Activity>(exporter);
|
||||
using var processor = new SimpleActivityExportProcessor(exporter);
|
||||
|
||||
var activity1 = new Activity("start1");
|
||||
activity1.ActivityTraceFlags = ActivityTraceFlags.Recorded;
|
||||
|
|
@ -59,7 +59,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new SimpleExportProcessor<Activity>(exporter);
|
||||
using var processor = new SimpleActivityExportProcessor(exporter);
|
||||
|
||||
var activity1 = new Activity("start1");
|
||||
activity1.ActivityTraceFlags = ActivityTraceFlags.Recorded;
|
||||
|
|
@ -86,7 +86,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new SimpleExportProcessor<Activity>(exporter);
|
||||
using var processor = new SimpleActivityExportProcessor(exporter);
|
||||
|
||||
var activity = new Activity("start");
|
||||
activity.ActivityTraceFlags = ActivityTraceFlags.Recorded;
|
||||
|
|
@ -105,7 +105,7 @@ namespace OpenTelemetry.Trace.Tests
|
|||
{
|
||||
var exportedItems = new List<Activity>();
|
||||
using var exporter = new InMemoryExporter<Activity>(exportedItems);
|
||||
using var processor = new SimpleExportProcessor<Activity>(exporter);
|
||||
using var processor = new SimpleActivityExportProcessor(exporter);
|
||||
|
||||
var activity = new Activity("start");
|
||||
activity.ActivityTraceFlags = ActivityTraceFlags.None;
|
||||
|
|
|
|||
Loading…
Reference in New Issue