From 7dfb93547d0267d229d941797cdd3ef438a32ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Paj=C4=85k?= <pellared@hotmail.com>
Date: Thu, 12 Aug 2021 08:22:37 +0200
Subject: [PATCH] Rename to BatchExportActivityProcessorOptions

---
 ...=> BatchExportActivityProcessorOptions.cs} |  6 +--
 ...atchExportActivityProcessorOptionsTest.cs} | 42 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename src/OpenTelemetry/Trace/{BatchSpanExportProcessorOptions.cs => BatchExportActivityProcessorOptions.cs} (92%)
 rename test/OpenTelemetry.Tests/Trace/{BatchSpanExportProcessorOptionsTest.cs => BatchExportActivityProcessorOptionsTest.cs} (52%)

diff --git a/src/OpenTelemetry/Trace/BatchSpanExportProcessorOptions.cs b/src/OpenTelemetry/Trace/BatchExportActivityProcessorOptions.cs
similarity index 92%
rename from src/OpenTelemetry/Trace/BatchSpanExportProcessorOptions.cs
rename to src/OpenTelemetry/Trace/BatchExportActivityProcessorOptions.cs
index 1c155eda12c..a150cc74d8e 100644
--- a/src/OpenTelemetry/Trace/BatchSpanExportProcessorOptions.cs
+++ b/src/OpenTelemetry/Trace/BatchExportActivityProcessorOptions.cs
@@ -1,4 +1,4 @@
-// <copyright file="BatchSpanExportProcessorOptions.cs" company="OpenTelemetry Authors">
+// <copyright file="BatchExportActivityProcessorOptions.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@
 
 namespace OpenTelemetry.Trace
 {
-    public class BatchSpanExportProcessorOptions : BatchExportProcessorOptions<Activity>
+    public class BatchExportActivityProcessorOptions : BatchExportProcessorOptions<Activity>
     {
         internal const string MaxQueueSizeEnvVarKey = "OTEL_BSP_MAX_QUEUE_SIZE";
 
@@ -31,7 +31,7 @@ public class BatchSpanExportProcessorOptions : BatchExportProcessorOptions<Activ
 
         internal const string ScheduledDelayEnvVarKey = "OTEL_BSP_SCHEDULE_DELAY";
 
-        public BatchSpanExportProcessorOptions()
+        public BatchExportActivityProcessorOptions()
         {
             int value;
 
diff --git a/test/OpenTelemetry.Tests/Trace/BatchSpanExportProcessorOptionsTest.cs b/test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorOptionsTest.cs
similarity index 52%
rename from test/OpenTelemetry.Tests/Trace/BatchSpanExportProcessorOptionsTest.cs
rename to test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorOptionsTest.cs
index 073b9ca3c69..327752fa316 100644
--- a/test/OpenTelemetry.Tests/Trace/BatchSpanExportProcessorOptionsTest.cs
+++ b/test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorOptionsTest.cs
@@ -1,4 +1,4 @@
-// <copyright file="BatchSpanExportProcessorOptionsTest.cs" company="OpenTelemetry Authors">
+// <copyright file="BatchExportActivityProcessorOptionsTest.cs" company="OpenTelemetry Authors">
 // Copyright The OpenTelemetry Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +19,9 @@
 
 namespace OpenTelemetry.Trace.Tests
 {
-    public class BatchSpanExportProcessorOptionsTest : IDisposable
+    public class BatchExportActivityProcessorOptionsTest : IDisposable
     {
-        public BatchSpanExportProcessorOptionsTest()
+        public BatchExportActivityProcessorOptionsTest()
         {
             this.ClearEnvVars();
         }
@@ -34,7 +34,7 @@ public void Dispose()
         [Fact]
         public void BatchExportProcessorOptions_Defaults()
         {
-            var options = new BatchSpanExportProcessorOptions();
+            var options = new BatchExportActivityProcessorOptions();
 
             Assert.Equal(30000, options.ExporterTimeoutMilliseconds);
             Assert.Equal(512, options.MaxExportBatchSize);
@@ -45,12 +45,12 @@ public void BatchExportProcessorOptions_Defaults()
         [Fact]
         public void BatchExportProcessorOptions_EnvironmentVariableOverride()
         {
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.ExporterTimeoutEnvVarKey, "1");
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.MaxExportBatchSizeEnvVarKey, "2");
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.MaxQueueSizeEnvVarKey, "3");
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.ScheduledDelayEnvVarKey, "4");
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.ExporterTimeoutEnvVarKey, "1");
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.MaxExportBatchSizeEnvVarKey, "2");
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.MaxQueueSizeEnvVarKey, "3");
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.ScheduledDelayEnvVarKey, "4");
 
-            var options = new BatchSpanExportProcessorOptions();
+            var options = new BatchExportActivityProcessorOptions();
 
             Assert.Equal(1, options.ExporterTimeoutMilliseconds);
             Assert.Equal(2, options.MaxExportBatchSize);
@@ -61,9 +61,9 @@ public void BatchExportProcessorOptions_EnvironmentVariableOverride()
         [Fact]
         public void BatchExportProcessorOptions_InvalidPortEnvironmentVariableOverride()
         {
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.ExporterTimeoutEnvVarKey, "invalid");
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.ExporterTimeoutEnvVarKey, "invalid");
 
-            var options = new BatchSpanExportProcessorOptions();
+            var options = new BatchExportActivityProcessorOptions();
 
             Assert.Equal(30000, options.ExporterTimeoutMilliseconds); // use default
         }
@@ -71,9 +71,9 @@ public void BatchExportProcessorOptions_InvalidPortEnvironmentVariableOverride()
         [Fact]
         public void BatchExportProcessorOptions_SetterOverridesEnvironmentVariable()
         {
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.ExporterTimeoutEnvVarKey, "123");
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.ExporterTimeoutEnvVarKey, "123");
 
-            var options = new BatchSpanExportProcessorOptions
+            var options = new BatchExportActivityProcessorOptions
             {
                 ExporterTimeoutMilliseconds = 89000,
             };
@@ -84,18 +84,18 @@ public void BatchExportProcessorOptions_SetterOverridesEnvironmentVariable()
         [Fact]
         public void BatchExportProcessorOptions_EnvironmentVariableNames()
         {
-            Assert.Equal("OTEL_BSP_EXPORT_TIMEOUT", BatchSpanExportProcessorOptions.ExporterTimeoutEnvVarKey);
-            Assert.Equal("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", BatchSpanExportProcessorOptions.MaxExportBatchSizeEnvVarKey);
-            Assert.Equal("OTEL_BSP_MAX_QUEUE_SIZE", BatchSpanExportProcessorOptions.MaxQueueSizeEnvVarKey);
-            Assert.Equal("OTEL_BSP_SCHEDULE_DELAY", BatchSpanExportProcessorOptions.ScheduledDelayEnvVarKey);
+            Assert.Equal("OTEL_BSP_EXPORT_TIMEOUT", BatchExportActivityProcessorOptions.ExporterTimeoutEnvVarKey);
+            Assert.Equal("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", BatchExportActivityProcessorOptions.MaxExportBatchSizeEnvVarKey);
+            Assert.Equal("OTEL_BSP_MAX_QUEUE_SIZE", BatchExportActivityProcessorOptions.MaxQueueSizeEnvVarKey);
+            Assert.Equal("OTEL_BSP_SCHEDULE_DELAY", BatchExportActivityProcessorOptions.ScheduledDelayEnvVarKey);
         }
 
         private void ClearEnvVars()
         {
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.ExporterTimeoutEnvVarKey, null);
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.MaxExportBatchSizeEnvVarKey, null);
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.MaxQueueSizeEnvVarKey, null);
-            Environment.SetEnvironmentVariable(BatchSpanExportProcessorOptions.ScheduledDelayEnvVarKey, null);
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.ExporterTimeoutEnvVarKey, null);
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.MaxExportBatchSizeEnvVarKey, null);
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.MaxQueueSizeEnvVarKey, null);
+            Environment.SetEnvironmentVariable(BatchExportActivityProcessorOptions.ScheduledDelayEnvVarKey, null);
         }
     }
 }