Skip to content

Commit 2eddb77

Browse files
rkennkedevflow.devflow-routing-intake
andauthored
Drop stale ddprof ThreadContext/BufferWriter* native-image references (#12100)
Drop stale ddprof ThreadContext/BufferWriter* native-image references java-profiler's Phase 3 DBB-context removal (DataDog/java-profiler#696) deletes ThreadContext, BufferWriter, BufferWriter8, and BufferWriter9. The GraalVM native-image class-initialization config and reflection config here still name them; a native-image build against the next ddprof release fails resolving those classes. Drop the now-nonexistent entries ahead of the bump. Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 1d6abf8 commit 2eddb77

2 files changed

Lines changed: 0 additions & 16 deletions

File tree

dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,5 @@
206206
"fields": [
207207
{"name": "consumerIndex", "allowUnsafeAccess": true}
208208
]
209-
},
210-
{
211-
"name": "com.datadoghq.profiler.BufferWriter8",
212-
"methods": [
213-
{"name": "<init>", "parameterTypes": []}
214-
]
215-
},
216-
{
217-
"name": "com.datadoghq.profiler.BufferWriter9",
218-
"methods": [
219-
{"name": "<init>", "parameterTypes": []}
220-
]
221209
}
222210
]

dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
6565
+ "com.datadog.profiling.controller.openjdk.events.QueueTimeEvent:build_time,"
6666
+ "com.datadog.profiling.controller.openjdk.events.TimelineEvent:build_time,"
6767
+ "com.datadog.profiling.controller.openjdk.events.SmapEntryEvent:build_time,"
68-
+ "com.datadoghq.profiler.ThreadContext:run_time,"
69-
+ "com.datadoghq.profiler.BufferWriter:run_time,"
70-
+ "com.datadoghq.profiler.BufferWriter8:run_time,"
71-
+ "com.datadoghq.profiler.BufferWriter9:run_time,"
7268
+ "datadog.context.ContextKey:build_time,"
7369
+ "datadog.context.ContextProviders$ProvidedManager:build_time,"
7470
+ "datadog.environment.JavaVirtualMachine:rerun,"

0 commit comments

Comments
 (0)