Avoid null store put on Ignite instrumentation

amarziali · amarziali · commit 5b77c73366d6 · 2026-01-06T10:17:00.000+01:00
diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteInstrumentation.java
@@ -78,8 +78,9 @@ public static void stopSpan(
         @Advice.This Ignite that,
         @Advice.Thrown final Throwable throwable,
         @Advice.Return final IgniteCache<?, ?> cache) {
-
-      InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+      if (cache != null) {
+        InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+      }
     }
   }
 
@@ -91,8 +92,10 @@ public static void stopSpan(
         @Advice.Thrown final Throwable throwable,
         @Advice.Return final Collection<IgniteCache<?, ?>> caches) {
 
-      for (IgniteCache<?, ?> cache : caches) {
-        InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+      if (caches != null) {
+        for (IgniteCache<?, ?> cache : caches) {
+          InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);
+        }
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,9 @@ public static void stopSpan(`
`78`	`78`	`@Advice.This Ignite that,`
`79`	`79`	`@Advice.Thrown final Throwable throwable,`
`80`	`80`	`@Advice.Return final IgniteCache<?, ?> cache) {`
`81`		`-`
`82`		`- InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);`
	`81`	`+ if (cache != null) {`
	`82`	`+ InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);`
	`83`	`+ }`
`83`	`84`	`}`
`84`	`85`	`}`
`85`	`86`
`@@ -91,8 +92,10 @@ public static void stopSpan(`
`91`	`92`	`@Advice.Thrown final Throwable throwable,`
`92`	`93`	`@Advice.Return final Collection<IgniteCache<?, ?>> caches) {`
`93`	`94`
`94`		`- for (IgniteCache<?, ?> cache : caches) {`
`95`		`- InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);`
	`95`	`+ if (caches != null) {`
	`96`	`+ for (IgniteCache<?, ?> cache : caches) {`
	`97`	`+ InstrumentationContext.get(IgniteCache.class, Ignite.class).put(cache, that);`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`	`}`
`98`	`101`	`}`