From 5a9529c8bcda706fa51b9306726fe778bde4d086 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 5 Feb 2025 10:53:45 -0500 Subject: [PATCH 1/2] Disable smap RSS parsing by default --- .../main/java/datadog/trace/api/config/ProfilingConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java index 21910db3ce5..451542b9daa 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java @@ -208,12 +208,12 @@ public final class ProfilingConfig { public static final String PROFILING_SMAP_COLLECTION_ENABLED = "profiling.smap.collection.enabled"; - public static final boolean PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT = true; + public static final boolean PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT = false; public static final String PROFILING_SMAP_AGGREGATION_ENABLED = "profiling.smap.aggregation.enabled"; - public static final boolean PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT = true; + public static final boolean PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT = false; public static final String PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS = "profiling.queueing.time.threshold.millis"; From a53514a155ecb3cee6534b634e5e78f9b480b4fe Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 5 Feb 2025 11:17:47 -0500 Subject: [PATCH 2/2] Reduce logging level for smap scraping --- .../src/main/java/datadog/trace/bootstrap/Agent.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 6376be9b81f..8b6005b2958 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 @@ -755,12 +755,13 @@ private static synchronized void registerSmapEntryEvent() { "com.datadog.profiling.controller.openjdk.events.SmapEntryFactory"); final Method registerMethod = smapFactoryClass.getMethod("registerEvents"); registerMethod.invoke(null); - } catch (final NoClassDefFoundError + } catch (final NoSuchMethodException + | NoClassDefFoundError | ClassNotFoundException - | UnsupportedClassVersionError ignored) { + | UnsupportedClassVersionError + | IllegalAccessException + | InvocationTargetException ignored) { log.debug("Smap entry scraping not supported"); - } catch (final Throwable ex) { - log.error("Unable to initialize smap entry scraping", ex); } }