Remove useOtlpViaEnvVars and use useOtlpEndpoint

Author: xiang17

smoke-tests/apps/HttpPreaggregatedMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTestOtlpEnabled.java

@@ -32,7 +32,7 @@ abstract class HttpPreaggregatedMetricsTestOtlpEnabled {
 
   @RegisterExtension
   static final SmokeTestExtension testing =
-      SmokeTestExtension.builder().useOtlpViaEnvVars().build();
+      SmokeTestExtension.builder().useOtlpEndpoint().build();
 
   @Test
   @TargetUri("/httpUrlConnection")

smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java

@@ -38,7 +38,7 @@ abstract class OpenTelemetryMetricTestToAmw {
 
   @RegisterExtension
   static final SmokeTestExtension testing =
-      SmokeTestExtension.builder().useOtlpViaEnvVars().build();
+      SmokeTestExtension.builder().useOtlpEndpoint().build();
 
   @Test
   @TargetUri("/trackDoubleCounterMetric")

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java

@@ -112,7 +112,6 @@ public class SmokeTestExtension
   private final List<String> jvmArgs;
   private final boolean useDefaultHttpPort;
   private final boolean useOtlpEndpoint;
-  private final boolean useOtlpViaEnvVars;
 
   public static SmokeTestExtension create() {
     return builder().build();
@@ -138,8 +137,7 @@ public static SmokeTestExtensionBuilder builder() {
       Map<String, String> envVars,
       List<String> jvmArgs,
       boolean useDefaultHttpPort,
-      boolean useOtlpEndpoint,
-      boolean useOtlpViaEnvVars) {
+      boolean useOtlpEndpoint) {
     this.skipHealthCheck = skipHealthCheck;
     this.readOnly = readOnly;
     this.dependencyContainer = dependencyContainer;
@@ -169,7 +167,6 @@ public static SmokeTestExtensionBuilder builder() {
     this.jvmArgs = jvmArgs;
     this.useDefaultHttpPort = useDefaultHttpPort;
     this.useOtlpEndpoint = useOtlpEndpoint;
-    this.useOtlpViaEnvVars = useOtlpViaEnvVars;
 
     mockedIngestion = new MockedAppInsightsIngestionServer(useOld3xAgent);
   }
@@ -221,7 +218,7 @@ private void prepareEnvironment(Environment environment) throws Exception {
     mockedIngestion.startServer();
     mockedIngestion.setRequestLoggingEnabled(true);
     mockedIngestion.setQuickPulseRequestLoggingEnabled(true);
-    if (useOtlpEndpoint || useOtlpViaEnvVars) {
+    if (useOtlpEndpoint) {
       mockedOtlpIngestion.startServer();
     }
     network = Network.newNetwork();
@@ -425,7 +422,7 @@ private void startTestApplicationContainer() throws Exception {
     Testcontainers.exposeHostPorts(6060);
     Testcontainers.exposeHostPorts(4318);
 
-    if (useOtlpViaEnvVars) {
+    if (useOtlpEndpoint) {
       envVars.put("OTEL_METRICS_EXPORTER", "otlp,azure_monitor");
       envVars.put("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT", FAKE_OTLP_INGESTION_ENDPOINT);
       envVars.put("OTEL_EXPORTER_OTLP_PROTOCOL", "http/protobuf");
@@ -580,7 +577,7 @@ public void afterAll(ExtensionContext context) throws Exception {
     mockedIngestion.stopServer();
     mockedIngestion.setRequestLoggingEnabled(false);
     mockedIngestion.setQuickPulseRequestLoggingEnabled(false);
-    if (useOtlpEndpoint || useOtlpViaEnvVars) {
+    if (useOtlpEndpoint) {
       mockedOtlpIngestion.stopServer();
     }
   }

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtensionBuilder.java

@@ -29,7 +29,6 @@ public class SmokeTestExtensionBuilder {
   private final List<String> jvmArgs = new ArrayList<>();
   private boolean useDefaultHttpPort;
   private boolean useOtlpEndpoint;
-  private boolean useOtlpViaEnvVars;
 
   public SmokeTestExtensionBuilder setDependencyContainer(
       String envVarName, GenericContainer<?> container) {
@@ -109,11 +108,6 @@ public SmokeTestExtensionBuilder useOtlpEndpoint() {
     return this;
   }
 
-  public SmokeTestExtensionBuilder useOtlpViaEnvVars() {
-    this.useOtlpViaEnvVars = true;
-    return this;
-  }
-
   public SmokeTestExtension build() {
     return new SmokeTestExtension(
         dependencyContainer,
@@ -131,7 +125,6 @@ public SmokeTestExtension build() {
         envVars,
         jvmArgs,
         useDefaultHttpPort,
-        useOtlpEndpoint,
-        useOtlpViaEnvVars);
+        useOtlpEndpoint);
   }
 }