Skip to content

Disable smap RSS parsing by default #8342

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
Feb 6, 2025
+7 −6
Merged

Disable smap RSS parsing by default #8342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a9529c
Disable smap RSS parsing by default
Feb 5, 2025
a53514a
Reduce logging level for smap scraping
Feb 5, 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 dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading