From 2b9c7d23b4e0a0b48308df972c2eda867d618cc7 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Fri, 3 Jan 2025 16:22:28 +0100 Subject: [PATCH 1/2] Check Azure Spring Cloud before AKS in RP integration --- .../agent/internal/diagnostics/DiagnosticsHelper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java index 69051daf403..bfc475179ac 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java @@ -47,15 +47,15 @@ public static void initRpIntegration(Path agentPath) { if (RpAttachType.INTEGRATED_AUTO.equals(RpAttachType.getRpAttachType())) { appSvcRpIntegratedAuto = true; } + } else if (!Strings.isNullOrEmpty( + System.getenv("APPLICATIONINSIGHTS_SPRINGCLOUD_SERVICE_ID"))) { + PropertyHelper.setRpIntegrationChar('s'); + setRpAttachType(agentPath, "springcloud.codeless"); } else if (!Strings.isNullOrEmpty(System.getenv("AKS_ARM_NAMESPACE_ID"))) { // AKS_ARM_NAMESPACE_ID is an env var available in AKS only and it's also used as the AKS // attach rate numerator PropertyHelper.setRpIntegrationChar('k'); setRpAttachType(agentPath, "aks.codeless"); - } else if (!Strings.isNullOrEmpty( - System.getenv("APPLICATIONINSIGHTS_SPRINGCLOUD_SERVICE_ID"))) { - PropertyHelper.setRpIntegrationChar('s'); - setRpAttachType(agentPath, "springcloud.codeless"); } else { RpAttachType.setRpAttachType(RpAttachType.STANDALONE_AUTO); // default } From 3f103597f5123b37f91b0f045c5d63c9838d820d Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Tue, 7 Jan 2025 11:13:02 +0100 Subject: [PATCH 2/2] Update agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java Co-authored-by: Trask Stalnaker --- .../agent/internal/diagnostics/DiagnosticsHelper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java index bfc475179ac..0864f55008d 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java @@ -49,6 +49,7 @@ public static void initRpIntegration(Path agentPath) { } } else if (!Strings.isNullOrEmpty( System.getenv("APPLICATIONINSIGHTS_SPRINGCLOUD_SERVICE_ID"))) { + // Spring Cloud needs to be checked before AKS since it runs on AKS PropertyHelper.setRpIntegrationChar('s'); setRpAttachType(agentPath, "springcloud.codeless"); } else if (!Strings.isNullOrEmpty(System.getenv("AKS_ARM_NAMESPACE_ID"))) {