Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update smokes tests for Request.success #3741

Merged
merged 4 commits into from
Jul 2, 2024
+49 −2
Merged

Update smokes tests for Request.success #3741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe2c2e2
test new exporter
heyams Jun 12, 2024
c5c6c7c
Update test
heyams Jun 13, 2024
38d7e6e
Merge branch 'main' of https://github.com/microsoft/ApplicationInsigh…
heyams Jul 2, 2024
3766ee3
Remove test jar
heyams Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
required: false

env:
EXPORTER_VERSION: 1.0.0-beta.24 # to be updated with the latest version
EXPORTER_VERSION: 1.0.0-beta.25 # to be updated with the latest version

jobs:
spotless:
Expand Down
3 changes: 2 additions & 1 deletion ...keTest/java/com/microsoft/applicationinsights/smoketest/HttpPreaggregatedMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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");
Expand Down
23 changes: 23 additions & 0 deletions .../smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down
23 changes: 23 additions & 0 deletions ...4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down
Loading