Skip to content

Commit 8c09716

Browse files
jbachorikclaude
jbachorik
and
claude
committed
Inline direct memory config check; drop DirectMemoryProfilingHelper
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent c7d9788 commit 8c09716

4 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package datadog.trace.instrumentation.directbytebuffer;
22

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
4+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED;
5+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_MEMORY_ENABLED;
6+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_MEMORY_ENABLED_DEFAULT;
47
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
58
import static net.bytebuddy.matcher.ElementMatchers.isStatic;
69
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -26,7 +29,10 @@ public boolean isEnabled() {
2629
ConfigProvider cp = ConfigProvider.getInstance();
2730
return JavaVirtualMachine.isJavaVersionAtLeast(11)
2831
&& super.isEnabled()
29-
&& DirectMemoryProfilingHelper.isEnabled(cp)
32+
&& cp.getBoolean(
33+
PROFILING_DIRECT_MEMORY_ENABLED,
34+
PROFILING_DIRECT_MEMORY_ENABLED_DEFAULT,
35+
PROFILING_DIRECT_ALLOCATION_ENABLED)
3036
&& Platform.hasJfr();
3137
}
3238

‎dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package datadog.trace.instrumentation.directbytebuffer;
22

3+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED;
4+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_MEMORY_ENABLED;
5+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_MEMORY_ENABLED_DEFAULT;
36
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
47
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
58
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -24,7 +27,10 @@ public boolean isEnabled() {
2427
ConfigProvider cp = ConfigProvider.getInstance();
2528
return JavaVirtualMachine.isJavaVersionAtLeast(11)
2629
&& super.isEnabled()
27-
&& DirectMemoryProfilingHelper.isEnabled(cp)
30+
&& cp.getBoolean(
31+
PROFILING_DIRECT_MEMORY_ENABLED,
32+
PROFILING_DIRECT_MEMORY_ENABLED_DEFAULT,
33+
PROFILING_DIRECT_ALLOCATION_ENABLED)
2834
&& Platform.hasJfr();
2935
}
3036

‎dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectMemoryProfilingHelper.java‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package datadog.trace.instrumentation.directbytebuffer;
22

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
4+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED;
5+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_MEMORY_ENABLED;
6+
import static datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_MEMORY_ENABLED_DEFAULT;
47
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
58
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
69
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -25,7 +28,10 @@ public boolean isEnabled() {
2528
ConfigProvider cp = ConfigProvider.getInstance();
2629
return JavaVirtualMachine.isJavaVersionAtLeast(11)
2730
&& super.isEnabled()
28-
&& DirectMemoryProfilingHelper.isEnabled(cp)
31+
&& cp.getBoolean(
32+
PROFILING_DIRECT_MEMORY_ENABLED,
33+
PROFILING_DIRECT_MEMORY_ENABLED_DEFAULT,
34+
PROFILING_DIRECT_ALLOCATION_ENABLED)
2935
&& Platform.hasJfr();
3036
}
3137

0 commit comments

Comments
 (0)