open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce usage of errorprone annotations to MustBeClosed. (#2898)

This commit is contained in:
Anuraag Agrawal 2021-02-21 04:43:59 +09:00 committed by GitHub
parent 5f8b6c9dbe
commit 77e8f71480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java
View File

@ -5,7 +5,6 @@
package io.opentelemetry.api; package io.opentelemetry.api;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.api.trace.TracerProvider; import io.opentelemetry.api.trace.TracerProvider;
import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.ContextPropagators;
@ -14,6 +13,7 @@ import java.lang.reflect.Method;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
/** /**

3
api/context/build.gradle.kts
View File

@ -34,6 +34,9 @@ dependencies {
add("strictContextEnabledTestImplementation", project(":api:all")) add("strictContextEnabledTestImplementation", project(":api:all"))
// MustBeClosed
compileOnly("com.google.errorprone:error_prone_annotations")
testImplementation("org.awaitility:awaitility") testImplementation("org.awaitility:awaitility")
testImplementation("com.google.guava:guava") testImplementation("com.google.guava:guava")
testImplementation("org.junit-pioneer:junit-pioneer") testImplementation("org.junit-pioneer:junit-pioneer")

1
build.gradle.kts
View File

@ -312,7 +312,6 @@ subprojects {
} }
add(COMPILE_ONLY_CONFIGURATION_NAME, "com.google.auto.value:auto-value-annotations") add(COMPILE_ONLY_CONFIGURATION_NAME, "com.google.auto.value:auto-value-annotations")
add(COMPILE_ONLY_CONFIGURATION_NAME, "com.google.errorprone:error_prone_annotations")
add(COMPILE_ONLY_CONFIGURATION_NAME, "com.google.code.findbugs:jsr305") add(COMPILE_ONLY_CONFIGURATION_NAME, "com.google.code.findbugs:jsr305")
add(TEST_COMPILE_ONLY_CONFIGURATION_NAME, "com.google.auto.value:auto-value-annotations") add(TEST_COMPILE_ONLY_CONFIGURATION_NAME, "com.google.auto.value:auto-value-annotations")

3
sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/MetricsTestOperationBuilder.java
View File

@ -5,7 +5,6 @@
package io.opentelemetry.sdk.metrics; package io.opentelemetry.sdk.metrics;
import com.google.errorprone.annotations.Immutable;
import io.opentelemetry.api.metrics.BoundDoubleCounter; import io.opentelemetry.api.metrics.BoundDoubleCounter;
import io.opentelemetry.api.metrics.BoundDoubleValueRecorder; import io.opentelemetry.api.metrics.BoundDoubleValueRecorder;
import io.opentelemetry.api.metrics.BoundLongCounter; import io.opentelemetry.api.metrics.BoundLongCounter;
@ -23,6 +22,7 @@ import io.opentelemetry.api.metrics.common.Labels;
* return a wrapper for both bound and unbound versions of that operation which can then be used in * return a wrapper for both bound and unbound versions of that operation which can then be used in
* a benchmark. * a benchmark.
*/ */
@SuppressWarnings("ImmutableEnumChecker")
public enum MetricsTestOperationBuilder { public enum MetricsTestOperationBuilder {
LongCounterAdd( LongCounterAdd(
meter -> { meter -> {
@ -121,7 +121,6 @@ public enum MetricsTestOperationBuilder {
return this.builder.build(meter); return this.builder.build(meter);
} }
@Immutable
private interface OperationBuilder { private interface OperationBuilder {
Operation build(Meter meter); Operation build(Meter meter);
} }

3
sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java
View File

@ -5,13 +5,13 @@
package io.opentelemetry.sdk.metrics; package io.opentelemetry.sdk.metrics;
import com.google.errorprone.annotations.Immutable;
import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
import io.opentelemetry.sdk.internal.SystemClock; import io.opentelemetry.sdk.internal.SystemClock;
import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.Resource;
@SuppressWarnings("ImmutableEnumChecker")
public enum TestSdk { public enum TestSdk {
API_ONLY( API_ONLY(
new SdkBuilder() { new SdkBuilder() {
@ -43,7 +43,6 @@ public enum TestSdk {
return sdkBuilder.build(); return sdkBuilder.build();
} }
@Immutable
private abstract static class SdkBuilder { private abstract static class SdkBuilder {
abstract Meter build(); abstract Meter build();
} }

2
sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/DoubleMinMaxSumCountAggregator.java
View File

@ -5,11 +5,11 @@
package io.opentelemetry.sdk.metrics.aggregator; package io.opentelemetry.sdk.metrics.aggregator;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor;
import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.Resource;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe @ThreadSafe

2
sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/aggregator/LongMinMaxSumCountAggregator.java
View File

@ -5,11 +5,11 @@
package io.opentelemetry.sdk.metrics.aggregator; package io.opentelemetry.sdk.metrics.aggregator;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor;
import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.Resource;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe @ThreadSafe