Update test

microsoft · Jun 13, 2024 · c5c6c7c · c5c6c7c
1 parent fe2c2e2
commit c5c6c7c
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/azure-monitor-opentelemetry-exporter-1.0.0-beta.25.jar b/azure-monitor-opentelemetry-exporter-1.0.0-beta.25.jar
diff --git a/...keTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java b/...keTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java
@@ -60,6 +60,7 @@ private static void verifyHttpclientRequestsAndDependencies(String successUrlWit
 
  assertThat(telemetry.rd.getProperties())
  .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
+ assertThat(telemetry.rd.getSuccess()).isTrue();
  assertThat(telemetry.rdd1.getData()).isEqualTo(successUrlWithQueryString);
  assertThat(telemetry.rd.getSuccess()).isTrue();
  assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();
@@ -167,8 +168,8 @@ private static void validateMetricData(
  assertThat(dataPoint.getValue()).isGreaterThan(greaterThan).isLessThan(60 * 1000.0);
  assertThat(dataPoint.getMin()).isGreaterThan(greaterThan).isLessThan(60 * 1000.0);
  assertThat(dataPoint.getMax()).isGreaterThan(greaterThan).isLessThan(60 * 1000.0);
+ String expectedSuccess = Integer.parseInt(resultCode) < 400 ? "True" : "False";
  Map<String, String> properties = metricData.getProperties();
- String expectedSuccess = "200".equals(resultCode) ? "True" : "False";
  if ("client".equals(type)) {
  assertThat(properties).hasSize(9);
  assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");

diff --git a/.../smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java b/.../smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java
@@ -14,6 +14,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
 
+import com.microsoft.applicationinsights.smoketest.schemav2.Data;
+import com.microsoft.applicationinsights.smoketest.schemav2.DataPoint;
+import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
+import com.microsoft.applicationinsights.smoketest.schemav2.MetricData;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -35,6 +41,23 @@ void doMostBasicTest() throws Exception {
  assertThat(telemetry.rd.getProperties())
  .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
  assertThat(telemetry.rd.getMeasurements()).isEmpty();
+
+ List<Envelope> serverMetrics =
+ testing.mockedIngestion.waitForStandardMetricItems("requests/duration", 1);
+ MetricData metricData = (MetricData) ((Data<?>) serverMetrics.get(0).getData()).getBaseData();
+ List<DataPoint> dataPoints = metricData.getMetrics();
+ assertThat(dataPoints).hasSize(1);
+ DataPoint dataPoint = dataPoints.get(0);
+ assertThat(dataPoint.getCount()).isEqualTo(1);
+
+ Map<String, String> properties = metricData.getProperties();
+ assertThat(properties).hasSize(7);
+ assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
+ assertThat(properties.get("request/resultCode")).isEqualTo("400");
+ assertThat(properties.get("Request.Success")).isEqualTo("False");
+ assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
+ assertThat(properties.get("cloud/roleName")).isEqualTo("testrolename");
+ assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
  }
 
  @Environment(TOMCAT_8_JAVA_8)

diff --git a/...4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java b/...4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java
@@ -14,6 +14,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
 
+import com.microsoft.applicationinsights.smoketest.schemav2.Data;
+import com.microsoft.applicationinsights.smoketest.schemav2.DataPoint;
+import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
+import com.microsoft.applicationinsights.smoketest.schemav2.MetricData;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -35,6 +41,23 @@ void doMostBasicTest() throws Exception {
  assertThat(telemetry.rd.getProperties())
  .containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
  assertThat(telemetry.rd.getMeasurements()).isEmpty();
+
+ List<Envelope> serverMetrics =
+ testing.mockedIngestion.waitForStandardMetricItems("requests/duration", 1);
+ MetricData metricData = (MetricData) ((Data<?>) serverMetrics.get(0).getData()).getBaseData();
+ List<DataPoint> dataPoints = metricData.getMetrics();
+ assertThat(dataPoints).hasSize(1);
+ DataPoint dataPoint = dataPoints.get(0);
+ assertThat(dataPoint.getCount()).isEqualTo(1);
+
+ Map<String, String> properties = metricData.getProperties();
+ assertThat(properties).hasSize(7);
+ assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
+ assertThat(properties.get("request/resultCode")).isEqualTo("400");
+ assertThat(properties.get("Request.Success")).isEqualTo("True");
+ assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
+ assertThat(properties.get("cloud/roleName")).isEqualTo("testrolename");
+ assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
  }
 
  @Environment(TOMCAT_8_JAVA_8)