Skip to content
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

Jump to bottom

disable Datadog profiler by default when ZGC is active #4712

Merged
merged 1 commit into from
Feb 10, 2023
Merged

disable Datadog profiler by default when ZGC is active #4712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions internal-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ minimumInstructionCoverage = 0.8
excludedClassesCoverage += [
"datadog.trace.api.EndpointTracker",
"datadog.trace.api.Platform",
"datadog.trace.api.Platform.GC",
"datadog.trace.api.StatsDClient",
"datadog.trace.api.NoOpStatsDClient",
"datadog.trace.api.TraceSegment.NoOp",
Expand Down
11 changes: 7 additions & 4 deletions internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
import static datadog.trace.api.DDTags.RUNTIME_VERSION_TAG;
import static datadog.trace.api.DDTags.SERVICE;
import static datadog.trace.api.DDTags.SERVICE_TAG;
import static datadog.trace.api.Platform.GC.Z;
import static datadog.trace.api.config.AppSecConfig.APPSEC_HTTP_BLOCKED_TEMPLATE_HTML;
import static datadog.trace.api.config.AppSecConfig.APPSEC_HTTP_BLOCKED_TEMPLATE_JSON;
import static datadog.trace.api.config.AppSecConfig.APPSEC_IP_ADDR_HEADER;
Expand Down Expand Up @@ -1822,10 +1823,12 @@ public boolean isDatadogProfilerEnabled() {
public static boolean isDatadogProfilerSafeInCurrentEnvironment() {
// don't want to put this logic (which will evolve) in the public ProfilingConfig, and can't
// access Platform there
return Platform.isJ9()
|| Platform.isJavaVersionAtLeast(17, 0, 5)
|| (Platform.isJavaVersion(11) && Platform.isJavaVersionAtLeast(11, 0, 17))
|| (Platform.isJavaVersion(8) && Platform.isJavaVersionAtLeast(8, 0, 352));
// we encountered AsyncGetCallTrace bugs when ZGC is enabled
return Platform.activeGarbageCollector() != Z
&& (Platform.isJ9()
|| Platform.isJavaVersionAtLeast(17, 0, 5)
|| (Platform.isJavaVersion(11) && Platform.isJavaVersionAtLeast(11, 0, 17))
|| (Platform.isJavaVersion(8) && Platform.isJavaVersionAtLeast(8, 0, 352)));
}

public boolean isCrashTrackingAgentless() {
Expand Down
38 changes: 38 additions & 0 deletions internal-api/src/main/java/datadog/trace/api/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,55 @@
package datadog.trace.api;

import datadog.trace.util.Strings;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;

public final class Platform {

public enum GC {
SERIAL("marksweep"),
PARALLEL("ps"),
CMS("concurrentmarksweep"),
G1("g1"),
SHENANDOAH("shenandoah"),
Z("z"),
UNKNOWN("");

private final String identifierPrefix;

GC(String identifierPrefix) {
this.identifierPrefix = identifierPrefix;
}

static GC current() {
for (GarbageCollectorMXBean mxBean : ManagementFactory.getGarbageCollectorMXBeans()) {
if (mxBean.isValid()) {
String name = mxBean.getName().toLowerCase();
for (GC gc : GC.values()) {
if (gc != UNKNOWN && name.startsWith(gc.identifierPrefix)) {
return gc;
}
}
}
}
return UNKNOWN;
}
}

private static final Version JAVA_VERSION = parseJavaVersion(System.getProperty("java.version"));
private static final JvmRuntime RUNTIME = new JvmRuntime();

private static final GC GARBAGE_COLLECTOR = GC.current();

private static final boolean HAS_JFR = checkForJfr();
private static final boolean IS_NATIVE_IMAGE_BUILDER = checkForNativeImageBuilder();

public static GC activeGarbageCollector() {
return GARBAGE_COLLECTOR;
}

public static boolean hasJfr() {
return HAS_JFR;
}
Expand Down