From b10215c08b318197381ea68da94bbd651416c55e Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Wed, 13 Sep 2023 11:03:11 -0700 Subject: [PATCH 1/3] Fix config is not load in manual rp attach scenario --- .../agent/internal/configuration/ConfigurationBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index 1bad8031e2c..832e7d7b7b1 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -3,6 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.configuration; +import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.RpAttachType; import com.azure.monitor.opentelemetry.exporter.implementation.utils.HostName; import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; import com.fasterxml.jackson.core.JsonParseException; @@ -478,7 +479,9 @@ private static Configuration loadConfigurationFile(Path agentJarPath) { return getConfiguration(runtimeAttachedConfigurationContent, JsonOrigin.RUNTIME_ATTACHED); } - if (SdkVersionPrefixHolder.isRpIntegration()) { + // any manual RP integration will support loading user's applcationinsights.json + if (SdkVersionPrefixHolder.isRpIntegration() + && RpAttachType.getRpAttachType() != RpAttachType.MANUAL) { // users do not have write access to agent directory in rp integrations // and rp integrations should not use applicationinsights.json because that makes it difficult // to merge rp intent and user intent From c6e9409d04daac6ac88f7b2898810f23d129c153 Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Wed, 13 Sep 2023 14:11:50 -0700 Subject: [PATCH 2/3] Comment --- .../agent/internal/configuration/ConfigurationBuilder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index 832e7d7b7b1..61ef29353e1 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -480,8 +480,7 @@ private static Configuration loadConfigurationFile(Path agentJarPath) { } // any manual RP integration will support loading user's applcationinsights.json - if (SdkVersionPrefixHolder.isRpIntegration() - && RpAttachType.getRpAttachType() != RpAttachType.MANUAL) { + if (RpAttachType.getRpAttachType() == RpAttachType.INTEGRATED_AUTO) { // users do not have write access to agent directory in rp integrations // and rp integrations should not use applicationinsights.json because that makes it difficult // to merge rp intent and user intent From 6b68e5ba49694e8e101073deef12f339ce043266 Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Thu, 14 Sep 2023 10:12:27 -0700 Subject: [PATCH 3/3] Comment --- .../agent/internal/configuration/ConfigurationBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index 61ef29353e1..aeb6fae6f47 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -479,7 +479,7 @@ private static Configuration loadConfigurationFile(Path agentJarPath) { return getConfiguration(runtimeAttachedConfigurationContent, JsonOrigin.RUNTIME_ATTACHED); } - // any manual RP integration will support loading user's applcationinsights.json + // only RP auto integrations do not support loading applicationinsights.json if (RpAttachType.getRpAttachType() == RpAttachType.INTEGRATED_AUTO) { // users do not have write access to agent directory in rp integrations // and rp integrations should not use applicationinsights.json because that makes it difficult