more

microsoft · Jan 11, 2024 · 113a363 · 113a363
1 parent 1bb3ec0
commit 113a363
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/NonDaemonThreadsTest.java b/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/NonDaemonThreadsTest.java
@@ -36,7 +36,14 @@ abstract class NonDaemonThreadsTest {
   void spawnAnotherJavaProcess() throws Exception {
     List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
     List<Envelope> rddList = testing.mockedIngestion.waitForItems("RemoteDependencyData", 1);
-    List<Envelope> mdList = testing.mockedIngestion.waitForItems("MessageData", 1);
+    List<Envelope> mdList =
+        testing.mockedIngestion.waitForItems(
+            "MessageData",
+            envelope -> {
+              MessageData md = (MessageData) ((Data<?>) envelope.getData()).getBaseData();
+              return md.getMessage().equals("done");
+            },
+            1);
 
     Envelope rdEnvelope = rdList.get(0);
     Envelope rddEnvelope = rddList.get(0);

diff --git a/.../OtlpMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OtlpTest.java b/.../OtlpMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OtlpTest.java
@@ -28,8 +28,7 @@
 abstract class OtlpTest {
 
   @RegisterExtension
-  static final SmokeTestExtension testing =
-      SmokeTestExtension.builder().useOtlpEndpoint().setSelfDiagnosticsLevel("TRACE").build();
+  static final SmokeTestExtension testing = SmokeTestExtension.builder().useOtlpEndpoint().build();
 
   @Test
   @TargetUri("/ping")

diff --git a/...amework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java b/...amework/src/main/java/com/microsoft/applicationinsights/smoketest/SmokeTestExtension.java
@@ -419,7 +419,8 @@ private void startTestApplicationContainer() throws Exception {
               + FAKE_BREEZE_INGESTION_ENDPOINT);
     }
     if (useOtlpEndpoint) {
-      javaToolOptions.add("-Dotel.metrics.exporter=otlp");
+      // TODO (trask) don't use azure_monitor exporter for smoke test health check
+      javaToolOptions.add("-Dotel.metrics.exporter=otlp,azure_monitor");
       javaToolOptions.add("-Dotel.exporter.otlp.metrics.endpoint=" + FAKE_OTLP_INGESTION_ENDPOINT);
       javaToolOptions.add("-Dotel.exporter.otlp.protocol=http/protobuf");
     }