Skip to content

Check Azure Spring Cloud before AKS in RP integration #4000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Check Azure Spring Cloud before AKS in RP integration #4000

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b9c7d2
Check Azure Spring Cloud before AKS in RP integration
jeanbisutti Jan 3, 2025
3f10359
Update agent/agent-tooling/src/main/java/com/microsoft/applicationins…
jeanbisutti Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .../java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,16 @@ 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"))) {
// 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"))) {
// 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
}
Expand Down
Loading