Skip to content

Commit 97961ff

Browse files
authored
Disable smap RSS parsing by default (#8342)
* Disable smap RSS parsing by default * Reduce logging level for smap scraping
1 parent ee5772f commit 97961ff

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -755,12 +755,13 @@ private static synchronized void registerSmapEntryEvent() {
755755
"com.datadog.profiling.controller.openjdk.events.SmapEntryFactory");
756756
final Method registerMethod = smapFactoryClass.getMethod("registerEvents");
757757
registerMethod.invoke(null);
758-
} catch (final NoClassDefFoundError
758+
} catch (final NoSuchMethodException
759+
| NoClassDefFoundError
759760
| ClassNotFoundException
760-
| UnsupportedClassVersionError ignored) {
761+
| UnsupportedClassVersionError
762+
| IllegalAccessException
763+
| InvocationTargetException ignored) {
761764
log.debug("Smap entry scraping not supported");
762-
} catch (final Throwable ex) {
763-
log.error("Unable to initialize smap entry scraping", ex);
764765
}
765766
}
766767

dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ public final class ProfilingConfig {
208208
public static final String PROFILING_SMAP_COLLECTION_ENABLED =
209209
"profiling.smap.collection.enabled";
210210

211-
public static final boolean PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT = true;
211+
public static final boolean PROFILING_SMAP_COLLECTION_ENABLED_DEFAULT = false;
212212

213213
public static final String PROFILING_SMAP_AGGREGATION_ENABLED =
214214
"profiling.smap.aggregation.enabled";
215215

216-
public static final boolean PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT = true;
216+
public static final boolean PROFILING_SMAP_AGGREGATION_ENABLED_DEFAULT = false;
217217

218218
public static final String PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS =
219219
"profiling.queueing.time.threshold.millis";

0 commit comments

Comments
 (0)