In-memory Exporter: Buffer log scopes

src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* `InMemoryExporter` will now buffer scopes when exporting `LogRecord`
+  ([#3360](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3360))
+
 ## 1.3.0
 
 Released 2022-Jun-03

src/OpenTelemetry.Exporter.InMemory/InMemoryExporter.cs

@@ -14,7 +14,6 @@
 // limitations under the License.
 // </copyright>
 
-using System;
 using System.Collections.Generic;
 
 namespace OpenTelemetry.Exporter
@@ -23,19 +22,21 @@ public class InMemoryExporter<T> : BaseExporter<T>
         where T : class
     {
         private readonly ICollection<T> exportedItems;
-        private readonly Func<Batch<T>, ExportResult> onExport;
+        private readonly ExportFunc onExport;
 
         public InMemoryExporter(ICollection<T> exportedItems)
         {
             this.exportedItems = exportedItems;
-            this.onExport = (Batch<T> batch) => this.DefaultExport(batch);
+            this.onExport = this.DefaultExport;
         }
 
-        internal InMemoryExporter(Func<Batch<T>, ExportResult> exportFunc)
+        internal InMemoryExporter(ExportFunc exportFunc)
         {
             this.onExport = exportFunc;
         }
 
+        internal delegate ExportResult ExportFunc(in Batch<T> batch);
+
         public override ExportResult Export(in Batch<T> batch) => this.onExport(batch);
 
         private ExportResult DefaultExport(in Batch<T> batch)

src/OpenTelemetry.Exporter.InMemory/InMemoryExporterLoggingExtensions.cs

@@ -27,7 +27,27 @@ public static OpenTelemetryLoggerOptions AddInMemoryExporter(this OpenTelemetryL
             Guard.ThrowIfNull(loggerOptions);
             Guard.ThrowIfNull(exportedItems);
 
-            return loggerOptions.AddProcessor(new SimpleLogRecordExportProcessor(new InMemoryExporter<LogRecord>(exportedItems)));
+            var logExporter = new InMemoryExporter<LogRecord>(
+                exportFunc: (in Batch<LogRecord> batch) => ExportLogRecord(in batch, exportedItems));
+
+            return loggerOptions.AddProcessor(new SimpleLogRecordExportProcessor(logExporter));
+        }
+
+        private static ExportResult ExportLogRecord(in Batch<LogRecord> batch, ICollection<LogRecord> exportedItems)
+        {
+            if (exportedItems == null)
+            {
+                return ExportResult.Failure;
+            }
+
+            foreach (var log in batch)
+            {
+                log.BufferLogScopes();
+
+                exportedItems.Add(log);
+            }
+
+            return ExportResult.Success;
         }
     }
 }

src/OpenTelemetry.Exporter.InMemory/InMemoryExporterMetricsExtensions.cs

@@ -145,7 +145,7 @@ private static MeterProviderBuilder AddInMemoryExporter(
             configureMetricReader?.Invoke(metricReaderOptions);
 
             var metricExporter = new InMemoryExporter<Metric>(
-                exportFunc: metricBatch => ExportMetricSnapshot(metricBatch, exportedItems));
+                exportFunc: (in Batch<Metric> metricBatch) => ExportMetricSnapshot(in metricBatch, exportedItems));
 
             var metricReader = PeriodicExportingMetricReaderHelper.CreatePeriodicExportingMetricReader(
                 metricExporter,

test/OpenTelemetry.Tests/Logs/LogRecordTest.cs

@@ -746,15 +746,14 @@ public void ParseStateValuesUsingCustomTest()
 
         private static ILoggerFactory InitializeLoggerFactory(out List<LogRecord> exportedItems, Action<OpenTelemetryLoggerOptions> configure = null)
         {
-            exportedItems = new List<LogRecord>();
-            var exporter = new InMemoryExporter<LogRecord>(exportedItems);
-            var processor = new TestLogRecordProcessor(exporter);
+            var items = exportedItems = new List<LogRecord>();
+
             return LoggerFactory.Create(builder =>
             {
                 builder.AddOpenTelemetry(options =>
                 {
                     configure?.Invoke(options);
-                    options.AddProcessor(processor);
+                    options.AddInMemoryExporter(items);
                 });
                 builder.AddFilter(typeof(LogRecordTest).FullName, LogLevel.Trace);
             });
@@ -841,21 +840,6 @@ private class CustomState
         {
             public string Property { get; set; }
         }
-
-        private class TestLogRecordProcessor : SimpleExportProcessor<LogRecord>
-        {
-            public TestLogRecordProcessor(BaseExporter<LogRecord> exporter)
-                : base(exporter)
-            {
-            }
-
-            public override void OnEnd(LogRecord data)
-            {
-                data.BufferLogScopes();
-
-                base.OnEnd(data);
-            }
-        }
     }
 }
 #endif