update namespace, rename class (Azure#34540)

Timothy Mothra · web-flow · commit 9321a2705c8d · 2023-02-24T11:11:12.000-08:00
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Internals/AzureMonitorTransmitter.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Internals/AzureMonitorTransmitter.cs
@@ -10,6 +10,7 @@
 using Azure.Core.Pipeline;
 using Azure.Monitor.OpenTelemetry.Exporter.Internals.ConnectionString;
 using Azure.Monitor.OpenTelemetry.Exporter.Internals.PersistentStorage;
+using Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat;
 using Azure.Monitor.OpenTelemetry.Exporter.Models;
 
 using OpenTelemetry;
@@ -51,10 +52,10 @@ private static void InitializeStatsbeat(ConnectionVars connectionVars)
             try
             {
                 // Do not initialize statsbeat for statsbeat.
-                if (connectionVars != null && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(Statsbeat.Statsbeat_ConnectionString_EU).InstrumentationKey && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(Statsbeat.Statsbeat_ConnectionString_NonEU).InstrumentationKey)
+                if (connectionVars != null && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(AzureMonitorStatsbeat.Statsbeat_ConnectionString_EU).InstrumentationKey && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(AzureMonitorStatsbeat.Statsbeat_ConnectionString_NonEU).InstrumentationKey)
                 {
                     // TODO: Implement IDisposable for transmitter and dispose statsbeat.
-                    _ = new Statsbeat(connectionVars);
+                    _ = new AzureMonitorStatsbeat(connectionVars);
                 }
             }
             catch (Exception ex)
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Internals/Statsbeat/AzureMonitorStatsbeat.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Internals/Statsbeat/AzureMonitorStatsbeat.cs
@@ -13,9 +13,9 @@
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 
-namespace Azure.Monitor.OpenTelemetry.Exporter.Internals
+namespace Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat
 {
-    internal sealed class Statsbeat : IDisposable
+    internal sealed class AzureMonitorStatsbeat : IDisposable
     {
         internal const string Statsbeat_ConnectionString_NonEU = "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://NonEU.in.applicationinsights.azure.com/";
 
@@ -97,7 +97,7 @@ internal sealed class Statsbeat : IDisposable
             "westus3",
         };
 
-        internal Statsbeat(ConnectionVars connectionStringVars)
+        internal AzureMonitorStatsbeat(ConnectionVars connectionStringVars)
         {
             _statsbeat_ConnectionString = GetStatsbeatConnectionString(connectionStringVars?.IngestionEndpoint);
 
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Internals/Statsbeat/VmMetadataResponse.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Internals/Statsbeat/VmMetadataResponse.cs
@@ -3,7 +3,7 @@
 
 #nullable disable // TODO: remove and fix errors
 
-namespace Azure.Monitor.OpenTelemetry.Exporter.Internals
+namespace Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat
 {
     internal class VmMetadataResponse
     {
diff --git a/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/StatsbeatTests.cs b/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/StatsbeatTests.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 using System;
-using Azure.Monitor.OpenTelemetry.Exporter.Internals;
 using Azure.Monitor.OpenTelemetry.Exporter.Internals.ConnectionString;
+using Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat;
 using Xunit;
 
 namespace Azure.Monitor.OpenTelemetry.Exporter.Tests
@@ -26,9 +26,9 @@ public void StatsbeatConnectionStringIsSetBasedOnCustomersConnectionStringEndpoi
         {
             var customer_ConnectionString = $"InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://{euEndpoint}.in.applicationinsights.azure.com/";
             var connectionStringVars = ConnectionStringParser.GetValues(customer_ConnectionString);
-            var statsBeatInstance = new Statsbeat(connectionStringVars);
+            var statsBeatInstance = new AzureMonitorStatsbeat(connectionStringVars);
 
-            Assert.Equal(Statsbeat.Statsbeat_ConnectionString_EU, statsBeatInstance._statsbeat_ConnectionString);
+            Assert.Equal(AzureMonitorStatsbeat.Statsbeat_ConnectionString_EU, statsBeatInstance._statsbeat_ConnectionString);
         }
 
         [Theory]
@@ -69,9 +69,9 @@ public void StatsbeatConnectionStringIsSetBasedOnCustomersConnectionStringEndpoi
         {
             var customer_ConnectionString = $"InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://{nonEUEndpoint}.in.applicationinsights.azure.com/";
             var connectionStringVars = ConnectionStringParser.GetValues(customer_ConnectionString);
-            var statsBeatInstance = new Statsbeat(connectionStringVars);
+            var statsBeatInstance = new AzureMonitorStatsbeat(connectionStringVars);
 
-            Assert.Equal(Statsbeat.Statsbeat_ConnectionString_NonEU, statsBeatInstance._statsbeat_ConnectionString);
+            Assert.Equal(AzureMonitorStatsbeat.Statsbeat_ConnectionString_NonEU, statsBeatInstance._statsbeat_ConnectionString);
         }
 
         [Fact]
@@ -80,7 +80,7 @@ public void StatsbeatIsNotInitializedForUnknownRegions()
             var customer_ConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://foo.in.applicationinsights.azure.com/";
 
             var connectionStringVars = ConnectionStringParser.GetValues(customer_ConnectionString);
-            Assert.Throws<InvalidOperationException>(() => new Statsbeat(connectionStringVars));
+            Assert.Throws<InvalidOperationException>(() => new AzureMonitorStatsbeat(connectionStringVars));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using Azure.Core.Pipeline;`
`11`	`11`	`using Azure.Monitor.OpenTelemetry.Exporter.Internals.ConnectionString;`
`12`	`12`	`using Azure.Monitor.OpenTelemetry.Exporter.Internals.PersistentStorage;`
	`13`	`+using Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat;`
`13`	`14`	`using Azure.Monitor.OpenTelemetry.Exporter.Models;`
`14`	`15`
`15`	`16`	`using OpenTelemetry;`
`@@ -51,10 +52,10 @@ private static void InitializeStatsbeat(ConnectionVars connectionVars)`
`51`	`52`	`try`
`52`	`53`	`{`
`53`	`54`	`// Do not initialize statsbeat for statsbeat.`
`54`		`- if (connectionVars != null && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(Statsbeat.Statsbeat_ConnectionString_EU).InstrumentationKey && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(Statsbeat.Statsbeat_ConnectionString_NonEU).InstrumentationKey)`
	`55`	`+ if (connectionVars != null && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(AzureMonitorStatsbeat.Statsbeat_ConnectionString_EU).InstrumentationKey && connectionVars.InstrumentationKey != ConnectionStringParser.GetValues(AzureMonitorStatsbeat.Statsbeat_ConnectionString_NonEU).InstrumentationKey)`
`55`	`56`	`{`
`56`	`57`	`// TODO: Implement IDisposable for transmitter and dispose statsbeat.`
`57`		`- _ = new Statsbeat(connectionVars);`
	`58`	`+ _ = new AzureMonitorStatsbeat(connectionVars);`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`using OpenTelemetry;`
`14`	`14`	`using OpenTelemetry.Metrics;`
`15`	`15`
`16`		`-namespace Azure.Monitor.OpenTelemetry.Exporter.Internals`
	`16`	`+namespace Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat`
`17`	`17`	`{`
`18`		`- internal sealed class Statsbeat : IDisposable`
	`18`	`+ internal sealed class AzureMonitorStatsbeat : IDisposable`
`19`	`19`	`{`
`20`	`20`	`internal const string Statsbeat_ConnectionString_NonEU = "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://NonEU.in.applicationinsights.azure.com/";`
`21`	`21`
`@@ -97,7 +97,7 @@ internal sealed class Statsbeat : IDisposable`
`97`	`97`	`"westus3",`
`98`	`98`	`};`
`99`	`99`
`100`		`- internal Statsbeat(ConnectionVars connectionStringVars)`
	`100`	`+ internal AzureMonitorStatsbeat(ConnectionVars connectionStringVars)`
`101`	`101`	`{`
`102`	`102`	`_statsbeat_ConnectionString = GetStatsbeatConnectionString(connectionStringVars?.IngestionEndpoint);`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#nullable disable // TODO: remove and fix errors`
`5`	`5`
`6`		`-namespace Azure.Monitor.OpenTelemetry.Exporter.Internals`
	`6`	`+namespace Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat`
`7`	`7`	`{`
`8`	`8`	`internal class VmMetadataResponse`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using Azure.Monitor.OpenTelemetry.Exporter.Internals;`
`6`	`5`	`using Azure.Monitor.OpenTelemetry.Exporter.Internals.ConnectionString;`
	`6`	`+using Azure.Monitor.OpenTelemetry.Exporter.Internals.Statsbeat;`
`7`	`7`	`using Xunit;`
`8`	`8`
`9`	`9`	`namespace Azure.Monitor.OpenTelemetry.Exporter.Tests`
`@@ -26,9 +26,9 @@ public void StatsbeatConnectionStringIsSetBasedOnCustomersConnectionStringEndpoi`
`26`	`26`	`{`
`27`	`27`	`var customer_ConnectionString = $"InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://{euEndpoint}.in.applicationinsights.azure.com/";`
`28`	`28`	`var connectionStringVars = ConnectionStringParser.GetValues(customer_ConnectionString);`
`29`		`- var statsBeatInstance = new Statsbeat(connectionStringVars);`
	`29`	`+ var statsBeatInstance = new AzureMonitorStatsbeat(connectionStringVars);`
`30`	`30`
`31`		`- Assert.Equal(Statsbeat.Statsbeat_ConnectionString_EU, statsBeatInstance._statsbeat_ConnectionString);`
	`31`	`+ Assert.Equal(AzureMonitorStatsbeat.Statsbeat_ConnectionString_EU, statsBeatInstance._statsbeat_ConnectionString);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`[Theory]`
`@@ -69,9 +69,9 @@ public void StatsbeatConnectionStringIsSetBasedOnCustomersConnectionStringEndpoi`
`69`	`69`	`{`
`70`	`70`	`var customer_ConnectionString = $"InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://{nonEUEndpoint}.in.applicationinsights.azure.com/";`
`71`	`71`	`var connectionStringVars = ConnectionStringParser.GetValues(customer_ConnectionString);`
`72`		`- var statsBeatInstance = new Statsbeat(connectionStringVars);`
	`72`	`+ var statsBeatInstance = new AzureMonitorStatsbeat(connectionStringVars);`
`73`	`73`
`74`		`- Assert.Equal(Statsbeat.Statsbeat_ConnectionString_NonEU, statsBeatInstance._statsbeat_ConnectionString);`
	`74`	`+ Assert.Equal(AzureMonitorStatsbeat.Statsbeat_ConnectionString_NonEU, statsBeatInstance._statsbeat_ConnectionString);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`[Fact]`
`@@ -80,7 +80,7 @@ public void StatsbeatIsNotInitializedForUnknownRegions()`
`80`	`80`	`var customer_ConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://foo.in.applicationinsights.azure.com/";`
`81`	`81`
`82`	`82`	`var connectionStringVars = ConnectionStringParser.GetValues(customer_ConnectionString);`
`83`		`- Assert.Throws<InvalidOperationException>(() => new Statsbeat(connectionStringVars));`
	`83`	`+ Assert.Throws<InvalidOperationException>(() => new AzureMonitorStatsbeat(connectionStringVars));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`