Type annotation placement (#4406)

* switch annotation `org.checkerframework.checker.nullness.qual.Nullable` to `javax.annotation.Nullable`

* code format

benchmark-jfr-analyzer/build.gradle.kts

@@ -7,3 +7,7 @@ tasks.withType<JavaCompile>().configureEach {
     release.set(11)
   }
 }
+
+dependencies {
+  implementation("com.google.code.findbugs:jsr305:3.0.2")
+}

benchmark-jfr-analyzer/src/main/java/io/opentelemetry/javaagent/benchmark/jfr/Analyzer.java

@@ -13,12 +13,12 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordedFrame;
 import jdk.jfr.consumer.RecordedMethod;
 import jdk.jfr.consumer.RecordedStackTrace;
 import jdk.jfr.consumer.RecordingFile;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 @SuppressWarnings("SystemOut")
 public class Analyzer {

benchmark/src/jmh/java/io/opentelemetry/benchmark/InstrumenterBenchmark.java

@@ -17,7 +17,7 @@ import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -66,12 +66,14 @@ public class InstrumenterBenchmark {
     }
 
     @Override
-    protected @Nullable String method(Void unused) {
+    @Nullable
+    protected String method(Void unused) {
       return "GET";
     }
 
     @Override
-    protected @Nullable String url(Void unused) {
+    @Nullable
+    protected String url(Void unused) {
       return "https://opentelemetry.io/benchmark";
     }
 
@@ -84,32 +86,38 @@ public class InstrumenterBenchmark {
     }
 
     @Override
-    protected @Nullable Long requestContentLength(Void unused, @Nullable Void unused2) {
+    @Nullable
+    protected Long requestContentLength(Void unused, @Nullable Void unused2) {
       return 100L;
     }
 
     @Override
-    protected @Nullable Long requestContentLengthUncompressed(Void unused, @Nullable Void unused2) {
+    @Nullable
+    protected Long requestContentLengthUncompressed(Void unused, @Nullable Void unused2) {
       return null;
     }
 
     @Override
-    protected @Nullable String flavor(Void unused, @Nullable Void unused2) {
+    @Nullable
+    protected String flavor(Void unused, @Nullable Void unused2) {
       return SemanticAttributes.HttpFlavorValues.HTTP_2_0;
     }
 
     @Override
-    protected @Nullable Integer statusCode(Void unused, Void unused2) {
+    @Nullable
+    protected Integer statusCode(Void unused, Void unused2) {
       return 200;
     }
 
     @Override
-    protected @Nullable Long responseContentLength(Void unused, Void unused2) {
+    @Nullable
+    protected Long responseContentLength(Void unused, Void unused2) {
       return 100L;
     }
 
     @Override
-    protected @Nullable Long responseContentLengthUncompressed(Void unused, Void unused2) {
+    @Nullable
+    protected Long responseContentLengthUncompressed(Void unused, Void unused2) {
       return null;
     }
 
@@ -126,12 +134,14 @@ public class InstrumenterBenchmark {
         InetSocketAddress.createUnresolved("localhost", 8080);
 
     @Override
-    public @Nullable InetSocketAddress getAddress(Void unused) {
+    @Nullable
+    public InetSocketAddress getAddress(Void unused) {
       return ADDRESS;
     }
 
     @Override
-    public @Nullable String transport(Void unused) {
+    @Nullable
+    public String transport(Void unused) {
       return SemanticAttributes.NetTransportValues.IP_TCP;
     }
   }

docs/contributing/style-guideline.md

@@ -102,7 +102,7 @@ Local variables should only be declared `final` if they are not initialized inli
 [Note: this section is aspirational, as opposed to a reflection of the current codebase]
 
 All parameters and fields which can be `null` should be annotated with `@Nullable`
-(specifically `org.checkerframework.checker.nullness.qual.Nullable`, which is included by the
+(specifically `javax.annotation.Nullable`, which is included by the
 `otel.java-conventions` gradle plugin as a `compileOnly` dependency).
 
 There is no need to use `@NonNull`, as this is the default, which should be declared in a

instrumentation-api-annotation-support/build.gradle.kts

@@ -20,6 +20,7 @@ dependencies {
 
   implementation("io.opentelemetry:opentelemetry-api-metrics")
   implementation("org.slf4j:slf4j-api")
+  implementation("com.google.code.findbugs:jsr305:3.0.2")
 
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")

instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java

@@ -12,7 +12,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.function.Function;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** Helper class for reflecting over annotations at runtime.. */
 public class AnnotationReflectionHelper {

instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java

@@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.tracer.AttributeSetter;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** Extractor of {@link io.opentelemetry.api.common.Attributes} for a traced method. */
 public final class MethodSpanAttributesExtractor<REQUEST, RESPONSE>

instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.annotation.support;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** Extractor for the attribute names for the parameters of a traced method. */
 @FunctionalInterface

instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.annotation.support.async;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** A global registry of {@link AsyncOperationEndStrategy} implementations. */
 public abstract class AsyncOperationEndStrategies {

instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java

@@ -9,7 +9,7 @@ import static java.util.Objects.requireNonNull;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** Default strategies' registry implementation that uses strong references. */
 final class AsyncOperationEndStrategiesImpl extends AsyncOperationEndStrategies {

instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.annotation.support.async;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A wrapper over {@link Instrumenter} that is able to defer {@link Instrumenter#end(Context,
@@ -36,7 +36,7 @@ public final class AsyncOperationEndSupport<REQUEST, RESPONSE> {
   private final Instrumenter<REQUEST, RESPONSE> instrumenter;
   private final Class<RESPONSE> responseType;
   private final Class<?> asyncType;
-  private final @Nullable AsyncOperationEndStrategy asyncOperationEndStrategy;
+  @Nullable private final AsyncOperationEndStrategy asyncOperationEndStrategy;
 
   private AsyncOperationEndSupport(
       Instrumenter<REQUEST, RESPONSE> instrumenter,

instrumentation-api-caching/build.gradle.kts

@@ -20,6 +20,8 @@ val shadowInclude by configurations.creating {
 }
 
 dependencies {
+  implementation("com.google.code.findbugs:jsr305:3.0.2")
+
   compileOnly(project(":instrumentation-api-caching:caffeine2", configuration = "shadow"))
   compileOnly(project(":instrumentation-api-caching:caffeine3", configuration = "shadow"))
 

instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Cache.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.caching;
 
 import java.util.function.Function;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** A cache from keys to values. */
 public interface Cache<K, V> {

instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/CacheBuilder.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.caching;
 
 import java.util.concurrent.Executor;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** A builder of {@link Cache}. */
 public final class CacheBuilder {

instrumentation-api/build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
 
   implementation("io.opentelemetry:opentelemetry-api-metrics")
   implementation("org.slf4j:slf4j-api")
+  implementation("com.google.code.findbugs:jsr305:3.0.2")
 
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/config/Config.java

@@ -14,7 +14,7 @@ import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementInfo.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.db;
 
 import com.google.auto.value.AutoValue;
 import java.util.function.Function;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 @AutoValue
 public abstract class SqlStatementInfo {

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizer.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.instrumentation.api.internal.SupportabilityMetric
 
 import io.opentelemetry.instrumentation.api.caching.Cache;
 import io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * This class is responsible for masking potentially sensitive parameters in SQL (and SQL-like)

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/field/VirtualField.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.field;
 
 import io.opentelemetry.instrumentation.api.internal.RuntimeVirtualFieldSupplier;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Represents a "virtual" field of type {@code F} that is added to type {@code T} in the runtime.

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/AttributesExtractor.java

@@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.db.DbAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of {@link io.opentelemetry.api.common.Attributes} for a given request and response.

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ConstantAttributesExtractor.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.instrumenter;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class ConstantAttributesExtractor<REQUEST, RESPONSE, T>
     implements AttributesExtractor<REQUEST, RESPONSE> {

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/DefaultSpanStatusExtractor.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.instrumenter;
 
 import io.opentelemetry.api.trace.StatusCode;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class DefaultSpanStatusExtractor<REQUEST, RESPONSE>
     implements SpanStatusExtractor<REQUEST, RESPONSE> {

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/EndTimeExtractor.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.instrumenter;
 
 import java.time.Instant;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of the end time of response processing. An {@link EndTimeExtractor} should always use

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/Instrumenter.java

@@ -19,7 +19,7 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 // TODO(anuraaga): Need to define what are actually useful knobs, perhaps even providing a
 // base-class

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A builder of {@link Instrumenter}. Instrumentation libraries should generally expose their own

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PeerServiceAttributesExtractor.java

@@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of the {@code peer.service} span attribute, described in <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanKey.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextKey;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** Makes span keys for specific instrumentation accessible to enrich and suppress spans. */
 public final class SpanKey {

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanStatusExtractor.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.instrumenter;
 
 import io.opentelemetry.api.trace.StatusCode;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of {@link StatusCode}, which will be called after a request and response is completed

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.code;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeSpanNameExtractor.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.code;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.tracer.ClassNames;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * A helper {@link SpanNameExtractor} implementation for instrumentations that target specific Java

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.db;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbSpanNameExtractor.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.instrumenter.db;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public final class DbSpanNameExtractor<REQUEST> implements SpanNameExtractor<REQUEST> {
   /**

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractor.java

@@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.db.SqlStatementInfo;
 import io.opentelemetry.instrumentation.api.db.SqlStatementSanitizer;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/ForwarderHeaderParser.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter.http;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class ForwarderHeaderParser {
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java

@@ -10,7 +10,7 @@ import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java

@@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractor.java

@@ -13,7 +13,7 @@ import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanNameExtractor.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.instrumenter.http;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of the <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpSpanStatusExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.http;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
 import io.opentelemetry.instrumentation.api.tracer.HttpStatusConverter;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of the <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.messaging;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesExtractor.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.net;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesExtractor.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.net;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.net;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.net;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesExtractor.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.instrumenter.rpc;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Extractor of <a

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/ContextPropagationDebug.java

@@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.config.Config;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/RuntimeVirtualFieldSupplier.java

@@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.api.caching.Cache;
 import io.opentelemetry.instrumentation.api.field.VirtualField;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,7 +58,8 @@ public final class RuntimeVirtualFieldSupplier {
     private final Cache<T, F> cache = Cache.newBuilder().setWeakKeys().build();
 
     @Override
-    public @Nullable F get(T object) {
+    @Nullable
+    public F get(T object) {
       return cache.get(object);
     }
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.servlet;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextKey;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Helper container for Context attributes for transferring certain information between servlet

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/MappingResolver.java

@@ -11,7 +11,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Helper class for finding a mapping that matches current request from a collection of mappings.

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/ServerSpanNameSupplier.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.servlet;
 
 import io.opentelemetry.context.Context;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 @FunctionalInterface
 public interface ServerSpanNameSupplier<T> {

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/ServerSpanNameTwoArgSupplier.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.api.servlet;
 
 import io.opentelemetry.context.Context;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 @FunctionalInterface
 public interface ServerSpanNameTwoArgSupplier<T, U> {

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/ServerSpanNaming.java

@@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextKey;
 import io.opentelemetry.instrumentation.api.tracer.ServerSpan;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /** Helper container for tracking whether instrumentation should update server span name or not. */
 public final class ServerSpanNaming {
@@ -141,8 +141,8 @@ public final class ServerSpanNaming {
     }
 
     @Override
-    public @Nullable String get(
-        Context context, T arg, ServerSpanNameSupplier<T> serverSpanNameSupplier) {
+    @Nullable
+    public String get(Context context, T arg, ServerSpanNameSupplier<T> serverSpanNameSupplier) {
       return serverSpanNameSupplier.get(context, arg);
     }
   }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/ClientSpan.java

@@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKey;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * This class encapsulates the context key for storing the current {@link SpanKind#CLIENT} span in

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/ConsumerSpan.java

@@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKey;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * This class encapsulates the context key for storing the current {@link SpanKind#CONSUMER} span in

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/DatabaseClientTracer.java

@@ -13,7 +13,7 @@ import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.tracer.net.NetPeerAttributes;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.InetSocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Base class for implementing Tracers for database clients.

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java

@@ -20,7 +20,7 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.TimeUnit;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java

@@ -16,7 +16,7 @@ import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 // TODO In search for a better home package
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/ServerSpan.java

@@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKey;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * This class encapsulates the context key for storing the current {@link SpanKind#SERVER} span in

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/SpanNames.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.tracer;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public final class SpanNames {
 

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/net/NetPeerAttributes.java

@@ -14,7 +14,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public final class NetPeerAttributes {
 

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java

@@ -26,8 +26,8 @@ package io.opentelemetry.javaagent.instrumentation.apachecamel;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Scope;
+import javax.annotation.Nullable;
 import org.apache.camel.Exchange;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java

@@ -30,9 +30,9 @@ import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.MalformedURLException;
 import java.net.URL;
+import javax.annotation.Nullable;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class HttpSpanDecorator extends BaseSpanDecorator {
 

instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java

@@ -18,8 +18,8 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import org.apache.dubbo.rpc.Result;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 /** A builder of {@link DubboTracing}. */
 public final class DubboTracingBuilder {

instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesExtractor.java

@@ -8,19 +8,21 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7.internal;
 import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboRequest;
 import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesExtractor;
 import java.net.InetSocketAddress;
+import javax.annotation.Nullable;
 import org.apache.dubbo.rpc.Result;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class DubboNetClientAttributesExtractor
     extends InetSocketAddressNetClientAttributesExtractor<DubboRequest, Result> {
 
   @Override
-  public @Nullable InetSocketAddress getAddress(DubboRequest request, @Nullable Result response) {
+  @Nullable
+  public InetSocketAddress getAddress(DubboRequest request, @Nullable Result response) {
     return request.context().getRemoteAddress();
   }
 
   @Override
-  public @Nullable String transport(DubboRequest request, @Nullable Result response) {
+  @Nullable
+  public String transport(DubboRequest request, @Nullable Result response) {
     return null;
   }
 }

instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesExtractor.java

@@ -8,19 +8,21 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7.internal;
 import io.opentelemetry.instrumentation.apachedubbo.v2_7.DubboRequest;
 import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetServerAttributesExtractor;
 import java.net.InetSocketAddress;
+import javax.annotation.Nullable;
 import org.apache.dubbo.rpc.Result;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class DubboNetServerAttributesExtractor
     extends InetSocketAddressNetServerAttributesExtractor<DubboRequest, Result> {
 
   @Override
-  public @Nullable InetSocketAddress getAddress(DubboRequest request) {
+  @Nullable
+  public InetSocketAddress getAddress(DubboRequest request) {
     return request.context().getRemoteAddress();
   }
 
   @Override
-  public @Nullable String transport(DubboRequest request) {
+  @Nullable
+  public String transport(DubboRequest request) {
     return null;
   }
 }

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesExtractor.java

@@ -9,9 +9,9 @@ import static io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient.A
 
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpAsyncClientHttpAttributesExtractor
     extends HttpClientAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesExtractor.java

@@ -7,8 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
 
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import javax.annotation.Nullable;
 import org.apache.http.HttpResponse;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpAsyncClientNetAttributesExtractor
     extends NetClientAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {
@@ -19,8 +19,8 @@ final class ApacheHttpAsyncClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerName(
-      ApacheHttpClientRequest request, @Nullable HttpResponse response) {
+  @Nullable
+  public String peerName(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
     return request.getPeerName();
   }
 
@@ -30,7 +30,8 @@ final class ApacheHttpAsyncClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerIp(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
+  @Nullable
+  public String peerIp(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
     return null;
   }
 }

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRequest.java

@@ -11,11 +11,11 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.ProtocolVersion;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesExtractor.java

@@ -11,12 +11,12 @@ import static java.util.Collections.singletonList;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.StatusLine;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpClientHttpAttributesExtractor
     extends HttpClientAttributesExtractor<HttpMethod, HttpMethod> {

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesExtractor.java

@@ -7,9 +7,9 @@ package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import javax.annotation.Nullable;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpMethod;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpClientNetAttributesExtractor
     extends NetClientAttributesExtractor<HttpMethod, HttpMethod> {
@@ -20,19 +20,22 @@ final class ApacheHttpClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerName(HttpMethod request, @Nullable HttpMethod response) {
+  @Nullable
+  public String peerName(HttpMethod request, @Nullable HttpMethod response) {
     HostConfiguration hostConfiguration = request.getHostConfiguration();
     return hostConfiguration != null ? hostConfiguration.getHost() : null;
   }
 
   @Override
-  public @Nullable Integer peerPort(HttpMethod request, @Nullable HttpMethod response) {
+  @Nullable
+  public Integer peerPort(HttpMethod request, @Nullable HttpMethod response) {
     HostConfiguration hostConfiguration = request.getHostConfiguration();
     return hostConfiguration != null ? hostConfiguration.getPort() : null;
   }
 
   @Override
-  public @Nullable String peerIp(HttpMethod request, @Nullable HttpMethod response) {
+  @Nullable
+  public String peerIp(HttpMethod request, @Nullable HttpMethod response) {
     return null;
   }
 }

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesExtractor.java

@@ -9,8 +9,8 @@ import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.A
 
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.http.HttpResponse;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpClientHttpAttributesExtractor
     extends HttpClientAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesExtractor.java

@@ -7,8 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import javax.annotation.Nullable;
 import org.apache.http.HttpResponse;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpClientNetAttributesExtractor
     extends NetClientAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {
@@ -19,8 +19,8 @@ final class ApacheHttpClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerName(
-      ApacheHttpClientRequest request, @Nullable HttpResponse response) {
+  @Nullable
+  public String peerName(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
     return request.getPeerName();
   }
 
@@ -30,7 +30,8 @@ final class ApacheHttpClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerIp(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
+  @Nullable
+  public String peerIp(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
     return null;
   }
 }

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientRequest.java

@@ -11,12 +11,12 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesExtractor.java

@@ -10,8 +10,8 @@ import static io.opentelemetry.instrumentation.apachehttpclient.v4_3.ApacheHttpC
 import io.opentelemetry.instrumentation.api.instrumenter.http.CapturedHttpHeaders;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.http.HttpResponse;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpClientHttpAttributesExtractor
     extends HttpClientAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesExtractor.java

@@ -7,8 +7,8 @@ package io.opentelemetry.instrumentation.apachehttpclient.v4_3;
 
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import javax.annotation.Nullable;
 import org.apache.http.HttpResponse;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class ApacheHttpClientNetAttributesExtractor
     extends NetClientAttributesExtractor<ApacheHttpClientRequest, HttpResponse> {

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientRequest.java

@@ -11,11 +11,11 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.ProtocolVersion;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/HttpHeaderSetter.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.instrumentation.apachehttpclient.v4_3;
 
 import io.opentelemetry.context.propagation.TextMapSetter;
+import javax.annotation.Nullable;
 import org.apache.http.client.methods.HttpRequestWrapper;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 enum HttpHeaderSetter implements TextMapSetter<HttpRequestWrapper> {
   INSTANCE;

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/TracingProtocolExec.java

@@ -10,6 +10,7 @@ import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import java.io.IOException;
+import javax.annotation.Nullable;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
@@ -23,7 +24,6 @@ import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.impl.client.DefaultRedirectStrategy;
 import org.apache.http.impl.client.RedirectLocations;
 import org.apache.http.impl.execchain.ClientExecChain;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class TracingProtocolExec implements ClientExecChain {
 

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesExtractor.java

@@ -10,12 +10,12 @@ import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.net.URIAuthority;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesExtractor.java

@@ -7,9 +7,9 @@ package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
 
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import javax.annotation.Nullable;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +25,8 @@ final class ApacheHttpClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerName(ClassicHttpRequest request, @Nullable HttpResponse response) {
+  @Nullable
+  public String peerName(ClassicHttpRequest request, @Nullable HttpResponse response) {
     return request.getAuthority().getHostName();
   }
 
@@ -51,7 +52,8 @@ final class ApacheHttpClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable String peerIp(ClassicHttpRequest request, @Nullable HttpResponse response) {
+  @Nullable
+  public String peerIp(ClassicHttpRequest request, @Nullable HttpResponse response) {
     return null;
   }
 }

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesExtractor.java

@@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.CapturedHttpHeader
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class ArmeriaHttpClientAttributesExtractor
     extends HttpClientAttributesExtractor<RequestContext, RequestLog> {

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesExtractor.java

@@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.CapturedHttpHeader
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class ArmeriaHttpServerAttributesExtractor
     extends HttpServerAttributesExtractor<RequestContext, RequestLog> {

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTracingBuilder.java

@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public final class ArmeriaTracingBuilder {
 

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.armeria.v1_3;
 
 import com.linecorp.armeria.client.ClientRequestContext;
 import io.opentelemetry.context.propagation.TextMapSetter;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class ClientRequestContextSetter implements TextMapSetter<ClientRequestContext> {
 

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java

@@ -10,7 +10,7 @@ import io.netty.util.AsciiString;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Collections;
 import java.util.stream.Collectors;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class RequestContextGetter implements TextMapGetter<ServiceRequestContext> {
 

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesExtractor.java

@@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNe
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public final class ArmeriaNetClientAttributesExtractor
     extends InetSocketAddressNetClientAttributesExtractor<RequestContext, RequestLog> {

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetServerAttributesExtractor.java

@@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNe
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 public final class ArmeriaNetServerAttributesExtractor
     extends InetSocketAddressNetServerAttributesExtractor<RequestContext, RequestLog> {

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesExtractor.java

@@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttribut
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.Collections;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class AsyncHttpClientHttpAttributesExtractor
     extends HttpClientAttributesExtractor<Request, Response> {

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesExtractor.java

@@ -9,7 +9,7 @@ import com.ning.http.client.Request;
 import com.ning.http.client.Response;
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class AsyncHttpClientNetAttributesExtractor
     extends NetClientAttributesExtractor<Request, Response> {

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientAdditionalAttributesExtractor.java

@@ -8,9 +8,9 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import javax.annotation.Nullable;
 import org.asynchttpclient.Response;
 import org.asynchttpclient.netty.request.NettyRequest;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class AsyncHttpClientAdditionalAttributesExtractor
     implements AttributesExtractor<RequestContext, Response> {

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesExtractor.java

@@ -8,9 +8,9 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.asynchttpclient.Response;
 import org.asynchttpclient.netty.request.NettyRequest;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class AsyncHttpClientHttpAttributesExtractor
     extends HttpClientAttributesExtractor<RequestContext, Response> {

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesExtractor.java

@@ -8,8 +8,8 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.InetSocketAddress;
+import javax.annotation.Nullable;
 import org.asynchttpclient.Response;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 final class AsyncHttpClientNetAttributesExtractor
     extends InetSocketAddressNetClientAttributesExtractor<RequestContext, Response> {
@@ -20,8 +20,8 @@ final class AsyncHttpClientNetAttributesExtractor
   }
 
   @Override
-  public @Nullable InetSocketAddress getAddress(
-      RequestContext request, @Nullable Response response) {
+  @Nullable
+  public InetSocketAddress getAddress(RequestContext request, @Nullable Response response) {
     if (response != null && response.getRemoteAddress() instanceof InetSocketAddress) {
       return (InetSocketAddress) response.getRemoteAddress();
     }

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/ApiGatewayProxyRequest.java

@@ -14,8 +14,8 @@ import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import javax.annotation.Nullable;
 import org.apache.commons.io.IOUtils;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public abstract class ApiGatewayProxyRequest {
 

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/internal/HeadersFactory.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.InputStream;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkAttributesExtractor.java

@@ -13,7 +13,7 @@ import com.amazonaws.Response;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class AwsSdkAttributesExtractor extends HttpClientAttributesExtractor<Request<?>, Response<?>> {
   @Override
@@ -22,7 +22,8 @@ class AwsSdkAttributesExtractor extends HttpClientAttributesExtractor<Request<?>
   }
 
   @Override
-  protected @Nullable String flavor(Request<?> request, @Nullable Response<?> response) {
+  @Nullable
+  protected String flavor(Request<?> request, @Nullable Response<?> response) {
     return SemanticAttributes.HttpFlavorValues.HTTP_1_1;
   }
 
@@ -38,13 +39,14 @@ class AwsSdkAttributesExtractor extends HttpClientAttributesExtractor<Request<?>
   }
 
   @Override
-  protected @Nullable Long requestContentLength(
-      Request<?> request, @Nullable Response<?> response) {
+  @Nullable
+  protected Long requestContentLength(Request<?> request, @Nullable Response<?> response) {
     return null;
   }
 
   @Override
-  protected @Nullable Long requestContentLengthUncompressed(
+  @Nullable
+  protected Long requestContentLengthUncompressed(
       Request<?> request, @Nullable Response<?> response) {
     return null;
   }
@@ -55,13 +57,14 @@ class AwsSdkAttributesExtractor extends HttpClientAttributesExtractor<Request<?>
   }
 
   @Override
-  protected @Nullable Long responseContentLength(Request<?> request, Response<?> response) {
+  @Nullable
+  protected Long responseContentLength(Request<?> request, Response<?> response) {
     return null;
   }
 
   @Override
-  protected @Nullable Long responseContentLengthUncompressed(
-      Request<?> request, Response<?> response) {
+  @Nullable
+  protected Long responseContentLengthUncompressed(Request<?> request, Response<?> response) {
     return null;
   }
 

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkExperimentalAttributesExtractor.java

@@ -21,7 +21,7 @@ import com.amazonaws.Request;
 import com.amazonaws.Response;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class AwsSdkExperimentalAttributesExtractor
     implements AttributesExtractor<Request<?>, Response<?>> {

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkNetAttributesExtractor.java

@@ -9,7 +9,7 @@ import com.amazonaws.Request;
 import com.amazonaws.Response;
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 class AwsSdkNetAttributesExtractor extends NetClientAttributesExtractor<Request<?>, Response<?>> {
   @Override
@@ -18,7 +18,8 @@ class AwsSdkNetAttributesExtractor extends NetClientAttributesExtractor<Request<
   }
 
   @Override
-  public @Nullable String peerName(Request<?> request, @Nullable Response<?> response) {
+  @Nullable
+  public String peerName(Request<?> request, @Nullable Response<?> response) {
     return request.getEndpoint().getHost();
   }
 
@@ -28,7 +29,8 @@ class AwsSdkNetAttributesExtractor extends NetClientAttributesExtractor<Request<
   }
 
   @Override
-  public @Nullable String peerIp(Request<?> request, @Nullable Response<?> response) {
+  @Nullable
+  public String peerIp(Request<?> request, @Nullable Response<?> response) {
     return null;
   }
 }

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/RequestAccess.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.awssdk.v1_11;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 final class RequestAccess {
 

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsMessageAccess.java

@@ -11,7 +11,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.Collections;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Reflective access to aws-sdk-java-sqs class Message.

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsReceiveMessageRequestAccess.java

@@ -12,7 +12,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.Collections;
 import java.util.List;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import javax.annotation.Nullable;
 
 /**
  * Reflective access to aws-sdk-java-sqs class ReceiveMessageRequest.