Prevent NPE when thread is not set for event (#743)

* Prevent NPE when thread is not set for event * skip os thread when it is not known * add null checks
signalfx · Apr 20, 2022 · d1198c5 · d1198c5
1 parent d497a45
commit d1198c5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/...a/com/splunk/opentelemetry/profiler/allocation/exporter/PprofAllocationEventExporter.java b/...a/com/splunk/opentelemetry/profiler/allocation/exporter/PprofAllocationEventExporter.java
@@ -90,11 +90,13 @@ public void export(RecordedEvent event, AllocationEventSampler sampler, SpanCont
     pprof.addLabel(sample, SOURCE_EVENT_TIME, time.toEpochMilli());
 
     RecordedThread thread = event.getThread();
-    if (thread.getJavaThreadId() != -1) {
-      pprof.addLabel(sample, THREAD_ID, thread.getJavaThreadId());
-      pprof.addLabel(sample, THREAD_NAME, thread.getJavaName());
+    if (thread != null) {
+      if (thread.getJavaThreadId() != -1) {
+        pprof.addLabel(sample, THREAD_ID, thread.getJavaThreadId());
+        pprof.addLabel(sample, THREAD_NAME, thread.getJavaName());
+      }
+      pprof.addLabel(sample, THREAD_OS_ID, thread.getOSThreadId());
     }
-    pprof.addLabel(sample, THREAD_OS_ID, thread.getOSThreadId());
     pprof.addLabel(sample, THREAD_STATE, "RUNNABLE");
 
     if (spanContext != null && spanContext.isValid()) {

diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/context/SpanContextualizer.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/context/SpanContextualizer.java
@@ -44,6 +44,10 @@ public class SpanContextualizer {
    * ContextAttached events.
    */
   public void updateContext(RecordedEvent event) {
+    // jdk 17 doesn't report thread for events that happened on a thread that has terminated by now
+    if (event.getThread() == null) {
+      return;
+    }
     String traceId = event.getString("traceId");
     String spanId = event.getString("spanId");
     long javaThreadId = event.getThread().getJavaThreadId();

diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/exporter/PprofCpuEventExporter.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/exporter/PprofCpuEventExporter.java
@@ -66,7 +66,9 @@ public void export(StackToSpanLinkage stackToSpanLinkage) {
       pprof.addLabel(sample, THREAD_ID, stackTrace.getThreadId());
       pprof.addLabel(sample, THREAD_NAME, stackTrace.getThreadName());
     }
-    pprof.addLabel(sample, THREAD_OS_ID, stackTrace.getOsThreadId());
+    if (stackTrace.getOsThreadId() != -1) {
+      pprof.addLabel(sample, THREAD_OS_ID, stackTrace.getOsThreadId());
+    }
     pprof.addLabel(sample, THREAD_STATE, stackTrace.getThreadState());
 
     for (StackTraceParser.StackTraceLine stl : stackTrace.getStackTraceLines()) {

diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/pprof/Pprof.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/pprof/Pprof.java
@@ -56,6 +56,9 @@ public void addLabel(Sample.Builder sample, AttributeKey<String> key, String val
   }
 
   public void addLabel(Sample.Builder sample, String name, String value) {
+    if (value == null) {
+      return;
+    }
     addLabel(sample, name, label -> label.setStr(stringTable.get(value)));
   }