[OTLP] Dispose exporter if setup fails (#6398)

Co-authored-by: Rajkumar Rangaraj <[email protected]>

Author: martincostello

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpLogExporterHelperExtensions.cs

@@ -327,25 +327,33 @@ internal static BaseProcessor<LogRecord> BuildOtlpLogExporter(
             experimentalOptions!);
 #pragma warning restore CA2000 // Dispose objects before losing scope
 
-        if (configureExporterInstance != null)
+        try
         {
-            otlpExporter = configureExporterInstance(otlpExporter);
-        }
+            if (configureExporterInstance != null)
+            {
+                otlpExporter = configureExporterInstance(otlpExporter);
+            }
 
-        if (processorOptions!.ExportProcessorType == ExportProcessorType.Simple)
-        {
-            return new SimpleLogRecordExportProcessor(otlpExporter);
+            if (processorOptions!.ExportProcessorType == ExportProcessorType.Simple)
+            {
+                return new SimpleLogRecordExportProcessor(otlpExporter);
+            }
+            else
+            {
+                var batchOptions = processorOptions.BatchExportProcessorOptions;
+
+                return new BatchLogRecordExportProcessor(
+                    otlpExporter,
+                    batchOptions.MaxQueueSize,
+                    batchOptions.ScheduledDelayMilliseconds,
+                    batchOptions.ExporterTimeoutMilliseconds,
+                    batchOptions.MaxExportBatchSize);
+            }
         }
-        else
+        catch
         {
-            var batchOptions = processorOptions.BatchExportProcessorOptions;
-
-            return new BatchLogRecordExportProcessor(
-                otlpExporter,
-                batchOptions.MaxQueueSize,
-                batchOptions.ScheduledDelayMilliseconds,
-                batchOptions.ExporterTimeoutMilliseconds,
-                batchOptions.MaxExportBatchSize);
+            otlpExporter.Dispose();
+            throw;
         }
     }
 

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporterHelperExtensions.cs

@@ -151,23 +151,31 @@ internal static BaseProcessor<Activity> BuildOtlpExporterProcessor(
         BaseExporter<Activity> otlpExporter = new OtlpTraceExporter(exporterOptions!, sdkLimitOptions!, experimentalOptions!);
 #pragma warning restore CA2000 // Dispose objects before losing scope
 
-        if (configureExporterInstance != null)
+        try
         {
-            otlpExporter = configureExporterInstance(otlpExporter);
-        }
+            if (configureExporterInstance != null)
+            {
+                otlpExporter = configureExporterInstance(otlpExporter);
+            }
 
-        if (exportProcessorType == ExportProcessorType.Simple)
-        {
-            return new SimpleActivityExportProcessor(otlpExporter);
+            if (exportProcessorType == ExportProcessorType.Simple)
+            {
+                return new SimpleActivityExportProcessor(otlpExporter);
+            }
+            else
+            {
+                return new BatchActivityExportProcessor(
+                    otlpExporter,
+                    batchExportProcessorOptions!.MaxQueueSize,
+                    batchExportProcessorOptions.ScheduledDelayMilliseconds,
+                    batchExportProcessorOptions.ExporterTimeoutMilliseconds,
+                    batchExportProcessorOptions.MaxExportBatchSize);
+            }
         }
-        else
+        catch
         {
-            return new BatchActivityExportProcessor(
-                otlpExporter,
-                batchExportProcessorOptions!.MaxQueueSize,
-                batchExportProcessorOptions.ScheduledDelayMilliseconds,
-                batchExportProcessorOptions.ExporterTimeoutMilliseconds,
-                batchExportProcessorOptions.MaxExportBatchSize);
+            otlpExporter.Dispose();
+            throw;
         }
     }
 }