From 228475d33c1ce7ceb9a7e63cc01dc1939c95636a Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 27 Jan 2025 21:32:16 +0000 Subject: [PATCH] Widen check to cover bundled ACCP --- .../src/main/java/datadog/trace/bootstrap/Agent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java index 04361d159d6..89484b7bf18 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java @@ -1364,8 +1364,9 @@ private static boolean isIBMSASLInstalled() { private static boolean isACCPInstalled() { return ClassLoader.getSystemResource( - "com/amazon/corretto/crypto/provider/AmazonCorrettoCryptoProvider.class") - != null; + "com/amazon/corretto/crypto/provider/AmazonCorrettoCryptoProvider.class") + != null + || ClassLoader.getSystemResource("bundled/accp/BundledACCP.class") != null; } private static boolean isJFRSupported() {