Skip to content

Commit 732a57f

Browse files
trasktrask
committed
Fix
1 parent d59670c commit 732a57f

File tree

11 files changed

+27
-19
lines changed

11 files changed

+27
-19
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,20 @@ private static void validateMetricData(String type, MetricData metricData, Strin
141141
Map<String, String> properties = metricData.getProperties();
142142
String expectedSuccess = "200".equals(resultCode) ? "True" : "False";
143143
if ("client".equals(type)) {
144-
assertThat(properties).hasSize(9);
144+
assertThat(properties).hasSize(10);
145145
assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");
146146
assertThat(properties.get("dependency/resultCode")).isEqualTo(resultCode);
147147
assertThat(properties.get("Dependency.Success")).isEqualTo(expectedSuccess);
148148
assertThat(properties.get("dependency/target"))
149149
.isEqualTo("host.testcontainers.internal:6060");
150150
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
151+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
151152
} else {
152-
assertThat(properties).hasSize(7);
153+
assertThat(properties).hasSize(8);
153154
assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
154155
assertThat(properties.get("request/resultCode")).isEqualTo(resultCode);
155156
assertThat(properties.get("Request.Success")).isEqualTo(expectedSuccess);
157+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
156158
}
157159
assertThat(properties.get("operation/synthetic")).isEqualTo("False");
158160
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private static void validateMetricData(
193193
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
194194
assertThat(properties.get("cloud/roleName")).isEqualTo("testrolename");
195195
assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
196-
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("false");
196+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
197197
}
198198

199199
@Environment(TOMCAT_8_JAVA_8)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static void validateMetricData(MetricData metricData) {
8888
List<DataPoint> dataPoints = metricData.getMetrics();
8989
assertThat(dataPoints).hasSize(1);
9090

91-
// Verify properties - specifically that _MS.SentToAMW is true
91+
// Verify properties - specifically that _MS.SentToAMW is True
9292
Map<String, String> properties = metricData.getProperties();
9393
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("True");
9494
}

‎smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ void doMostBasicTest() throws Exception {
5555
assertThat(dataPoint.getCount()).isEqualTo(1);
5656

5757
Map<String, String> properties = metricData.getProperties();
58-
assertThat(properties).hasSize(7);
58+
assertThat(properties).hasSize(8);
5959
assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
6060
assertThat(properties.get("request/resultCode")).isEqualTo("400");
6161
assertThat(properties.get("Request.Success")).isEqualTo("False");
6262
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
6363
assertThat(properties.get("cloud/roleName")).isEqualTo("testrolename");
6464
assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
65+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
6566
}
6667

6768
@Environment(TOMCAT_8_JAVA_8)

‎smoke-tests/apps/HttpServer4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ void doMostBasicTest() throws Exception {
5555
assertThat(dataPoint.getCount()).isEqualTo(1);
5656

5757
Map<String, String> properties = metricData.getProperties();
58-
assertThat(properties).hasSize(7);
58+
assertThat(properties).hasSize(8);
5959
assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
6060
assertThat(properties.get("request/resultCode")).isEqualTo("400");
6161
assertThat(properties.get("Request.Success")).isEqualTo("True");
6262
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
6363
assertThat(properties.get("cloud/roleName")).isEqualTo("testrolename");
6464
assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
65+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
6566
}
6667

6768
@Environment(TOMCAT_8_JAVA_8)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ private static void validateMetricData(String type, MetricData metricData, Strin
134134
Map<String, String> properties = metricData.getProperties();
135135
String expectedSuccess = "200".equals(resultCode) ? "True" : "False";
136136
if ("client".equals(type)) {
137-
assertThat(properties).hasSize(9);
137+
assertThat(properties).hasSize(10);
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);
141141
assertThat(properties.get("dependency/target"))
142142
.isEqualTo("host.testcontainers.internal:6060");
143143
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
144144
} else {
145-
assertThat(properties).hasSize(7);
145+
assertThat(properties).hasSize(8);
146146
assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
147147
assertThat(properties.get("request/resultCode")).isEqualTo(resultCode);
148148
assertThat(properties.get("Request.Success")).isEqualTo(expectedSuccess);
@@ -151,5 +151,6 @@ private static void validateMetricData(String type, MetricData metricData, Strin
151151
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
152152
assertThat(properties.get("cloud/roleName")).isEqualTo("testrolename");
153153
assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
154+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
154155
}
155156
}

‎smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ private void validateCounterMetric(String name) throws Exception {
189189
assertThat(properties1).containsEntry("tag2", "def");
190190
assertThat(properties1).containsEntry("name", "apple");
191191
assertThat(properties1).containsEntry("color", "green");
192-
assertThat(properties1).containsEntry("_MS.SentToAMW", "false");
192+
assertThat(properties1).containsEntry("_MS.SentToAMW", "False");
193193

194194
// validate tags
195195
Map<String, String> tags2 = envelope2.getTags();
@@ -212,7 +212,7 @@ private void validateCounterMetric(String name) throws Exception {
212212
assertThat(properties2).containsEntry("tag2", "def");
213213
assertThat(properties2).containsEntry("name", "apple");
214214
assertThat(properties2).containsEntry("color", "red");
215-
assertThat(properties2).containsEntry("_MS.SentToAMW", "false");
215+
assertThat(properties2).containsEntry("_MS.SentToAMW", "False");
216216

217217
// validate tags
218218
Map<String, String> tags3 = envelope3.getTags();
@@ -235,7 +235,7 @@ private void validateCounterMetric(String name) throws Exception {
235235
assertThat(properties3).containsEntry("tag2", "def");
236236
assertThat(properties3).containsEntry("name", "lemon");
237237
assertThat(properties3).containsEntry("color", "yellow");
238-
assertThat(properties3).containsEntry("_MS.SentToAMW", "false");
238+
assertThat(properties3).containsEntry("_MS.SentToAMW", "False");
239239
}
240240

241241
@Environment(TOMCAT_8_JAVA_8)

‎smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void validateCounterMetric(String name) throws Exception {
9595
assertThat(properties1).containsEntry("tag2", "def");
9696
assertThat(properties1).containsEntry("name", "apple");
9797
assertThat(properties1).containsEntry("color", "green");
98-
assertThat(properties1).containsEntry("_MS.SentToAMW", "true");
98+
assertThat(properties1).containsEntry("_MS.SentToAMW", "True");
9999

100100
// validate tags
101101
Map<String, String> tags2 = envelope2.getTags();
@@ -118,7 +118,7 @@ private void validateCounterMetric(String name) throws Exception {
118118
assertThat(properties2).containsEntry("tag2", "def");
119119
assertThat(properties2).containsEntry("name", "apple");
120120
assertThat(properties2).containsEntry("color", "red");
121-
assertThat(properties2).containsEntry("_MS.SentToAMW", "true");
121+
assertThat(properties2).containsEntry("_MS.SentToAMW", "True");
122122

123123
// validate tags
124124
Map<String, String> tags3 = envelope3.getTags();
@@ -141,7 +141,7 @@ private void validateCounterMetric(String name) throws Exception {
141141
assertThat(properties3).containsEntry("tag2", "def");
142142
assertThat(properties3).containsEntry("name", "lemon");
143143
assertThat(properties3).containsEntry("color", "yellow");
144-
assertThat(properties3).containsEntry("_MS.SentToAMW", "true");
144+
assertThat(properties3).containsEntry("_MS.SentToAMW", "True");
145145
}
146146

147147
private void validateOtlpMetricsReceived(String name) throws Exception {

‎smoke-tests/apps/PreAggMetricsWithRoleNameOverridesAndSampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PreAggMetricsWithRoleNameOverridesAndSamplingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private static void validateMetricData(
188188
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
189189
assertThat(properties.get("cloud/roleName")).isEqualTo(roleName);
190190
assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
191-
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("false");
191+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
192192
}
193193

194194
@Environment(TOMCAT_8_JAVA_8)

‎smoke-tests/apps/RoleNameOverrides/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/RoleNameOverridesTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ private static void validateMetricData(
139139
Map<String, String> properties = metricData.getProperties();
140140
String expectedSuccess = "200".equals(resultCode) ? "True" : "False";
141141
if ("client".equals(type)) {
142-
assertThat(properties).hasSize(9);
142+
assertThat(properties).hasSize(10);
143143
assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");
144144
assertThat(properties.get("dependency/resultCode")).isEqualTo(resultCode);
145145
assertThat(properties.get("Dependency.Success")).isEqualTo(expectedSuccess);
146146
assertThat(properties.get("dependency/target"))
147147
.isEqualTo("host.testcontainers.internal:6060");
148148
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
149149
} else {
150-
assertThat(properties).hasSize(7);
150+
assertThat(properties).hasSize(8);
151151
assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
152152
assertThat(properties.get("request/resultCode")).isEqualTo(resultCode);
153153
assertThat(properties.get("Request.Success")).isEqualTo(expectedSuccess);
@@ -156,6 +156,7 @@ private static void validateMetricData(
156156
assertThat(properties.get("cloud/roleInstance")).isEqualTo("testroleinstance");
157157
assertThat(properties.get("cloud/roleName")).isEqualTo(roleName);
158158
assertThat(properties.get("_MS.IsAutocollected")).isEqualTo("True");
159+
assertThat(properties.get("_MS.SentToAMW")).isEqualTo("False");
159160
}
160161

161162
@Environment(TOMCAT_8_JAVA_8)

0 commit comments

Comments
 (0)