Merge branch 'main' into alanwest/metric-options-console-exporter

.github/codecov.yml

@@ -6,6 +6,7 @@ coverage:
   round: down
   range: "70...100"
   status:
+    project: off
     patch: off
 
 parsers:

CONTRIBUTING.md

@@ -114,14 +114,6 @@ Add your fork as an origin:
 git remote add fork https://github.com/YOUR_GITHUB_USERNAME/opentelemetry-dotnet.git
 ```
 
-By default your work will be targeting the `main` branch. If you want to work on
-the experimental metrics feature, please switch to the `metrics` feature branch:
-
-```sh
-# only do this when you want to work on the experimental metrics feature
-git checkout metrics
-```
-
 Run tests:
 
 ```sh
@@ -174,8 +166,8 @@ A PR is considered to be **ready to merge** when:
 * Urgent fix can take exception as long as it has been actively communicated.
 
 Any Maintainer can merge the PR once it is **ready to merge**. Note, that some
-PR may not be merged immediately if repo is being in process of a major release
-and the new feature doesn't fit it.
+PRs may not be merged immediately if the repo is in the process of a release and
+the maintainers decided to defer the PR to the next release train.
 
 If a PR has been stuck (e.g. there are lots of debates and people couldn't agree
 on each other), the owner should try to get people aligned by:

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;

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;

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

src/OpenTelemetry/BaseExportProcessor.cs

@@ -19,6 +19,26 @@
 
 namespace OpenTelemetry
 {
+    /// <summary>
+    /// Type of Export Processor to be used.
+    /// </summary>
+    public enum ExportProcessorType
+    {
+        /// <summary>
+        /// Use SimpleExportProcessor.
+        /// Refer to the <a href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#simple-processor">
+        /// specification</a> for more information.
+        /// </summary>
+        Simple,
+
+        /// <summary>
+        /// Use BatchExportProcessor.
+        /// Refer to <a href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#batching-processor">
+        /// specification</a> for more information.
+        /// </summary>
+        Batch,
+    }
+
     /// <summary>
     /// Implements processor that exports telemetry objects.
     /// </summary>