diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java index d9099edc741..a125b851e2e 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java @@ -160,6 +160,10 @@ public static boolean isSafe(Collection collection) { // All Collection implementations from JDK base module are considered as safe return true; } + if (className.startsWith("com.google.protobuf.")) { + // All Collection implementations from Google ProtoBuf are considered as safe + return true; + } return false; } @@ -170,6 +174,10 @@ public static boolean isSafe(Map map) { // All Map implementations from JDK base module are considered as safe return true; } + if (className.startsWith("com.google.protobuf.")) { + // All Map implementations from Google ProtoBuf are considered as safe + return true; + } return false; }