Cleanups for smaps

DataDog · Jun 28, 2024 · b03e8a2 · b03e8a2
1 parent 7d99126
commit b03e8a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryEvent.java b/...openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryEvent.java
@@ -1,6 +1,5 @@
 package com.datadog.profiling.controller.openjdk.events;
 
-import com.datadog.profiling.controller.openjdk.OpenJdkController;
 import datadog.trace.bootstrap.instrumentation.jfr.JfrHelper;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.File;
@@ -36,7 +35,7 @@
 public class SmapEntryEvent extends Event {
   private static final AtomicBoolean registered = new AtomicBoolean(false);
   private static boolean annotatedMapsAvailable;
-  private static final Logger log = LoggerFactory.getLogger(OpenJdkController.class);
+  private static final Logger log = LoggerFactory.getLogger(SmapEntryEvent.class);
   private static final String VSYSCALL_START_ADDRESS = "ffffffffff600000";
   private static final Pattern SYSTEM_MAP_ENTRY_PATTERN =
       Pattern.compile(
@@ -241,6 +240,7 @@ public SmapEntryEvent(
     this.nmtCategory = nmtCategory;
   }
 
+  @SuppressForbidden
   private static HashMap<Long, String> getAnnotatedRegions() {
     if (annotatedMapsAvailable) {
       try {

diff --git a/...og/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/...og/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java
@@ -67,6 +67,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
               + "com.datadog.profiling.controller.openjdk.events.QueueTimeEvent:build_time,"
               + "com.datadog.profiling.controller.openjdk.events.TimelineEvent:build_time,"
               + "com.datadog.profiling.controller.openjdk.events.SmapEntryEvent:build_time,"
+              + "com.datadog.profiling.controller.openjdk.events.SmapEntryEvent$SmapParseErrorEvent:build_time,"
               + "datadog.trace.api.Config:rerun,"
               + "datadog.trace.api.Platform:rerun,"
               + "datadog.trace.api.Platform$Captured:build_time,"