Enable errorprone's UnnecessarilyFullyQualified check

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

@@ -45,10 +45,6 @@ tasks {
         // Suggests using Guava types for fields but we don't use Guava
         disable("ImmutableMemberCollection")
 
-        // Fully qualified names may be necessary when deprecating a class to avoid
-        // deprecation warning.
-        disable("UnnecessarilyFullyQualified")
-
         // We use animal sniffer
         disable("Java8ApiChecker")
 

exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/StringEncoderHolder.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.exporter.internal.marshal;
 
+import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -51,7 +52,7 @@ public static StringEncoder createVarHandleEncoder() {
     try {
       Class<?> varHandleClass =
           Class.forName("io.opentelemetry.exporter.internal.marshal.VarHandleStringEncoder");
-      java.lang.reflect.Method createMethod = varHandleClass.getMethod("createIfAvailable");
+      Method createMethod = varHandleClass.getMethod("createIfAvailable");
       return (StringEncoder) createMethod.invoke(null);
     } catch (Throwable t) {
       return null;

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/AnyValueStatelessMarshaler.java

@@ -11,6 +11,7 @@
 import io.opentelemetry.exporter.internal.marshal.Serializer;
 import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler;
 import io.opentelemetry.exporter.internal.marshal.StatelessMarshalerUtil;
+import io.opentelemetry.proto.common.v1.internal.AnyValue;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -49,14 +50,14 @@ public void writeTo(Serializer output, Value<?> value, MarshalerContext context)
         return;
       case ARRAY:
         output.serializeMessageWithContext(
-            io.opentelemetry.proto.common.v1.internal.AnyValue.ARRAY_VALUE,
+            AnyValue.ARRAY_VALUE,
             (List<Value<?>>) value.getValue(),
             ArrayAnyValueStatelessMarshaler.INSTANCE,
             context);
         return;
       case KEY_VALUE_LIST:
         output.serializeMessageWithContext(
-            io.opentelemetry.proto.common.v1.internal.AnyValue.KVLIST_VALUE,
+            AnyValue.KVLIST_VALUE,
             (List<KeyValue>) value.getValue(),
             KeyValueListAnyValueStatelessMarshaler.INSTANCE,
             context);
@@ -92,13 +93,13 @@ public int getBinarySerializedSize(Value<?> value, MarshalerContext context) {
             (Double) value.getValue(), context);
       case ARRAY:
         return StatelessMarshalerUtil.sizeMessageWithContext(
-            io.opentelemetry.proto.common.v1.internal.AnyValue.ARRAY_VALUE,
+            AnyValue.ARRAY_VALUE,
             (List<Value<?>>) value.getValue(),
             ArrayAnyValueStatelessMarshaler.INSTANCE,
             context);
       case KEY_VALUE_LIST:
         return StatelessMarshalerUtil.sizeMessageWithContext(
-            io.opentelemetry.proto.common.v1.internal.AnyValue.KVLIST_VALUE,
+            AnyValue.KVLIST_VALUE,
             (List<KeyValue>) value.getValue(),
             KeyValueListAnyValueStatelessMarshaler.INSTANCE,
             context);

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExemplarMarshaler.java

@@ -11,6 +11,7 @@
 import io.opentelemetry.exporter.internal.marshal.ProtoFieldInfo;
 import io.opentelemetry.exporter.internal.marshal.Serializer;
 import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler;
+import io.opentelemetry.proto.metrics.v1.internal.Exemplar;
 import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
 import io.opentelemetry.sdk.metrics.data.ExemplarData;
 import io.opentelemetry.sdk.metrics.data.LongExemplarData;
@@ -66,22 +67,17 @@ private ExemplarMarshaler(
 
   @Override
   public void writeTo(Serializer output) throws IOException {
-    output.serializeFixed64(
-        io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO, timeUnixNano);
-    if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
+    output.serializeFixed64(Exemplar.TIME_UNIX_NANO, timeUnixNano);
+    if (valueField == Exemplar.AS_INT) {
       output.serializeFixed64Optional(valueField, ((LongExemplarData) value).getValue());
     } else {
       output.serializeDoubleOptional(valueField, ((DoubleExemplarData) value).getValue());
     }
     if (spanContext.isValid()) {
-      output.serializeSpanId(
-          io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
-      output.serializeTraceId(
-          io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID, spanContext.getTraceId());
+      output.serializeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId());
+      output.serializeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId());
     }
-    output.serializeRepeatedMessage(
-        io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
-        filteredAttributeMarshalers);
+    output.serializeRepeatedMessage(Exemplar.FILTERED_ATTRIBUTES, filteredAttributeMarshalers);
   }
 
   private static int calculateSize(
@@ -91,36 +87,28 @@ private static int calculateSize(
       SpanContext spanContext,
       KeyValueMarshaler[] filteredAttributeMarshalers) {
     int size = 0;
-    size +=
-        MarshalerUtil.sizeFixed64(
-            io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO, timeUnixNano);
-    if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
+    size += MarshalerUtil.sizeFixed64(Exemplar.TIME_UNIX_NANO, timeUnixNano);
+    if (valueField == Exemplar.AS_INT) {
       size += MarshalerUtil.sizeFixed64Optional(valueField, ((LongExemplarData) value).getValue());
     } else {
       size += MarshalerUtil.sizeDoubleOptional(valueField, ((DoubleExemplarData) value).getValue());
     }
     if (spanContext.isValid()) {
-      size +=
-          MarshalerUtil.sizeSpanId(
-              io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
-      size +=
-          MarshalerUtil.sizeTraceId(
-              io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
-              spanContext.getTraceId());
+      size += MarshalerUtil.sizeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId());
+      size += MarshalerUtil.sizeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId());
     }
     size +=
         MarshalerUtil.sizeRepeatedMessage(
-            io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
-            filteredAttributeMarshalers);
+            Exemplar.FILTERED_ATTRIBUTES, filteredAttributeMarshalers);
     return size;
   }
 
   static ProtoFieldInfo toProtoExemplarValueType(ExemplarData exemplar) {
     if (exemplar instanceof LongExemplarData) {
-      return io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT;
+      return Exemplar.AS_INT;
     } else {
       assert exemplar instanceof DoubleExemplarData;
-      return io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_DOUBLE;
+      return Exemplar.AS_DOUBLE;
     }
   }
 }

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/metrics/ExemplarStatelessMarshaler.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler;
 import io.opentelemetry.exporter.internal.marshal.StatelessMarshalerUtil;
 import io.opentelemetry.exporter.internal.otlp.AttributeKeyValueStatelessMarshaler;
+import io.opentelemetry.proto.metrics.v1.internal.Exemplar;
 import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
 import io.opentelemetry.sdk.metrics.data.ExemplarData;
 import io.opentelemetry.sdk.metrics.data.LongExemplarData;
@@ -29,28 +30,20 @@ private ExemplarStatelessMarshaler() {}
   @Override
   public void writeTo(Serializer output, ExemplarData exemplar, MarshalerContext context)
       throws IOException {
-    output.serializeFixed64(
-        io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO,
-        exemplar.getEpochNanos());
+    output.serializeFixed64(Exemplar.TIME_UNIX_NANO, exemplar.getEpochNanos());
     ProtoFieldInfo valueField = toProtoExemplarValueType(exemplar);
-    if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
+    if (valueField == Exemplar.AS_INT) {
       output.serializeFixed64Optional(valueField, ((LongExemplarData) exemplar).getValue());
     } else {
       output.serializeDoubleOptional(valueField, ((DoubleExemplarData) exemplar).getValue());
     }
     SpanContext spanContext = exemplar.getSpanContext();
     if (spanContext.isValid()) {
-      output.serializeSpanId(
-          io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID,
-          spanContext.getSpanId(),
-          context);
-      output.serializeTraceId(
-          io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
-          spanContext.getTraceId(),
-          context);
+      output.serializeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId(), context);
+      output.serializeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId(), context);
     }
     output.serializeRepeatedMessageWithContext(
-        io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
+        Exemplar.FILTERED_ATTRIBUTES,
         exemplar.getFilteredAttributes(),
         AttributeKeyValueStatelessMarshaler.INSTANCE,
         context);
@@ -59,12 +52,9 @@ public void writeTo(Serializer output, ExemplarData exemplar, MarshalerContext c
   @Override
   public int getBinarySerializedSize(ExemplarData exemplar, MarshalerContext context) {
     int size = 0;
-    size +=
-        MarshalerUtil.sizeFixed64(
-            io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO,
-            exemplar.getEpochNanos());
+    size += MarshalerUtil.sizeFixed64(Exemplar.TIME_UNIX_NANO, exemplar.getEpochNanos());
     ProtoFieldInfo valueField = toProtoExemplarValueType(exemplar);
-    if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
+    if (valueField == Exemplar.AS_INT) {
       size +=
           MarshalerUtil.sizeFixed64Optional(valueField, ((LongExemplarData) exemplar).getValue());
     } else {
@@ -73,17 +63,12 @@ public int getBinarySerializedSize(ExemplarData exemplar, MarshalerContext conte
     }
     SpanContext spanContext = exemplar.getSpanContext();
     if (spanContext.isValid()) {
-      size +=
-          MarshalerUtil.sizeSpanId(
-              io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
-      size +=
-          MarshalerUtil.sizeTraceId(
-              io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
-              spanContext.getTraceId());
+      size += MarshalerUtil.sizeSpanId(Exemplar.SPAN_ID, spanContext.getSpanId());
+      size += MarshalerUtil.sizeTraceId(Exemplar.TRACE_ID, spanContext.getTraceId());
     }
     size +=
         StatelessMarshalerUtil.sizeRepeatedMessageWithContext(
-            io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
+            Exemplar.FILTERED_ATTRIBUTES,
             exemplar.getFilteredAttributes(),
             AttributeKeyValueStatelessMarshaler.INSTANCE,
             context);

exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java

@@ -11,6 +11,7 @@
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.okhttp.OkHttpChannelBuilder;
 import io.netty.handler.ssl.SslContext;
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.common.ComponentLoader;
@@ -286,8 +287,7 @@ private static void setSslContext(
         if (sslContext == null) {
           return;
         }
-        io.grpc.okhttp.OkHttpChannelBuilder okHttpBuilder =
-            (io.grpc.okhttp.OkHttpChannelBuilder) managedChannelBuilder;
+        OkHttpChannelBuilder okHttpBuilder = (OkHttpChannelBuilder) managedChannelBuilder;
         okHttpBuilder.sslSocketFactory(sslContext.getSocketFactory());
         break;
       default:

exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java

@@ -37,6 +37,7 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okio.BufferedSink;
 import okio.Okio;
@@ -139,7 +140,7 @@ public void onFailure(Call call, IOException e) {
                       }
 
                       @Override
-                      public void onResponse(Call call, okhttp3.Response response) {
+                      public void onResponse(Call call, Response response) {
                         try (ResponseBody body = response.body()) {
                           onResponse.accept(
                               new HttpResponse() {
@@ -183,7 +184,7 @@ public CompletableResultCode shutdown() {
     return CompletableResultCode.ofSuccess();
   }
 
-  static boolean isRetryable(okhttp3.Response response) {
+  static boolean isRetryable(Response response) {
     return RetryUtil.retryableHttpResponseCodes().contains(response.code());
   }
 

exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java

@@ -108,7 +108,7 @@ void shutdown_CompletableResultCodeShouldWaitForThreads() throws Exception {
         "CompletableResultCode should not be done immediately - it should wait for thread termination");
 
     // Now wait for it to complete
-    shutdownResult.join(10, java.util.concurrent.TimeUnit.SECONDS);
+    shutdownResult.join(10, TimeUnit.SECONDS);
     assertTrue(shutdownResult.isDone(), "CompletableResultCode should be done after waiting");
     assertTrue(shutdownResult.isSuccess(), "Shutdown should complete successfully");
   }

exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/RetryInterceptorTest.java

@@ -68,7 +68,7 @@ class RetryInterceptorTest {
 
   @BeforeEach
   void setUp() {
-    Logger logger = java.util.logging.Logger.getLogger(RetryInterceptor.class.getName());
+    Logger logger = Logger.getLogger(RetryInterceptor.class.getName());
     logger.setLevel(Level.FINER);
     retryExceptionPredicate =
         spy(

exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterBuilder.java

@@ -20,6 +20,7 @@
 import zipkin2.Span;
 import zipkin2.reporter.BytesEncoder;
 import zipkin2.reporter.BytesMessageSender;
+import zipkin2.reporter.Sender;
 import zipkin2.reporter.SpanBytesEncoder;
 import zipkin2.reporter.okhttp3.OkHttpSender;
 
@@ -55,7 +56,7 @@ public final class ZipkinSpanExporterBuilder {
    * @deprecated Use {@link #setSender(BytesMessageSender)} insteead.
    */
   @Deprecated
-  public ZipkinSpanExporterBuilder setSender(zipkin2.reporter.Sender sender) {
+  public ZipkinSpanExporterBuilder setSender(Sender sender) {
     return setSender((BytesMessageSender) sender);
   }
 

exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/internal/ZipkinSpanExporterProviderTest.java

@@ -51,8 +51,7 @@ void createExporter_WithConfiguration() {
 
     try (SpanExporter spanExporter =
         provider.createExporter(DefaultConfigProperties.createFromMap(config))) {
-      assertThat(spanExporter)
-          .isInstanceOf(io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.class);
+      assertThat(spanExporter).isInstanceOf(ZipkinSpanExporter.class);
       assertThat(spanExporter)
           .extracting("sender")
           .extracting("delegate")

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

@@ -50,6 +50,7 @@
 import io.opentelemetry.proto.common.v1.AnyValue;
 import io.opentelemetry.proto.common.v1.ArrayValue;
 import io.opentelemetry.proto.common.v1.KeyValueList;
+import io.opentelemetry.proto.logs.v1.LogRecord;
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.proto.logs.v1.ScopeLogs;
 import io.opentelemetry.proto.metrics.v1.AggregationTemporality;
@@ -689,7 +690,7 @@ private static void testLogRecordExporter(LogRecordExporter logRecordExporter) {
     assertThat(ilLogs.getLogRecordsCount()).isEqualTo(1);
 
     // LogRecord via Logger.logRecordBuilder()...emit()
-    io.opentelemetry.proto.logs.v1.LogRecord protoLog1 = ilLogs.getLogRecords(0);
+    LogRecord protoLog1 = ilLogs.getLogRecords(0);
     assertThat(protoLog1.getEventName()).isEqualTo("event name");
     assertThat(protoLog1.getBody())
         .isEqualTo(

integration-tests/tracecontext/src/main/java/io/opentelemetry/Application.java

@@ -87,7 +87,7 @@ public String serve(RequestHeaders headers, List<Request> requests) {
               .getTextMapPropagator()
               .extract(Context.current(), headers, ArmeriaGetter.INSTANCE);
 
-      for (io.opentelemetry.Request req : requests) {
+      for (Request req : requests) {
         Span span =
             openTelemetry
                 .getTracer("validation-server")

opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/SpanConverter.java

@@ -8,6 +8,7 @@
 import io.opencensus.common.Function;
 import io.opencensus.trace.BlankSpan;
 import io.opencensus.trace.Span;
+import io.opencensus.trace.Span.Kind;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.TraceId;
@@ -28,7 +29,7 @@ final class SpanConverter {
 
   private SpanConverter() {}
 
-  static SpanKind mapKind(@Nullable io.opencensus.trace.Span.Kind ocKind) {
+  static SpanKind mapKind(@Nullable Kind ocKind) {
     if (ocKind == null) {
       return SpanKind.INTERNAL;
     }

opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/OpenTracingShim.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentracing.Tracer;
 
 /**
  * Factory for creating an OpenTracing {@link io.opentracing.Tracer} that is implemented using the
@@ -26,7 +27,7 @@ private OpenTracingShim() {}
    * @param openTelemetry the {@code OpenTelemetry} instance used to create this shim.
    * @return a {@code io.opentracing.Tracer}.
    */
-  public static io.opentracing.Tracer createTracerShim(OpenTelemetry openTelemetry) {
+  public static Tracer createTracerShim(OpenTelemetry openTelemetry) {
     TextMapPropagator propagator = openTelemetry.getPropagators().getTextMapPropagator();
     return createTracerShim(openTelemetry.getTracerProvider(), propagator, propagator);
   }
@@ -42,7 +43,7 @@ public static io.opentracing.Tracer createTracerShim(OpenTelemetry openTelemetry
    *     io.opentracing.propagation.Format.Builtin#HTTP_HEADERS} format.
    * @return a {@code io.opentracing.Tracer}.
    */
-  public static io.opentracing.Tracer createTracerShim(
+  public static Tracer createTracerShim(
       TracerProvider provider,
       TextMapPropagator textMapPropagator,
       TextMapPropagator httpPropagator) {