Merge branch 'main' into feat/custom-client-resources

laurit · web-flow · commit a25f9ba999b7 · 2025-11-27T10:49:03.000+02:00
diff --git a/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/InstrumentedRecordInterceptor.java b/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/InstrumentedRecordInterceptor.java
@@ -138,6 +138,6 @@ public void clearThreadState(Consumer<?, ?> consumer) {
 
   private static class ThreadState {
     // used to record the error in failure() so it could be used in afterRecord()
-    Throwable error;
+    @Nullable Throwable error;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,6 @@ public void clearThreadState(Consumer<?, ?> consumer) {`
`138`	`138`
`139`	`139`	`private static class ThreadState {`
`140`	`140`	`// used to record the error in failure() so it could be used in afterRecord()`
`141`		`- Throwable error;`
	`141`	`+ @Nullable Throwable error;`
`142`	`142`	`}`
`143`	`143`	`}`