Skip to content

Update HttpClients smoke test to use new assertion framework #4269

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

Merged
merged 7 commits into from
Jul 14, 2025
+104 −52
Merged

Update HttpClients smoke test to use new assertion framework #4269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3ac7a7
Initial plan
Copilot Jul 7, 2025
e49a70f
Update HttpClients smoke test to use new assertion framework
Copilot Jul 7, 2025
8a5712d
Apply code formatting to new assertion methods
Copilot Jul 7, 2025
9d4d196
Fix hasParent and hasNoParent methods to use tags instead of properties
Copilot Jul 7, 2025
502cd58
Add SampleRate verification support to assertion framework and HttpCl…
Copilot Jul 10, 2025
6f0a32c
Add missing operation name verification to HttpClients test for compl…
Copilot Jul 10, 2025
0746e32
Update smoke-tests/apps/HttpClients/src/smokeTest/java/com/microsoft/…
trask Jul 10, 2025
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
99 changes: 51 additions & 48 deletions ...lients/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8_OPENJ9;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.data.MapEntry.entry;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
Expand Down Expand Up @@ -80,52 +78,57 @@ private static void verify() throws Exception {
}

private static void verify(String successUrlWithQueryString) throws Exception {
Telemetry telemetry = testing.getTelemetry(3);

assertThat(telemetry.rd.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rd.getSuccess()).isTrue();
// TODO (trask) add this check in all smoke tests?
assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();

assertThat(telemetry.rdd1.getName()).isEqualTo("GET /mock/200");
assertThat(telemetry.rdd1.getData()).isEqualTo(successUrlWithQueryString);
assertThat(telemetry.rdd1.getType()).isEqualTo("Http");
assertThat(telemetry.rdd1.getTarget()).isEqualTo("host.testcontainers.internal:6060");
assertThat(telemetry.rdd1.getResultCode()).isEqualTo("200");
assertThat(telemetry.rdd1.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd1.getSuccess()).isTrue();
assertThat(telemetry.rddEnvelope1.getSampleRate()).isNull();

assertThat(telemetry.rdd2.getName()).isEqualTo("GET /mock/404");
assertThat(telemetry.rdd2.getData())
.isEqualTo("http://host.testcontainers.internal:6060/mock/404");
assertThat(telemetry.rdd2.getType()).isEqualTo("Http");
assertThat(telemetry.rdd2.getTarget()).isEqualTo("host.testcontainers.internal:6060");
assertThat(telemetry.rdd2.getResultCode()).isEqualTo("404");
assertThat(telemetry.rdd2.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd2.getSuccess()).isFalse();
assertThat(telemetry.rddEnvelope2.getSampleRate()).isNull();

assertThat(telemetry.rdd3.getName()).isEqualTo("GET /mock/500");
assertThat(telemetry.rdd3.getData())
.isEqualTo("http://host.testcontainers.internal:6060/mock/500");
assertThat(telemetry.rdd3.getType()).isEqualTo("Http");
assertThat(telemetry.rdd3.getTarget()).isEqualTo("host.testcontainers.internal:6060");
assertThat(telemetry.rdd3.getResultCode()).isEqualTo("500");
assertThat(telemetry.rdd3.getProperties())
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
assertThat(telemetry.rdd3.getSuccess()).isFalse();
assertThat(telemetry.rddEnvelope3.getSampleRate()).isNull();

SmokeTestExtension.assertParentChild(
telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope1, "GET /HttpClients/*");
SmokeTestExtension.assertParentChild(
telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope2, "GET /HttpClients/*");
SmokeTestExtension.assertParentChild(
telemetry.rd, telemetry.rdEnvelope, telemetry.rddEnvelope3, "GET /HttpClients/*");
testing.waitAndAssertTrace(
trace ->
trace
.hasRequestSatisying(
request ->
request
.hasSuccess(true)
.hasProperty("_MS.ProcessedByMetricExtractors", "True")
.hasNoParent()
// TODO (trask) add this check in all smoke tests?
.hasNoSampleRate()
.hasTag("ai.operation.name", "GET /HttpClients/*"))
.hasDependencySatisying(
dependency ->
dependency
.hasName("GET /mock/200")
.hasData(successUrlWithQueryString)
.hasType("Http")
.hasTarget("host.testcontainers.internal:6060")
.hasResultCode("200")
.hasSuccess(true)
.hasProperty("_MS.ProcessedByMetricExtractors", "True")
.hasParent(trace.getRequestId(0))
.hasNoSampleRate()
.hasTag("ai.operation.name", "GET /HttpClients/*"))
.hasDependencySatisying(
dependency ->
dependency
.hasName("GET /mock/404")
.hasData("http://host.testcontainers.internal:6060/mock/404")
.hasType("Http")
.hasTarget("host.testcontainers.internal:6060")
.hasResultCode("404")
.hasSuccess(false)
.hasProperty("_MS.ProcessedByMetricExtractors", "True")
.hasParent(trace.getRequestId(0))
.hasNoSampleRate()
.hasTag("ai.operation.name", "GET /HttpClients/*"))
.hasDependencySatisying(
dependency ->
dependency
.hasName("GET /mock/500")
.hasData("http://host.testcontainers.internal:6060/mock/500")
.hasType("Http")
.hasTarget("host.testcontainers.internal:6060")
.hasResultCode("500")
.hasSuccess(false)
.hasProperty("_MS.ProcessedByMetricExtractors", "True")
.hasParent(trace.getRequestId(0))
.hasNoSampleRate()
.hasTag("ai.operation.name", "GET /HttpClients/*")));
}

@Environment(TOMCAT_8_JAVA_8)
Expand Down
39 changes: 37 additions & 2 deletions ...framework/src/main/java/com/microsoft/applicationinsights/smoketest/DependencyAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,49 @@ public DependencyAssert hasTag(String key, String value) {
@CanIgnoreReturnValue
public DependencyAssert hasNoParent() {
isNotNull();
assertThat(getDependencyData().getProperties().get("ai.operation.parentId")).isNull();
assertThat(actual.getTags()).doesNotContainKey("ai.operation.parentId");
return this;
}

@CanIgnoreReturnValue
public DependencyAssert hasParent(String parentId) {
isNotNull();
assertThat(getDependencyData().getProperties().get("ai.operation.parentId")).isNull();
assertThat(actual.getTags()).containsEntry("ai.operation.parentId", parentId);
return this;
}

@CanIgnoreReturnValue
public DependencyAssert hasData(String data) {
isNotNull();
assertThat(getDependencyData().getData()).isEqualTo(data);
return this;
}

@CanIgnoreReturnValue
public DependencyAssert hasType(String type) {
isNotNull();
assertThat(getDependencyData().getType()).isEqualTo(type);
return this;
}

@CanIgnoreReturnValue
public DependencyAssert hasResultCode(String resultCode) {
isNotNull();
assertThat(getDependencyData().getResultCode()).isEqualTo(resultCode);
return this;
}

@CanIgnoreReturnValue
public DependencyAssert hasSampleRate(Float expectedSampleRate) {
isNotNull();
assertThat(actual.getSampleRate()).isEqualTo(expectedSampleRate);
return this;
}

@CanIgnoreReturnValue
public DependencyAssert hasNoSampleRate() {
isNotNull();
assertThat(actual.getSampleRate()).isNull();
return this;
}

Expand Down
18 changes: 16 additions & 2 deletions ...ts/framework/src/main/java/com/microsoft/applicationinsights/smoketest/RequestAssert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,28 @@ public RequestAssert hasTag(String key, String value) {
@CanIgnoreReturnValue
public RequestAssert hasNoParent() {
isNotNull();
assertThat(getRequestData().getProperties().get("ai.operation.parentId")).isNull();
assertThat(actual.getTags()).doesNotContainKey("ai.operation.parentId");
return this;
}

@CanIgnoreReturnValue
public RequestAssert hasParent(String parentId) {
isNotNull();
assertThat(getRequestData().getProperties().get("ai.operation.parentId")).isNull();
assertThat(actual.getTags()).containsEntry("ai.operation.parentId", parentId);
return this;
}

@CanIgnoreReturnValue
public RequestAssert hasSampleRate(Float expectedSampleRate) {
isNotNull();
assertThat(actual.getSampleRate()).isEqualTo(expectedSampleRate);
return this;
}

@CanIgnoreReturnValue
public RequestAssert hasNoSampleRate() {
isNotNull();
assertThat(actual.getSampleRate()).isNull();
return this;
}

Expand Down