Added SimpleExporter and BatchExporter for Activity and LogRecord

docs/logs/extending-the-sdk/LoggerExtensions.cs

@@ -27,6 +27,6 @@ public static OpenTelemetryLoggerOptions AddMyExporter(this OpenTelemetryLoggerO
             throw new ArgumentNullException(nameof(options));
         }
 
-        return options.AddProcessor(new BatchExportProcessor<LogRecord>(new MyExporter()));
+        return options.AddProcessor(new BatchLogRecordExportProcessor(new MyExporter()));
     }
 }

docs/logs/extending-the-sdk/Program.cs

@@ -35,7 +35,7 @@ public static void Main()
             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());
         });
 

docs/trace/extending-the-sdk/MyExporterHelperExtensions.cs

@@ -28,6 +28,6 @@ public static TracerProviderBuilder AddMyExporter(this TracerProviderBuilder bui
             throw new ArgumentNullException(nameof(builder));
         }
 
-        return builder.AddProcessor(new BatchExportProcessor<Activity>(new MyExporter()));
+        return builder.AddProcessor(new BatchActivityExportProcessor(new MyExporter()));
     }
 }

docs/trace/extending-the-sdk/Program.cs

@@ -29,7 +29,7 @@ public static void Main()
             .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();
 

src/OpenTelemetry.Exporter.Console/ConsoleExporterHelperExtensions.cs

@@ -38,7 +38,7 @@ public static TracerProviderBuilder AddConsoleExporter(this TracerProviderBuilde
 
             var options = new ConsoleExporterOptions();
             configure?.Invoke(options);
-            return builder.AddProcessor(new SimpleExportProcessor<Activity>(new ConsoleExporter<Activity>(options)));
+            return builder.AddProcessor(new SimpleActivityExportProcessor(new ConsoleExporter<Activity>(options)));
         }
     }
 }

src/OpenTelemetry.Exporter.Console/ConsoleExporterLoggingExtensions.cs

@@ -37,7 +37,7 @@ public static OpenTelemetryLoggerOptions AddConsoleExporter(this OpenTelemetryLo
 
             var options = new ConsoleExporterOptions();
             configure?.Invoke(options);
-            return loggerOptions.AddProcessor(new SimpleExportProcessor<LogRecord>(new ConsoleExporter<LogRecord>(options)));
+            return loggerOptions.AddProcessor(new SimpleLogRecordExportProcessor(new ConsoleExporter<LogRecord>(options)));
         }
     }
 }

src/OpenTelemetry.Exporter.InMemory/InMemoryExporterHelperExtensions.cs

@@ -42,7 +42,7 @@ public static TracerProviderBuilder AddInMemoryExporter(this TracerProviderBuild
                 throw new ArgumentNullException(nameof(exportedItems));
             }
 
-            return builder.AddProcessor(new SimpleExportProcessor<Activity>(new InMemoryExporter<Activity>(exportedItems)));
+            return builder.AddProcessor(new SimpleActivityExportProcessor(new InMemoryExporter<Activity>(exportedItems)));
         }
     }
 }

src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs

@@ -35,7 +35,7 @@ public static OpenTelemetryLoggerOptions AddInMemoryExporter(this OpenTelemetryL
                 throw new ArgumentNullException(nameof(exportedItems));
             }
 
-            return loggerOptions.AddProcessor(new SimpleExportProcessor<LogRecord>(new InMemoryExporter<LogRecord>(exportedItems)));
+            return loggerOptions.AddProcessor(new SimpleLogRecordExportProcessor(new InMemoryExporter<LogRecord>(exportedItems)));
         }
     }
 }

src/OpenTelemetry.Exporter.Jaeger/JaegerExporterHelperExtensions.cs

@@ -45,11 +45,11 @@ public static TracerProviderBuilder AddJaegerExporter(this TracerProviderBuilder
 
             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,

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterHelperExtensions.cs

@@ -45,11 +45,11 @@ public static TracerProviderBuilder AddOtlpExporter(this TracerProviderBuilder b
 
             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,

src/OpenTelemetry.Exporter.Zipkin/ZipkinExporterHelperExtensions.cs

@@ -45,11 +45,11 @@ public static TracerProviderBuilder AddZipkinExporter(this TracerProviderBuilder
 
             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,

src/OpenTelemetry/BaseExportProcessor.cs

@@ -34,7 +34,7 @@ public abstract class BaseExportProcessor<T> : BaseProcessor<T>
         /// 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,18 +44,12 @@ public sealed override void OnStart(T data)
         {
         }
 
-        /// <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);
+        protected abstract void OnExport(T data);
 
         internal override void SetParentProvider(BaseProvider parentProvider)
         {

src/OpenTelemetry/BatchActivityExportProcessor.cs

@@ -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);
+        }
+    }
+}

src/OpenTelemetry/BatchExportProcessor.cs

@@ -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 @@ public class BatchExportProcessor<T> : BaseExportProcessor<T>
         /// <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 @@ public BatchExportProcessor(
         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))
             {

src/OpenTelemetry/BatchLogRecordExportProcessor.cs

@@ -0,0 +1,41 @@
+// <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

src/OpenTelemetry/SimpleActivityExportProcessor.cs

@@ -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);
+        }
+    }
+}

src/OpenTelemetry/SimpleExportProcessor.cs

@@ -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 @@ public class SimpleExportProcessor<T> : BaseExportProcessor<T>
         /// 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)
             {

src/OpenTelemetry/SimpleLogRecordExportProcessor.cs

@@ -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

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs

@@ -96,7 +96,7 @@ public void ToOtlpResourceSpansTest(bool addResource)
 
             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++)

test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs

@@ -109,7 +109,7 @@ public void SuppresssesInstrumentation()
                 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)
@@ -168,7 +168,7 @@ public void IntegrationTest(bool useShortTraceIds, bool useTestResource, bool is
                 exporter.SetLocalEndpointFromResource(Resource.Empty);
             }
 
-            var processor = new SimpleExportProcessor<Activity>(exporter);
+            var processor = new SimpleActivityExportProcessor(exporter);
 
             processor.OnEnd(activity);