Skip to content

Commit 8f9452b

Browse files
harsimargithub-actions[bot]
authored andcommitted
still need to test these changes & build upon update sdk pr
1 parent 1ea84d8 commit 8f9452b

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

agent/agent-tooling/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation(project(":agent:agent-profiler:agent-diagnostics"))
2222
implementation(project(":etw:java"))
2323

24-
implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.3.0")
24+
implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.4.0-beta.1")
2525
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
2626
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
2727
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9")

agent/agent-tooling/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.16.0=runtimeClasspath
99
com.azure:azure-core:1.56.0=runtimeClasspath
1010
com.azure:azure-identity:1.17.0=runtimeClasspath
1111
com.azure:azure-json:1.5.0=runtimeClasspath
12-
com.azure:azure-monitor-opentelemetry-autoconfigure:1.3.0=runtimeClasspath
12+
com.azure:azure-monitor-opentelemetry-autoconfigure:1.4.0-beta.1=runtimeClasspath
1313
com.azure:azure-sdk-bom:1.2.38=runtimeClasspath
1414
com.azure:azure-storage-blob:12.31.2=runtimeClasspath
1515
com.azure:azure-storage-common:12.30.2=runtimeClasspath

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ public class SecondEntryPoint
9191
new ClientLogger("com.microsoft.applicationinsights.agent");
9292
private static File tempDir;
9393

94+
private static final String METRICS_TO_LOG_ANALYTICS_ENABLED =
95+
"APPLICATIONINSIGHTS_METRICS_TO_LOGANALYTICS_ENABLED";
96+
9497
@Nullable private static AzureMonitorLogFilteringProcessor logFilteringProcessor;
9598

9699
static File getTempDir() {
@@ -372,10 +375,13 @@ private static MetricExporter buildMetricExporter(
372375
String otelMetricsExporter = configProperties.getString("otel.metrics.exporter");
373376
boolean otlpEnabled = (otelMetricsExporter != null && !otelMetricsExporter.isEmpty()) &&
374377
(otelMetricsEndpoint != null && !otelMetricsEndpoint.isEmpty());
378+
379+
String metricsToLAEnvVar = System.getenv(METRICS_TO_LOG_ANALYTICS_ENABLED);
380+
boolean metricsToLAEnabled = metricsToLAEnvVar == null || "true".equalsIgnoreCase(metricsToLAEnvVar);
375381

376382
MetricDataMapper mapper =
377383
new MetricDataMapper(
378-
telemetryClient::populateDefaults, configuration.preview.captureHttpServer4xxAsError, otlpEnabled);
384+
telemetryClient::populateDefaults, configuration.preview.captureHttpServer4xxAsError, otlpEnabled, metricsToLAEnabled);
379385
return new AgentMetricExporter(
380386
metricFilters, mapper, telemetryClient.getMetricsBatchItemProcessor());
381387
}

0 commit comments

Comments
 (0)