Skip to content

Commit 06d085a

Browse files
trasktrask
committed
Enable errorprone's UnnecessarilyFullyQualified
1 parent 3749e03 commit 06d085a

File tree

24 files changed

+72
-56
lines changed

24 files changed

+72
-56
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ tasks {
4545
// Suggests using Guava types for fields but we don't use Guava
4646
disable("ImmutableMemberCollection")
4747

48-
// Fully qualified names may be necessary when deprecating a class to avoid
49-
// deprecation warning.
50-
disable("UnnecessarilyFullyQualified")
51-
5248
// We use animal sniffer
5349
disable("Java8ApiChecker")
5450

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.exporter.internal.marshal;
77

8+
import java.lang.reflect.Method;
89
import java.util.Optional;
910
import java.util.logging.Level;
1011
import java.util.logging.Logger;
@@ -51,7 +52,7 @@ public static StringEncoder createVarHandleEncoder() {
5152
try {
5253
Class<?> varHandleClass =
5354
Class.forName("io.opentelemetry.exporter.internal.marshal.VarHandleStringEncoder");
54-
java.lang.reflect.Method createMethod = varHandleClass.getMethod("createIfAvailable");
55+
Method createMethod = varHandleClass.getMethod("createIfAvailable");
5556
return (StringEncoder) createMethod.invoke(null);
5657
} catch (Throwable t) {
5758
return null;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.exporter.internal.marshal.Serializer;
1212
import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler;
1313
import io.opentelemetry.exporter.internal.marshal.StatelessMarshalerUtil;
14+
import io.opentelemetry.proto.common.v1.internal.AnyValue;
1415
import java.io.IOException;
1516
import java.nio.ByteBuffer;
1617
import java.util.List;
@@ -49,14 +50,14 @@ public void writeTo(Serializer output, Value<?> value, MarshalerContext context)
4950
return;
5051
case ARRAY:
5152
output.serializeMessageWithContext(
52-
io.opentelemetry.proto.common.v1.internal.AnyValue.ARRAY_VALUE,
53+
AnyValue.ARRAY_VALUE,
5354
(List<Value<?>>) value.getValue(),
5455
ArrayAnyValueStatelessMarshaler.INSTANCE,
5556
context);
5657
return;
5758
case KEY_VALUE_LIST:
5859
output.serializeMessageWithContext(
59-
io.opentelemetry.proto.common.v1.internal.AnyValue.KVLIST_VALUE,
60+
AnyValue.KVLIST_VALUE,
6061
(List<KeyValue>) value.getValue(),
6162
KeyValueListAnyValueStatelessMarshaler.INSTANCE,
6263
context);
@@ -92,13 +93,13 @@ public int getBinarySerializedSize(Value<?> value, MarshalerContext context) {
9293
(Double) value.getValue(), context);
9394
case ARRAY:
9495
return StatelessMarshalerUtil.sizeMessageWithContext(
95-
io.opentelemetry.proto.common.v1.internal.AnyValue.ARRAY_VALUE,
96+
AnyValue.ARRAY_VALUE,
9697
(List<Value<?>>) value.getValue(),
9798
ArrayAnyValueStatelessMarshaler.INSTANCE,
9899
context);
99100
case KEY_VALUE_LIST:
100101
return StatelessMarshalerUtil.sizeMessageWithContext(
101-
io.opentelemetry.proto.common.v1.internal.AnyValue.KVLIST_VALUE,
102+
AnyValue.KVLIST_VALUE,
102103
(List<KeyValue>) value.getValue(),
103104
KeyValueListAnyValueStatelessMarshaler.INSTANCE,
104105
context);

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.exporter.internal.marshal.ProtoFieldInfo;
1212
import io.opentelemetry.exporter.internal.marshal.Serializer;
1313
import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler;
14+
import io.opentelemetry.proto.metrics.v1.internal.Exemplar;
1415
import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
1516
import io.opentelemetry.sdk.metrics.data.ExemplarData;
1617
import io.opentelemetry.sdk.metrics.data.LongExemplarData;
@@ -67,20 +68,20 @@ private ExemplarMarshaler(
6768
@Override
6869
public void writeTo(Serializer output) throws IOException {
6970
output.serializeFixed64(
70-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO, timeUnixNano);
71-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
71+
Exemplar.TIME_UNIX_NANO, timeUnixNano);
72+
if (valueField == Exemplar.AS_INT) {
7273
output.serializeFixed64Optional(valueField, ((LongExemplarData) value).getValue());
7374
} else {
7475
output.serializeDoubleOptional(valueField, ((DoubleExemplarData) value).getValue());
7576
}
7677
if (spanContext.isValid()) {
7778
output.serializeSpanId(
78-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
79+
Exemplar.SPAN_ID, spanContext.getSpanId());
7980
output.serializeTraceId(
80-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID, spanContext.getTraceId());
81+
Exemplar.TRACE_ID, spanContext.getTraceId());
8182
}
8283
output.serializeRepeatedMessage(
83-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
84+
Exemplar.FILTERED_ATTRIBUTES,
8485
filteredAttributeMarshalers);
8586
}
8687

@@ -93,34 +94,34 @@ private static int calculateSize(
9394
int size = 0;
9495
size +=
9596
MarshalerUtil.sizeFixed64(
96-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO, timeUnixNano);
97-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
97+
Exemplar.TIME_UNIX_NANO, timeUnixNano);
98+
if (valueField == Exemplar.AS_INT) {
9899
size += MarshalerUtil.sizeFixed64Optional(valueField, ((LongExemplarData) value).getValue());
99100
} else {
100101
size += MarshalerUtil.sizeDoubleOptional(valueField, ((DoubleExemplarData) value).getValue());
101102
}
102103
if (spanContext.isValid()) {
103104
size +=
104105
MarshalerUtil.sizeSpanId(
105-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
106+
Exemplar.SPAN_ID, spanContext.getSpanId());
106107
size +=
107108
MarshalerUtil.sizeTraceId(
108-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
109+
Exemplar.TRACE_ID,
109110
spanContext.getTraceId());
110111
}
111112
size +=
112113
MarshalerUtil.sizeRepeatedMessage(
113-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
114+
Exemplar.FILTERED_ATTRIBUTES,
114115
filteredAttributeMarshalers);
115116
return size;
116117
}
117118

118119
static ProtoFieldInfo toProtoExemplarValueType(ExemplarData exemplar) {
119120
if (exemplar instanceof LongExemplarData) {
120-
return io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT;
121+
return Exemplar.AS_INT;
121122
} else {
122123
assert exemplar instanceof DoubleExemplarData;
123-
return io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_DOUBLE;
124+
return Exemplar.AS_DOUBLE;
124125
}
125126
}
126127
}

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.opentelemetry.exporter.internal.marshal.StatelessMarshaler;
1616
import io.opentelemetry.exporter.internal.marshal.StatelessMarshalerUtil;
1717
import io.opentelemetry.exporter.internal.otlp.AttributeKeyValueStatelessMarshaler;
18+
import io.opentelemetry.proto.metrics.v1.internal.Exemplar;
1819
import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
1920
import io.opentelemetry.sdk.metrics.data.ExemplarData;
2021
import io.opentelemetry.sdk.metrics.data.LongExemplarData;
@@ -30,27 +31,27 @@ private ExemplarStatelessMarshaler() {}
3031
public void writeTo(Serializer output, ExemplarData exemplar, MarshalerContext context)
3132
throws IOException {
3233
output.serializeFixed64(
33-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO,
34+
Exemplar.TIME_UNIX_NANO,
3435
exemplar.getEpochNanos());
3536
ProtoFieldInfo valueField = toProtoExemplarValueType(exemplar);
36-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
37+
if (valueField == Exemplar.AS_INT) {
3738
output.serializeFixed64Optional(valueField, ((LongExemplarData) exemplar).getValue());
3839
} else {
3940
output.serializeDoubleOptional(valueField, ((DoubleExemplarData) exemplar).getValue());
4041
}
4142
SpanContext spanContext = exemplar.getSpanContext();
4243
if (spanContext.isValid()) {
4344
output.serializeSpanId(
44-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID,
45+
Exemplar.SPAN_ID,
4546
spanContext.getSpanId(),
4647
context);
4748
output.serializeTraceId(
48-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
49+
Exemplar.TRACE_ID,
4950
spanContext.getTraceId(),
5051
context);
5152
}
5253
output.serializeRepeatedMessageWithContext(
53-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
54+
Exemplar.FILTERED_ATTRIBUTES,
5455
exemplar.getFilteredAttributes(),
5556
AttributeKeyValueStatelessMarshaler.INSTANCE,
5657
context);
@@ -61,10 +62,10 @@ public int getBinarySerializedSize(ExemplarData exemplar, MarshalerContext conte
6162
int size = 0;
6263
size +=
6364
MarshalerUtil.sizeFixed64(
64-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TIME_UNIX_NANO,
65+
Exemplar.TIME_UNIX_NANO,
6566
exemplar.getEpochNanos());
6667
ProtoFieldInfo valueField = toProtoExemplarValueType(exemplar);
67-
if (valueField == io.opentelemetry.proto.metrics.v1.internal.Exemplar.AS_INT) {
68+
if (valueField == Exemplar.AS_INT) {
6869
size +=
6970
MarshalerUtil.sizeFixed64Optional(valueField, ((LongExemplarData) exemplar).getValue());
7071
} else {
@@ -75,15 +76,15 @@ public int getBinarySerializedSize(ExemplarData exemplar, MarshalerContext conte
7576
if (spanContext.isValid()) {
7677
size +=
7778
MarshalerUtil.sizeSpanId(
78-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.SPAN_ID, spanContext.getSpanId());
79+
Exemplar.SPAN_ID, spanContext.getSpanId());
7980
size +=
8081
MarshalerUtil.sizeTraceId(
81-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.TRACE_ID,
82+
Exemplar.TRACE_ID,
8283
spanContext.getTraceId());
8384
}
8485
size +=
8586
StatelessMarshalerUtil.sizeRepeatedMessageWithContext(
86-
io.opentelemetry.proto.metrics.v1.internal.Exemplar.FILTERED_ATTRIBUTES,
87+
Exemplar.FILTERED_ATTRIBUTES,
8788
exemplar.getFilteredAttributes(),
8889
AttributeKeyValueStatelessMarshaler.INSTANCE,
8990
context);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.grpc.ManagedChannelBuilder;
1212
import io.grpc.netty.GrpcSslContexts;
1313
import io.grpc.netty.NettyChannelBuilder;
14+
import io.grpc.okhttp.OkHttpChannelBuilder;
1415
import io.netty.handler.ssl.SslContext;
1516
import io.opentelemetry.api.metrics.MeterProvider;
1617
import io.opentelemetry.common.ComponentLoader;
@@ -286,8 +287,8 @@ private static void setSslContext(
286287
if (sslContext == null) {
287288
return;
288289
}
289-
io.grpc.okhttp.OkHttpChannelBuilder okHttpBuilder =
290-
(io.grpc.okhttp.OkHttpChannelBuilder) managedChannelBuilder;
290+
OkHttpChannelBuilder okHttpBuilder =
291+
(OkHttpChannelBuilder) managedChannelBuilder;
291292
okHttpBuilder.sslSocketFactory(sslContext.getSocketFactory());
292293
break;
293294
default:

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import okhttp3.OkHttpClient;
3838
import okhttp3.Request;
3939
import okhttp3.RequestBody;
40+
import okhttp3.Response;
4041
import okhttp3.ResponseBody;
4142
import okio.BufferedSink;
4243
import okio.Okio;
@@ -139,7 +140,7 @@ public void onFailure(Call call, IOException e) {
139140
}
140141

141142
@Override
142-
public void onResponse(Call call, okhttp3.Response response) {
143+
public void onResponse(Call call, Response response) {
143144
try (ResponseBody body = response.body()) {
144145
onResponse.accept(
145146
new HttpResponse() {
@@ -183,7 +184,7 @@ public CompletableResultCode shutdown() {
183184
return CompletableResultCode.ofSuccess();
184185
}
185186

186-
static boolean isRetryable(okhttp3.Response response) {
187+
static boolean isRetryable(Response response) {
187188
return RetryUtil.retryableHttpResponseCodes().contains(response.code());
188189
}
189190

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import zipkin2.Span;
2121
import zipkin2.reporter.BytesEncoder;
2222
import zipkin2.reporter.BytesMessageSender;
23+
import zipkin2.reporter.Sender;
2324
import zipkin2.reporter.SpanBytesEncoder;
2425
import zipkin2.reporter.okhttp3.OkHttpSender;
2526

@@ -55,7 +56,7 @@ public final class ZipkinSpanExporterBuilder {
5556
* @deprecated Use {@link #setSender(BytesMessageSender)} insteead.
5657
*/
5758
@Deprecated
58-
public ZipkinSpanExporterBuilder setSender(zipkin2.reporter.Sender sender) {
59+
public ZipkinSpanExporterBuilder setSender(Sender sender) {
5960
return setSender((BytesMessageSender) sender);
6061
}
6162

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import io.opentelemetry.proto.common.v1.AnyValue;
5151
import io.opentelemetry.proto.common.v1.ArrayValue;
5252
import io.opentelemetry.proto.common.v1.KeyValueList;
53+
import io.opentelemetry.proto.logs.v1.LogRecord;
5354
import io.opentelemetry.proto.logs.v1.ResourceLogs;
5455
import io.opentelemetry.proto.logs.v1.ScopeLogs;
5556
import io.opentelemetry.proto.metrics.v1.AggregationTemporality;
@@ -689,7 +690,7 @@ private static void testLogRecordExporter(LogRecordExporter logRecordExporter) {
689690
assertThat(ilLogs.getLogRecordsCount()).isEqualTo(1);
690691

691692
// LogRecord via Logger.logRecordBuilder()...emit()
692-
io.opentelemetry.proto.logs.v1.LogRecord protoLog1 = ilLogs.getLogRecords(0);
693+
LogRecord protoLog1 = ilLogs.getLogRecords(0);
693694
assertThat(protoLog1.getEventName()).isEqualTo("event name");
694695
assertThat(protoLog1.getBody())
695696
.isEqualTo(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public String serve(RequestHeaders headers, List<Request> requests) {
8787
.getTextMapPropagator()
8888
.extract(Context.current(), headers, ArmeriaGetter.INSTANCE);
8989

90-
for (io.opentelemetry.Request req : requests) {
90+
for (Request req : requests) {
9191
Span span =
9292
openTelemetry
9393
.getTracer("validation-server")

0 commit comments

Comments
 (0)