fix

Author: zeitlinger

conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts

@@ -26,6 +26,7 @@ tasks {
     options.errorprone.nullaway {
       customInitializerAnnotations.add("org.openjdk.jmh.annotations.Setup")
       excludedFieldAnnotations.add("org.mockito.Mock")
+      excludedFieldAnnotations.add("org.mockito.InjectMocks")
     }
   }
 }

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java

@@ -8,6 +8,7 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static java.util.Collections.emptyMap;
+import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
@@ -87,7 +88,7 @@ public void onEnd(
         Map<String, String> request,
         @Nullable Map<String, String> response,
         @Nullable Throwable error) {
-      attributes.put("resp1", response.get("resp1"));
+      attributes.put("resp1", requireNonNull(response).get("resp1"));
       attributes.put("resp2", response.get("resp2"));
     }
   }
@@ -109,7 +110,7 @@ public void onEnd(
         Map<String, String> request,
         @Nullable Map<String, String> response,
         @Nullable Throwable error) {
-      attributes.put("resp3", response.get("resp3"));
+      attributes.put("resp3", requireNonNull(response).get("resp3"));
       attributes.put("resp2", response.get("resp2_2"));
     }
   }

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumentationCustomizerTest.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static java.util.Collections.singletonList;
+import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.ArgumentMatchers.any;
@@ -338,7 +339,7 @@ public void onEnd(
         Map<String, String> request,
         @Nullable Map<String, String> response,
         @Nullable Throwable error) {
-      attributes.put("resp1", response.get("resp1"));
+      attributes.put("resp1", requireNonNull(response).get("resp1"));
       attributes.put("resp2", response.get("resp2"));
     }
   }
@@ -360,7 +361,7 @@ public void onEnd(
         Map<String, String> request,
         @Nullable Map<String, String> response,
         @Nullable Throwable error) {
-      attributes.put("resp3", response.get("resp3"));
+      attributes.put("resp3", requireNonNull(response).get("resp3"));
       attributes.put("resp2", response.get("resp2_2"));
     }
   }

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumenterContextTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.api.internal;
 
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
+import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.Attributes;
@@ -31,6 +32,7 @@ class InstrumenterContextTest {
   @SuppressWarnings({"unchecked", "deprecation"}) // using deprecated DB_SQL_TABLE
   @Test
   void testSqlSanitizer() {
+    Object request = new Object(); // dummy request object
     String testQuery = "SELECT name FROM test WHERE id = 1";
     SqlClientAttributesGetter<Object, Void> getter =
         new SqlClientAttributesGetter<Object, Void>() {
@@ -48,11 +50,12 @@ public Collection<String> getRawQueryTexts(Object request) {
     cleanup.deferCleanup(InstrumenterContext::reset);
 
     assertThat(InstrumenterContext.get()).isEmpty();
-    assertThat(spanNameExtractor.extract(null)).isEqualTo("SELECT test");
+    assertThat(spanNameExtractor.extract(request)).isEqualTo("SELECT test");
     // verify that sanitized statement was cached, see SqlStatementSanitizerUtil
     assertThat(InstrumenterContext.get()).containsKey("sanitized-sql-map");
     Map<String, SqlStatementInfo> sanitizedMap =
-        (Map<String, SqlStatementInfo>) InstrumenterContext.get().get("sanitized-sql-map");
+        (Map<String, SqlStatementInfo>)
+            requireNonNull(InstrumenterContext.get().get("sanitized-sql-map"));
     assertThat(sanitizedMap).containsKey(testQuery);
 
     // replace cached sanitization result to verify it is used
@@ -61,7 +64,7 @@ public Collection<String> getRawQueryTexts(Object request) {
         SqlStatementInfo.create("SELECT name2 FROM test2 WHERE id = ?", "SELECT", "test2"));
     {
       AttributesBuilder builder = Attributes.builder();
-      attributesExtractor.onStart(builder, Context.root(), null);
+      attributesExtractor.onStart(builder, Context.root(), request);
       assertThat(builder.build().get(maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)))
           .isEqualTo("test2");
     }
@@ -70,7 +73,7 @@ public Collection<String> getRawQueryTexts(Object request) {
     sanitizedMap.clear();
     {
       AttributesBuilder builder = Attributes.builder();
-      attributesExtractor.onStart(builder, Context.root(), null);
+      attributesExtractor.onStart(builder, Context.root(), request);
       assertThat(builder.build().get(maybeStable(DbIncubatingAttributes.DB_SQL_TABLE)))
           .isEqualTo("test");
     }

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java

@@ -50,11 +50,13 @@ static class TestHttpClientAttributesGetter
       implements HttpClientAttributesGetter<Map<String, String>, Map<String, String>> {
 
     @Override
+    @Nullable
     public String getUrlFull(Map<String, String> request) {
       return request.get("urlFull");
     }
 
     @Override
+    @Nullable
     public String getHttpRequestMethod(Map<String, String> request) {
       return request.get("method");
     }
@@ -66,13 +68,15 @@ public List<String> getHttpRequestHeader(Map<String, String> request, String nam
     }
 
     @Override
+    @Nullable
     public Integer getHttpResponseStatusCode(
         Map<String, String> request, Map<String, String> response, @Nullable Throwable error) {
       String value = response.get("statusCode");
       return value == null ? null : Integer.parseInt(value);
     }
 
     @Override
+    @Nullable
     public List<String> getHttpResponseHeader(
         Map<String, String> request, Map<String, String> response, String name) {
       String value = response.get("header." + name);

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java

@@ -26,6 +26,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
+import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.entry;
 
 import io.opentelemetry.api.common.AttributeKey;
@@ -52,11 +53,13 @@ static class TestHttpServerAttributesGetter
       implements HttpServerAttributesGetter<Map<String, String>, Map<String, String>> {
 
     @Override
+    @Nullable
     public String getHttpRequestMethod(Map<String, String> request) {
       return request.get("method");
     }
 
     @Override
+    @Nullable
     public String getUrlScheme(Map<String, String> request) {
       return request.get("urlScheme");
     }
@@ -74,6 +77,7 @@ public String getUrlQuery(Map<String, String> request) {
     }
 
     @Override
+    @Nullable
     public String getHttpRoute(Map<String, String> request) {
       return request.get("route");
     }
@@ -85,6 +89,7 @@ public List<String> getHttpRequestHeader(Map<String, String> request, String nam
     }
 
     @Override
+    @Nullable
     public Integer getHttpResponseStatusCode(
         Map<String, String> request, Map<String, String> response, @Nullable Throwable error) {
       String value = response.get("statusCode");
@@ -115,15 +120,15 @@ public String getNetworkType(
     @Nullable
     @Override
     public String getNetworkProtocolName(
-        Map<String, String> request, Map<String, String> response) {
+        Map<String, String> request, @Nullable Map<String, String> response) {
       return request.get("networkProtocolName");
     }
 
     @Nullable
     @Override
     public String getNetworkProtocolVersion(
-        Map<String, String> request, Map<String, String> response) {
-      return request.get("networkProtocolVersion");
+        Map<String, String> request, @Nullable Map<String, String> response) {
+      return requireNonNull(response).get("networkProtocolVersion");
     }
 
     @Nullable