Skip to content

Commit 82d6853

Browse files
trasktrask
authored
Fix sporadic CI failures (#3723)
1 parent ae3b5a3 commit 82d6853

File tree

16 files changed

+65
-49
lines changed

16 files changed

+65
-49
lines changed

‎smoke-tests/apps/ConnectionStringOverrides/src/main/java/com/microsoft/applicationinsights/smoketestapp/ConnectionStringOverridesServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
2828
return;
2929
}
3030
if (pathInfo.startsWith("/app")) {
31-
httpUrlConnection("https://mock.codes/200");
31+
httpUrlConnection("http://host.testcontainers.internal:6060/mock/200");
3232
logger.info("hello");
3333
return;
3434
}

‎smoke-tests/apps/ConnectionStringOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ConnectionStringOverridesTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ private static void testApp(String iKey) throws Exception {
7070
assertThat(rd.getSuccess()).isTrue();
7171

7272
assertThat(rdd.getType()).isEqualTo("Http");
73-
assertThat(rdd.getTarget()).isEqualTo("mock.codes");
74-
assertThat(rdd.getName()).isEqualTo("GET /200");
75-
assertThat(rdd.getData()).isEqualTo("https://mock.codes/200");
73+
assertThat(rdd.getTarget()).isEqualTo("host.testcontainers.internal:6060");
74+
assertThat(rdd.getName()).isEqualTo("GET /mock/200");
75+
assertThat(rdd.getData()).isEqualTo("http://host.testcontainers.internal:6060/mock/200");
7676
assertThat(rdd.getResultCode()).isEqualTo("200");
7777
assertThat(rdd.getSuccess()).isTrue();
7878

@@ -141,7 +141,8 @@ private static void validateMetricData(String type, MetricData metricData, Strin
141141
assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");
142142
assertThat(properties.get("dependency/resultCode")).isEqualTo(resultCode);
143143
assertThat(properties.get("Dependency.Success")).isEqualTo(expectedSuccess);
144-
assertThat(properties.get("dependency/target")).isEqualTo("mock.codes");
144+
assertThat(properties.get("dependency/target"))
145+
.isEqualTo("host.testcontainers.internal:6060");
145146
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
146147
} else {
147148
assertThat(properties).hasSize(7);

‎smoke-tests/apps/DetectUnexpectedOtelMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/DetectUnexpectedOtelMetricsServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
2828
return;
2929
}
3030
if (pathInfo.startsWith("/app")) {
31-
httpUrlConnection("https://mock.codes/200");
31+
httpUrlConnection("http://host.testcontainers.internal:6060/mock/200");
3232
logger.info("hello");
3333
return;
3434
}

‎smoke-tests/apps/HttpClients/src/main/java/com/microsoft/applicationinsights/smoketestapp/HttpClientServlet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ private void doGetInternal(HttpServletRequest req) throws Exception {
8585
}
8686

8787
if (executeGetUrl != null) {
88-
executeGetUrl.execute("https://mock.codes/200?q=spaces%20test");
88+
executeGetUrl.execute("http://host.testcontainers.internal:6060/mock/200?q=spaces%20test");
8989
try {
90-
executeGetUrl.execute("https://mock.codes/404");
90+
executeGetUrl.execute("http://host.testcontainers.internal:6060/mock/404");
9191
} catch (Exception e) {
9292
// HttpURLConnection throws exception on 404 and 500
9393
}
9494
try {
95-
executeGetUrl.execute("https://mock.codes/500");
95+
executeGetUrl.execute("http://host.testcontainers.internal:6060/mock/500");
9696
} catch (Exception e) {
9797
// HttpURLConnection throws exception on 404 and 500
9898
}

‎smoke-tests/apps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientTest.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ void testHttpUrlConnection() throws Exception {
6868
@TargetUri("/springWebClient")
6969
void testSpringWebClient() throws Exception {
7070
// TODO investigate why %2520 is captured instead of %20
71-
verify("https://mock.codes/200?q=spaces%2520test");
71+
verify("http://host.testcontainers.internal:6060/mock/200?q=spaces%2520test");
7272
}
7373

7474
private static void verify() throws Exception {
75-
verify("https://mock.codes/200?q=spaces%20test");
75+
verify("http://host.testcontainers.internal:6060/mock/200?q=spaces%20test");
7676
}
7777

7878
private static void verify(String successUrlWithQueryString) throws Exception {
@@ -84,30 +84,32 @@ private static void verify(String successUrlWithQueryString) throws Exception {
8484
// TODO (trask) add this check in all smoke tests?
8585
assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();
8686

87-
assertThat(telemetry.rdd1.getName()).isEqualTo("GET /200");
87+
assertThat(telemetry.rdd1.getName()).isEqualTo("GET /mock/200");
8888
assertThat(telemetry.rdd1.getData()).isEqualTo(successUrlWithQueryString);
8989
assertThat(telemetry.rdd1.getType()).isEqualTo("Http");
90-
assertThat(telemetry.rdd1.getTarget()).isEqualTo("mock.codes");
90+
assertThat(telemetry.rdd1.getTarget()).isEqualTo("host.testcontainers.internal:6060");
9191
assertThat(telemetry.rdd1.getResultCode()).isEqualTo("200");
9292
assertThat(telemetry.rdd1.getProperties())
9393
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
9494
assertThat(telemetry.rdd1.getSuccess()).isTrue();
9595
assertThat(telemetry.rddEnvelope1.getSampleRate()).isNull();
9696

97-
assertThat(telemetry.rdd2.getName()).isEqualTo("GET /404");
98-
assertThat(telemetry.rdd2.getData()).isEqualTo("https://mock.codes/404");
97+
assertThat(telemetry.rdd2.getName()).isEqualTo("GET /mock/404");
98+
assertThat(telemetry.rdd2.getData())
99+
.isEqualTo("http://host.testcontainers.internal:6060/mock/404");
99100
assertThat(telemetry.rdd2.getType()).isEqualTo("Http");
100-
assertThat(telemetry.rdd2.getTarget()).isEqualTo("mock.codes");
101+
assertThat(telemetry.rdd2.getTarget()).isEqualTo("host.testcontainers.internal:6060");
101102
assertThat(telemetry.rdd2.getResultCode()).isEqualTo("404");
102103
assertThat(telemetry.rdd2.getProperties())
103104
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
104105
assertThat(telemetry.rdd2.getSuccess()).isFalse();
105106
assertThat(telemetry.rddEnvelope2.getSampleRate()).isNull();
106107

107-
assertThat(telemetry.rdd3.getName()).isEqualTo("GET /500");
108-
assertThat(telemetry.rdd3.getData()).isEqualTo("https://mock.codes/500");
108+
assertThat(telemetry.rdd3.getName()).isEqualTo("GET /mock/500");
109+
assertThat(telemetry.rdd3.getData())
110+
.isEqualTo("http://host.testcontainers.internal:6060/mock/500");
109111
assertThat(telemetry.rdd3.getType()).isEqualTo("Http");
110-
assertThat(telemetry.rdd3.getTarget()).isEqualTo("mock.codes");
112+
assertThat(telemetry.rdd3.getTarget()).isEqualTo("host.testcontainers.internal:6060");
111113
assertThat(telemetry.rdd3.getResultCode()).isEqualTo("500");
112114
assertThat(telemetry.rdd3.getProperties())
113115
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));

‎smoke-tests/apps/HttpHeaders/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public String clientHeaders() throws IOException {
3434
}
3535

3636
private void callMockCodes200(boolean nope) throws IOException {
37-
URL obj = new URL("https://mock.codes/200");
37+
URL obj = new URL("http://host.testcontainers.internal:6060/mock/200");
3838

3939
HttpURLConnection connection = (HttpURLConnection) obj.openConnection();
4040
connection.setRequestProperty("abc-def", nope ? "nope" : "testing123");

‎smoke-tests/apps/HttpPreaggregatedMetrics/src/main/java/com/microsoft/applicationinsights/smoketestapp/HttpPreaggregatedMetricsServlet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
2727
if (!pathInfo.equals("/httpUrlConnection")) {
2828
throw new ServletException("Unexpected url: " + pathInfo);
2929
}
30-
httpUrlConnection("https://mock.codes/200?q=spaces%20test");
30+
httpUrlConnection("http://host.testcontainers.internal:6060/mock/200?q=spaces%20test");
3131
try {
32-
httpUrlConnection("https://mock.codes/404");
32+
httpUrlConnection("http://host.testcontainers.internal:6060/mock/404");
3333
} catch (Exception e) {
3434
// HttpURLConnection throws exception on 404 and 500
3535
}
3636
try {
37-
httpUrlConnection("https://mock.codes/500");
37+
httpUrlConnection("http://host.testcontainers.internal:6060/mock/500");
3838
} catch (Exception e) {
3939
// HttpURLConnection throws exception on 404 and 500
4040
}

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ void testHttpUrlConnectionAndSynthetic() throws Exception {
4242
}
4343

4444
private void testHttpUrlConnectionAndSynthetic(boolean synthetic) throws Exception {
45-
verifyHttpclientRequestsAndDependencies("https://mock.codes/200?q=spaces%20test");
45+
verifyHttpclientRequestsAndDependencies(
46+
"http://host.testcontainers.internal:6060/mock/200?q=spaces%20test");
4647

4748
List<Envelope> clientMetrics =
4849
testing.mockedIngestion.waitForStandardMetricItems("dependencies/duration", 3);
@@ -62,29 +63,31 @@ private static void verifyHttpclientRequestsAndDependencies(String successUrlWit
6263
assertThat(telemetry.rdd1.getData()).isEqualTo(successUrlWithQueryString);
6364
assertThat(telemetry.rd.getSuccess()).isTrue();
6465
assertThat(telemetry.rdEnvelope.getSampleRate()).isNull();
65-
assertThat(telemetry.rdd1.getName()).isEqualTo("GET /200");
66+
assertThat(telemetry.rdd1.getName()).isEqualTo("GET /mock/200");
6667
assertThat(telemetry.rdd1.getType()).isEqualTo("Http");
67-
assertThat(telemetry.rdd1.getTarget()).isEqualTo("mock.codes");
68+
assertThat(telemetry.rdd1.getTarget()).isEqualTo("host.testcontainers.internal:6060");
6869
assertThat(telemetry.rdd1.getResultCode()).isEqualTo("200");
6970
assertThat(telemetry.rdd1.getProperties())
7071
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
7172
assertThat(telemetry.rdd1.getSuccess()).isTrue();
7273
assertThat(telemetry.rddEnvelope1.getSampleRate()).isNull();
7374

74-
assertThat(telemetry.rdd2.getName()).isEqualTo("GET /404");
75-
assertThat(telemetry.rdd2.getData()).isEqualTo("https://mock.codes/404");
75+
assertThat(telemetry.rdd2.getName()).isEqualTo("GET /mock/404");
76+
assertThat(telemetry.rdd2.getData())
77+
.isEqualTo("http://host.testcontainers.internal:6060/mock/404");
7678
assertThat(telemetry.rdd2.getType()).isEqualTo("Http");
77-
assertThat(telemetry.rdd2.getTarget()).isEqualTo("mock.codes");
79+
assertThat(telemetry.rdd2.getTarget()).isEqualTo("host.testcontainers.internal:6060");
7880
assertThat(telemetry.rdd2.getResultCode()).isEqualTo("404");
7981
assertThat(telemetry.rdd2.getProperties())
8082
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
8183
assertThat(telemetry.rdd2.getSuccess()).isFalse();
8284
assertThat(telemetry.rddEnvelope2.getSampleRate()).isNull();
8385

84-
assertThat(telemetry.rdd3.getName()).isEqualTo("GET /500");
85-
assertThat(telemetry.rdd3.getData()).isEqualTo("https://mock.codes/500");
86+
assertThat(telemetry.rdd3.getName()).isEqualTo("GET /mock/500");
87+
assertThat(telemetry.rdd3.getData())
88+
.isEqualTo("http://host.testcontainers.internal:6060/mock/500");
8689
assertThat(telemetry.rdd3.getType()).isEqualTo("Http");
87-
assertThat(telemetry.rdd3.getTarget()).isEqualTo("mock.codes");
90+
assertThat(telemetry.rdd3.getTarget()).isEqualTo("host.testcontainers.internal:6060");
8891
assertThat(telemetry.rdd3.getResultCode()).isEqualTo("500");
8992
assertThat(telemetry.rdd3.getProperties())
9093
.containsExactly(entry("_MS.ProcessedByMetricExtractors", "True"));
@@ -171,7 +174,8 @@ private static void validateMetricData(
171174
assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");
172175
assertThat(properties.get("dependency/resultCode")).isEqualTo(resultCode);
173176
assertThat(properties.get("Dependency.Success")).isEqualTo(expectedSuccess);
174-
assertThat(properties.get("dependency/target")).isEqualTo("mock.codes");
177+
assertThat(properties.get("dependency/target"))
178+
.isEqualTo("host.testcontainers.internal:6060");
175179
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
176180
assertThat(properties.get("operation/synthetic")).isEqualTo("False");
177181
} else {

‎smoke-tests/apps/InstrumentationKeyOverrides/src/main/java/com/microsoft/applicationinsights/smoketestapp/InstrumentationKeyOverridesServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
2828
return;
2929
}
3030
if (pathInfo.startsWith("/app")) {
31-
httpUrlConnection("https://mock.codes/200");
31+
httpUrlConnection("http://host.testcontainers.internal:6060/mock/200");
3232
logger.info("hello");
3333
return;
3434
}

‎smoke-tests/apps/InstrumentationKeyOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/InstrumentationKeyOverridesTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ private static void testApp(String iKey) throws Exception {
6767
assertThat(rd.getSuccess()).isTrue();
6868

6969
assertThat(rdd.getType()).isEqualTo("Http");
70-
assertThat(rdd.getTarget()).isEqualTo("mock.codes");
71-
assertThat(rdd.getName()).isEqualTo("GET /200");
72-
assertThat(rdd.getData()).isEqualTo("https://mock.codes/200");
70+
assertThat(rdd.getTarget()).isEqualTo("host.testcontainers.internal:6060");
71+
assertThat(rdd.getName()).isEqualTo("GET /mock/200");
72+
assertThat(rdd.getData()).isEqualTo("http://host.testcontainers.internal:6060/mock/200");
7373
assertThat(rdd.getResultCode()).isEqualTo("200");
7474
assertThat(rdd.getSuccess()).isTrue();
7575

@@ -138,7 +138,8 @@ private static void validateMetricData(String type, MetricData metricData, Strin
138138
assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");
139139
assertThat(properties.get("dependency/resultCode")).isEqualTo(resultCode);
140140
assertThat(properties.get("Dependency.Success")).isEqualTo(expectedSuccess);
141-
assertThat(properties.get("dependency/target")).isEqualTo("mock.codes");
141+
assertThat(properties.get("dependency/target"))
142+
.isEqualTo("host.testcontainers.internal:6060");
142143
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
143144
} else {
144145
assertThat(properties).hasSize(7);

0 commit comments

Comments
 (0)