Sync back from azure sdk repo (#2793)

Author: trask

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorExporterBuilder.java

@@ -256,13 +256,14 @@ public LogRecordExporter buildLogRecordExporter() {
   }
 
   private TelemetryItemExporter initExporterBuilder() {
-    String connectionStringOverride = configuration.get(APPLICATIONINSIGHTS_CONNECTION_STRING);
-    if (connectionStringOverride != null) {
-      // APPLICATIONINSIGHTS_CONNECTION_STRING environment variable should take precedence over
-      // programmatically calling connectionString()
-      connectionString = ConnectionString.parse(connectionStringOverride);
+    if (connectionString == null) {
+      // if connection string is not set, try loading from configuration
+      Configuration configuration = Configuration.getGlobalConfiguration();
+      connectionString(configuration.get(APPLICATIONINSIGHTS_CONNECTION_STRING));
     }
 
+    Objects.requireNonNull(connectionString, "'connectionString' cannot be null");
+
     if (this.credential != null) {
       // Add authentication policy to HttpPipeline
       BearerTokenAuthenticationPolicy authenticationPolicy =

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/README.md

@@ -23,7 +23,7 @@ For more information, please read [introduction to Application Insights][applica
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-monitor-opentelemetry-exporter</artifactId>
-  <version>1.0.0-beta.5</version>
+  <version>1.0.0-beta.6</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -39,21 +39,21 @@ right corner.
 
 ### Creating exporter for Azure Monitor
 ```java readme-sample-createExporter
-AzureMonitorTraceExporter azureMonitorTraceExporter = new AzureMonitorExporterBuilder()
+SpanExporter azureMonitorTraceExporter = new AzureMonitorExporterBuilder()
     .connectionString("{connection-string}")
     .buildTraceExporter();
 ```
 
 #### Exporting span data
 
 The following example shows how to export a trace data to Azure Monitor through the
- `AzureMonitorExporter`
+ `AzureMonitorTraceExporter`
 
 ##### Setup OpenTelemetry Tracer to work with Azure Monitor exporter
 ```java readme-sample-setupExporter
 // Create Azure Monitor exporter and configure OpenTelemetry tracer to use this exporter
 // This should be done just once when application starts up
-AzureMonitorTraceExporter exporter = new AzureMonitorExporterBuilder()
+SpanExporter exporter = new AzureMonitorExporterBuilder()
     .connectionString("{connection-string}")
     .buildTraceExporter();
 
@@ -87,24 +87,6 @@ try {
 }
 ```
 
-### Setup OpenTelemetry Tracer to generate spans with better operation names
-
-
-```
-AzureMonitorTraceExporter exporter = new AzureMonitorExporterBuilder()
-    .connectionString("{connection-string}")
-    .buildTraceExporter();
-SdkTracerProvider tracerProvider = SdkTracerProvider.builder()
-    .addSpanProcessor(new AiOperationNameSpanProcessor())
-    .addSpanProcessor(SimpleSpanProcessor.create(exporter))
-    .build();
-OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder()
-    .setTracerProvider(tracerProvider)
-    .buildAndRegisterGlobal();
-Tracer tracer = openTelemetrySdk.getTracer("Sample");
-
-```
-
 ## Key concepts
 
 Some key concepts for the Azure Monitor exporter include:
@@ -182,4 +164,8 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
 [sampler_ref]: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/sdk.md#sampling
 [trace_concept]: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/overview.md#trace
 [samples_code]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/monitor/azure-monitor-opentelemetry-exporter/src/samples
+[cla]: https://cla.microsoft.com
+[coc]: https://opensource.microsoft.com/codeofconduct/
+[coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
+[coc_contact]: mailto:[email protected]
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%monitor%2Fazure-monitor-opentelemetry-exporter%2FREADME.png)

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/configuration/StatsbeatConnectionString.java

@@ -3,6 +3,8 @@
 
 package com.azure.monitor.opentelemetry.exporter.implementation.configuration;
 
+import static java.util.Arrays.asList;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashSet;
@@ -26,57 +28,58 @@ public final class StatsbeatConnectionString {
 
   private static final Pattern pattern = Pattern.compile("^https?://(?:www\\.)?([^/.-]+)");
 
-  private static final Set<String> EU_REGION_GEO_SET = new HashSet<>(12);
-  private static final Set<String> NON_EU_REGION_GEO_SET = new HashSet<>(33);
-
-  static {
-    EU_REGION_GEO_SET.add("westeurope");
-    EU_REGION_GEO_SET.add("northeurope");
-    EU_REGION_GEO_SET.add("francecentral");
-    EU_REGION_GEO_SET.add("francesouth");
-    EU_REGION_GEO_SET.add("germanywestcentral");
-    EU_REGION_GEO_SET.add("norwayeast");
-    EU_REGION_GEO_SET.add("norwaywest");
-    EU_REGION_GEO_SET.add("swedencentral");
-    EU_REGION_GEO_SET.add("switzerlandnorth");
-    EU_REGION_GEO_SET.add("switzerlandwest");
-    EU_REGION_GEO_SET.add("uksouth");
-    EU_REGION_GEO_SET.add("ukwest");
-
-    NON_EU_REGION_GEO_SET.add("eastasia");
-    NON_EU_REGION_GEO_SET.add("southeastasia");
-    NON_EU_REGION_GEO_SET.add("chinaeast2");
-    NON_EU_REGION_GEO_SET.add("chinaeast3");
-    NON_EU_REGION_GEO_SET.add("chinanorth3");
-    NON_EU_REGION_GEO_SET.add("centralindia");
-    NON_EU_REGION_GEO_SET.add("southindia");
-    NON_EU_REGION_GEO_SET.add("jioindiacentral");
-    NON_EU_REGION_GEO_SET.add("jioindiawest");
-    NON_EU_REGION_GEO_SET.add("japaneast");
-    NON_EU_REGION_GEO_SET.add("japanwest");
-    NON_EU_REGION_GEO_SET.add("koreacentral");
-    NON_EU_REGION_GEO_SET.add("koreasouth");
-    NON_EU_REGION_GEO_SET.add("australiacentral");
-    NON_EU_REGION_GEO_SET.add("australiacentral2");
-    NON_EU_REGION_GEO_SET.add("australiaeast");
-    NON_EU_REGION_GEO_SET.add("australiasoutheast");
-    NON_EU_REGION_GEO_SET.add("canadacentral");
-    NON_EU_REGION_GEO_SET.add("canadaeast");
-    NON_EU_REGION_GEO_SET.add("qatarcentral");
-    NON_EU_REGION_GEO_SET.add("uaecentral");
-    NON_EU_REGION_GEO_SET.add("uaenorth");
-    NON_EU_REGION_GEO_SET.add("southafricanorth");
-    NON_EU_REGION_GEO_SET.add("brazilsouth");
-    NON_EU_REGION_GEO_SET.add("brazilsoutheast");
-    NON_EU_REGION_GEO_SET.add("centralus");
-    NON_EU_REGION_GEO_SET.add("eastus");
-    NON_EU_REGION_GEO_SET.add("eastus2");
-    NON_EU_REGION_GEO_SET.add("northcentralus");
-    NON_EU_REGION_GEO_SET.add("southcentralus");
-    NON_EU_REGION_GEO_SET.add("westus");
-    NON_EU_REGION_GEO_SET.add("westus2");
-    NON_EU_REGION_GEO_SET.add("westus3");
-  }
+  private static final Set<String> EU_REGION_GEO_SET =
+      new HashSet<>(
+          asList(
+              "westeurope",
+              "northeurope",
+              "francecentral",
+              "francesouth",
+              "germanywestcentral",
+              "norwayeast",
+              "norwaywest",
+              "swedencentral",
+              "switzerlandnorth",
+              "switzerlandwest",
+              "uksouth",
+              "ukwest"));
+
+  private static final Set<String> NON_EU_REGION_GEO_SET =
+      new HashSet<>(
+          asList(
+              "eastasia",
+              "southeastasia",
+              "chinaeast2",
+              "chinaeast3",
+              "chinanorth3",
+              "centralindia",
+              "southindia",
+              "jioindiacentral",
+              "jioindiawest",
+              "japaneast",
+              "japanwest",
+              "koreacentral",
+              "koreasouth",
+              "australiacentral",
+              "australiacentral2",
+              "australiaeast",
+              "australiasoutheast",
+              "canadacentral",
+              "canadaeast",
+              "qatarcentral",
+              "uaecentral",
+              "uaenorth",
+              "southafricanorth",
+              "brazilsouth",
+              "brazilsoutheast",
+              "centralus",
+              "eastus",
+              "eastus2",
+              "northcentralus",
+              "southcentralus",
+              "westus",
+              "westus2",
+              "westus3"));
 
   private final String ingestionEndpoint;
   private final String instrumentationKey;

agent/azure-monitor-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/AzureMonitorExportersEndToEndTest.java

@@ -47,11 +47,11 @@
 
 public class AzureMonitorExportersEndToEndTest extends MonitorExporterClientTestBase {
 
-  private static final String TRACE_CONNECTION_STRING_OVERRIDE =
+  private static final String CONNECTION_STRING_ENV =
       "InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;"
           + "IngestionEndpoint=https://test.in.applicationinsights.azure.com/;"
           + "LiveEndpoint=https://test.livediagnostics.monitor.azure.com/";
-  private static final String INSTRUMENTATION_KEY = "00000000-0000-0000-0000-0FEEDDADBEEF";
+  private static final String INSTRUMENTATION_KEY = "00000000-0000-0000-0000-000000000000";
 
   @Test
   public void testBuildTraceExporter() throws Exception {
@@ -167,7 +167,7 @@ private static Configuration getConfiguration() {
             new TestConfigurationSource(),
             new TestConfigurationSource(),
             new TestConfigurationSource()
-                .put("APPLICATIONINSIGHTS_CONNECTION_STRING", TRACE_CONNECTION_STRING_OVERRIDE))
+                .put("APPLICATIONINSIGHTS_CONNECTION_STRING", CONNECTION_STRING_ENV))
         .build();
   }