Otlp include batch transformation into try/catch scope (#2915)

Co-authored-by: Cijo Thomas <[email protected]>
open-telemetry · Feb 22, 2022 · 71c22ac · 71c22ac
1 parent 4b3ee96
commit 71c22ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpLogExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpLogExporter.cs
@@ -70,10 +70,10 @@ public override ExportResult Export(in Batch<LogRecord> logRecordBatch)
 
             var request = new OtlpCollector.ExportLogsServiceRequest();
 
-            request.AddBatch(this.ProcessResource, logRecordBatch);
-
             try
             {
+                request.AddBatch(this.ProcessResource, logRecordBatch);
+
                 if (!this.exportClient.SendExportRequest(request))
                 {
                     return ExportResult.Failure;

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpMetricExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpMetricExporter.cs
@@ -69,10 +69,10 @@ public override ExportResult Export(in Batch<Metric> metrics)
 
             var request = new OtlpCollector.ExportMetricsServiceRequest();
 
-            request.AddMetrics(this.ProcessResource, metrics);
-
             try
             {
+                request.AddMetrics(this.ProcessResource, metrics);
+
                 if (!this.exportClient.SendExportRequest(request))
                 {
                     return ExportResult.Failure;

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporter.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporter.cs
@@ -69,10 +69,10 @@ public override ExportResult Export(in Batch<Activity> activityBatch)
 
             var request = new OtlpCollector.ExportTraceServiceRequest();
 
-            request.AddBatch(this.ProcessResource, activityBatch);
-
             try
             {
+                request.AddBatch(this.ProcessResource, activityBatch);
+
                 if (!this.exportClient.SendExportRequest(request))
                 {
                     return ExportResult.Failure;
@@ -81,7 +81,6 @@ public override ExportResult Export(in Batch<Activity> activityBatch)
             catch (Exception ex)
             {
                 OpenTelemetryProtocolExporterEventSource.Log.ExportMethodException(ex);
-
                 return ExportResult.Failure;
             }
             finally