Skip to content

Commit 5d55461

Browse files
harsimargithub-actions[bot]
authored andcommitted
fixing some existing tests (not done yet), merge in sdk update change for testing
1 parent 8f9452b commit 5d55461

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ public class SecondEntryPoint
9090
private static final ClientLogger startupLogger =
9191
new ClientLogger("com.microsoft.applicationinsights.agent");
9292
private static File tempDir;
93-
94-
private static final String METRICS_TO_LOG_ANALYTICS_ENABLED =
95-
"APPLICATIONINSIGHTS_METRICS_TO_LOGANALYTICS_ENABLED";
93+
private static final String SENT_TO_AMW = "SENT_TO_AMW";
9694

9795
@Nullable private static AzureMonitorLogFilteringProcessor logFilteringProcessor;
9896

@@ -376,12 +374,12 @@ private static MetricExporter buildMetricExporter(
376374
boolean otlpEnabled = (otelMetricsExporter != null && !otelMetricsExporter.isEmpty()) &&
377375
(otelMetricsEndpoint != null && !otelMetricsEndpoint.isEmpty());
378376

379-
String metricsToLAEnvVar = System.getenv(METRICS_TO_LOG_ANALYTICS_ENABLED);
380-
boolean metricsToLAEnabled = metricsToLAEnvVar == null || "true".equalsIgnoreCase(metricsToLAEnvVar);
381-
377+
// Set system property that MetricDataMapper can read
378+
System.setProperty(SENT_TO_AMW, Boolean.toString(otlpEnabled));
379+
382380
MetricDataMapper mapper =
383381
new MetricDataMapper(
384-
telemetryClient::populateDefaults, configuration.preview.captureHttpServer4xxAsError, otlpEnabled, metricsToLAEnabled);
382+
telemetryClient::populateDefaults, configuration.preview.captureHttpServer4xxAsError);
385383
return new AgentMetricExporter(
386384
metricFilters, mapper, telemetryClient.getMetricsBatchItemProcessor());
387385
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name=azure-monitor-opentelemetry-autoconfigure
2+
version=1.4.0-beta.1

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private static void validateMetricData(
175175
String expectedSuccess = Integer.parseInt(resultCode) < 400 ? "True" : "False";
176176
Map<String, String> properties = metricData.getProperties();
177177
if ("client".equals(type)) {
178-
assertThat(properties).hasSize(9);
178+
assertThat(properties).hasSize(10);
179179
assertThat(properties.get("_MS.MetricId")).isEqualTo("dependencies/duration");
180180
assertThat(properties.get("dependency/resultCode")).isEqualTo(resultCode);
181181
assertThat(properties.get("Dependency.Success")).isEqualTo(expectedSuccess);
@@ -184,7 +184,7 @@ private static void validateMetricData(
184184
assertThat(properties.get("Dependency.Type")).isEqualTo("Http");
185185
assertThat(properties.get("operation/synthetic")).isEqualTo("False");
186186
} else {
187-
assertThat(properties).hasSize(7);
187+
assertThat(properties).hasSize(8);
188188
assertThat(properties.get("_MS.MetricId")).isEqualTo("requests/duration");
189189
assertThat(properties.get("request/resultCode")).isEqualTo(resultCode);
190190
assertThat(properties.get("Request.Success")).isEqualTo(expectedSuccess);
@@ -193,6 +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");
196197
}
197198

198199
@Environment(TOMCAT_8_JAVA_8)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +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");
192193

193194
// validate tags
194195
Map<String, String> tags2 = envelope2.getTags();
@@ -211,6 +212,7 @@ private void validateCounterMetric(String name) throws Exception {
211212
assertThat(properties2).containsEntry("tag2", "def");
212213
assertThat(properties2).containsEntry("name", "apple");
213214
assertThat(properties2).containsEntry("color", "red");
215+
assertThat(properties2).containsEntry("_MS.SentToAMW", "false");
214216

215217
// validate tags
216218
Map<String, String> tags3 = envelope3.getTags();
@@ -233,6 +235,7 @@ private void validateCounterMetric(String name) throws Exception {
233235
assertThat(properties3).containsEntry("tag2", "def");
234236
assertThat(properties3).containsEntry("name", "lemon");
235237
assertThat(properties3).containsEntry("color", "yellow");
238+
assertThat(properties3).containsEntry("_MS.SentToAMW", "false");
236239
}
237240

238241
@Environment(TOMCAT_8_JAVA_8)

0 commit comments

Comments
 (0)