Fail fast when Spring builder extractors are missing

Author: trask

instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/internal/WebTelemetryUtil.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.spring.web.v3_1.internal;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
@@ -35,9 +37,9 @@ public static SpringWebTelemetryBuilder applyCommonConfig(
       SpringWebTelemetryBuilder builder, OpenTelemetry openTelemetry) {
     // builderExtractor is guaranteed non-null because the builder class registers it during
     // static initialization, before a builder instance can be passed here
-    if (builderExtractor != null) {
-      builderExtractor.apply(builder).configure(new CommonConfig(openTelemetry));
-    }
+    requireNonNull(builderExtractor, "builderExtractor")
+        .apply(builder)
+        .configure(new CommonConfig(openTelemetry));
     return builder;
   }
 

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/SpringWebfluxBuilderUtil.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.spring.webflux.v5_3.internal;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder;
@@ -46,9 +48,9 @@ public static SpringWebfluxClientTelemetryBuilder applyClientCommonConfig(
       SpringWebfluxClientTelemetryBuilder builder, OpenTelemetry openTelemetry) {
     // clientBuilderExtractor is guaranteed non-null because the builder class registers it during
     // static initialization, before a builder instance can be passed here
-    if (clientBuilderExtractor != null) {
-      clientBuilderExtractor.apply(builder).configure(new CommonConfig(openTelemetry));
-    }
+    requireNonNull(clientBuilderExtractor, "clientBuilderExtractor")
+        .apply(builder)
+        .configure(new CommonConfig(openTelemetry));
     return builder;
   }
 
@@ -57,9 +59,9 @@ public static SpringWebfluxServerTelemetryBuilder applyServerCommonConfig(
       SpringWebfluxServerTelemetryBuilder builder, OpenTelemetry openTelemetry) {
     // serverBuilderExtractor is guaranteed non-null because the builder class registers it during
     // static initialization, before a builder instance can be passed here
-    if (serverBuilderExtractor != null) {
-      serverBuilderExtractor.apply(builder).configure(new CommonConfig(openTelemetry));
-    }
+    requireNonNull(serverBuilderExtractor, "serverBuilderExtractor")
+        .apply(builder)
+        .configure(new CommonConfig(openTelemetry));
     return builder;
   }
 

instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/internal/SpringMvcBuilderUtil.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder;
@@ -37,9 +39,9 @@ public static SpringWebMvcTelemetryBuilder applyCommonConfig(
       SpringWebMvcTelemetryBuilder builder, OpenTelemetry openTelemetry) {
     // builderExtractor is guaranteed non-null because the builder class registers it during
     // static initialization, before a builder instance can be passed here
-    if (builderExtractor != null) {
-      builderExtractor.apply(builder).configure(new CommonConfig(openTelemetry));
-    }
+    requireNonNull(builderExtractor, "builderExtractor")
+        .apply(builder)
+        .configure(new CommonConfig(openTelemetry));
     return builder;
   }
 

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/internal/SpringMvcBuilderUtil.java

@@ -39,9 +39,9 @@ public static SpringWebMvcTelemetryBuilder applyCommonConfig(
       SpringWebMvcTelemetryBuilder builder, OpenTelemetry openTelemetry) {
     // builderExtractor is guaranteed non-null because the builder class registers it during
     // static initialization, before a builder instance can be passed here
-    if (builderExtractor != null) {
-      requireNonNull(builderExtractor).apply(builder).configure(new CommonConfig(openTelemetry));
-    }
+    requireNonNull(builderExtractor, "builderExtractor")
+        .apply(builder)
+        .configure(new CommonConfig(openTelemetry));
     return builder;
   }