aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristen Kozak <sebright@google.com>2017-11-10 18:28:44 -0800
committerKristen Kozak <sebright@google.com>2017-11-12 22:12:46 -0800
commitba78379bcf98d4a5a1ee7a3230b5a25f27356edf (patch)
tree0ee513cfbadcf115270f9be63ead828716265c65
parent33937d32f76703927182ab18f484a1de58a3e0cd (diff)
downloadopencensus-java-ba78379bcf98d4a5a1ee7a3230b5a25f27356edf.tar.gz
com.google.errorprone:error_prone_core: 2.0.19 -> 2.1.2
Other changes: - Remove references to warnings that were removed from Error Prone. - Suppress occurrences of a new warning, JdkObsolete. All of the warnings are about uses of LinkedList. We need to decide whether to use a different class or continue suppressing the warnings. I left TODOs, since each occurrence may need to be handled differently.
-rw-r--r--api/src/test/java/io/opencensus/trace/export/SpanDataTest.java10
-rw-r--r--build.gradle5
-rw-r--r--gradle/errorprone/experimental_errors2
-rw-r--r--gradle/errorprone/experimental_warnings1
-rw-r--r--gradle/errorprone/warnings3
-rw-r--r--impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java7
-rw-r--r--impl_core/src/main/java/io/opencensus/implcore/trace/export/SpanExporterImpl.java2
-rw-r--r--testing/src/main/java/io/opencensus/testing/export/TestHandler.java2
8 files changed, 24 insertions, 8 deletions
diff --git a/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java b/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
index cb962121..ab8d8067 100644
--- a/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
+++ b/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
@@ -68,11 +68,21 @@ public class SpanDataTest {
TraceId.generateRandomId(random), SpanId.generateRandomId(random), TraceOptions.DEFAULT);
private final SpanId parentSpanId = SpanId.generateRandomId(random);
private final Map<String, AttributeValue> attributesMap = new HashMap<String, AttributeValue>();
+
+ // TODO: Decide whether to use a different class instead of LinkedList.
+ @SuppressWarnings("JdkObsolete")
private final List<TimedEvent<Annotation>> annotationsList =
new LinkedList<TimedEvent<Annotation>>();
+
+ // TODO: Decide whether to use a different class instead of LinkedList.
+ @SuppressWarnings("JdkObsolete")
private final List<TimedEvent<NetworkEvent>> networkEventsList =
new LinkedList<SpanData.TimedEvent<NetworkEvent>>();
+
+ // TODO: Decide whether to use a different class instead of LinkedList.
+ @SuppressWarnings("JdkObsolete")
private final List<Link> linksList = new LinkedList<Link>();
+
private Attributes attributes;
private TimedEvents<Annotation> annotations;
private TimedEvents<NetworkEvent> networkEvents;
diff --git a/build.gradle b/build.gradle
index fb83ddd8..9b37775d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -107,6 +107,7 @@ subprojects {
ext {
autoValueVersion = '1.4'
findBugsVersion = '3.0.1'
+ errorProneVersion = '2.1.2'
grpcVersion = '1.7.0'
guavaVersion = '19.0'
googleAuthVersion = '0.8.0'
@@ -118,7 +119,7 @@ subprojects {
auto_service: 'com.google.auto.service:auto-service:1.0-rc3',
byte_buddy: 'net.bytebuddy:byte-buddy:1.7.8',
disruptor: 'com.lmax:disruptor:3.3.6',
- errorprone: 'com.google.errorprone:error_prone_annotations:2.0.19',
+ errorprone: "com.google.errorprone:error_prone_annotations:${errorProneVersion}",
findbugs_annotations: "com.google.code.findbugs:annotations:${findBugsVersion}",
google_auth: "com.google.auth:google-auth-library-credentials:${googleAuthVersion}",
google_cloud_trace: "com.google.cloud:google-cloud-trace:${googleCloudVersion}",
@@ -150,7 +151,7 @@ subprojects {
if (JavaVersion.current().isJava8Compatible()) {
// The ErrorProne plugin defaults to the latest, which would break our
// build if error prone releases a new version with a new check
- errorprone 'com.google.errorprone:error_prone_core:2.0.19'
+ errorprone "com.google.errorprone:error_prone_core:${errorProneVersion}"
}
}
diff --git a/gradle/errorprone/experimental_errors b/gradle/errorprone/experimental_errors
index 58fa533e..eabbb37c 100644
--- a/gradle/errorprone/experimental_errors
+++ b/gradle/errorprone/experimental_errors
@@ -1,5 +1,4 @@
errorProneExperimentalErrors = \
--Xep:ArgumentParameterSwap:ERROR,\
-Xep:AssistedInjectAndInjectOnSameConstructor:ERROR,\
-Xep:AutoFactoryAtInject:ERROR,\
-Xep:ClassName:ERROR,\
@@ -22,6 +21,5 @@ errorProneExperimentalErrors = \
-Xep:NumericEquality:ERROR,\
-Xep:ParameterPackage:OFF,\
-Xep:ProtoStringFieldReferenceEquality:ERROR,\
--Xep:QualifierOnMethodWithoutProvides:ERROR,\
-Xep:StaticOrDefaultInterfaceMethod:ERROR,\
-Xep:UnlockMethod:ERROR
diff --git a/gradle/errorprone/experimental_warnings b/gradle/errorprone/experimental_warnings
index 296a65b3..30ff6540 100644
--- a/gradle/errorprone/experimental_warnings
+++ b/gradle/errorprone/experimental_warnings
@@ -1,5 +1,4 @@
errorProneExperimentalWarnings = \
--Xep:ArgumentParameterMismatch:OFF,\
-Xep:AssertFalse:ERROR,\
-Xep:AssistedInjectAndInjectOnConstructors:ERROR,\
-Xep:BigDecimalLiteralDouble:ERROR,\
diff --git a/gradle/errorprone/warnings b/gradle/errorprone/warnings
index 25baaf06..fe8182ef 100644
--- a/gradle/errorprone/warnings
+++ b/gradle/errorprone/warnings
@@ -8,7 +8,6 @@ errorProneWarnings = \
-Xep:ClassNewInstance:ERROR,\
-Xep:DefaultCharset:ERROR,\
-Xep:DoubleCheckedLocking:ERROR,\
--Xep:ElementsCountedInLoop:ERROR,\
-Xep:EqualsHashCode:ERROR,\
-Xep:EqualsIncompatibleType:ERROR,\
-Xep:Finally:ERROR,-Xep:FloatingPointLiteralPrecision:ERROR,\
@@ -25,11 +24,9 @@ errorProneWarnings = \
-Xep:IterableAndIterator:ERROR,\
-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR,\
-Xep:JUnitAmbiguousTestClass:ERROR,\
--Xep:LiteralClassName:ERROR,\
-Xep:MissingFail:ERROR,\
-Xep:MissingOverride:ERROR,\
-Xep:MutableConstantField:ERROR,\
--Xep:NarrowingCompoundAssignment:ERROR,\
-Xep:NonAtomicVolatileUpdate:ERROR,\
-Xep:NonOverridingEquals:ERROR,\
-Xep:NullableConstructor:ERROR,\
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
index 1347a721..f99f993b 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
@@ -282,7 +282,10 @@ abstract class MutableViewData {
// TODO(songya): allow customizable bucket size in the future.
private static final int N = 4; // IntervalView has N + 1 buckets
+ // TODO(sebright): Decide whether to use a different class instead of LinkedList.
+ @SuppressWarnings("JdkObsolete")
private final LinkedList<IntervalBucket> buckets = new LinkedList<IntervalBucket>();
+
private final Duration totalDuration; // Duration of the whole interval.
private final Duration bucketDuration; // Duration of a single bucket (totalDuration / N)
@@ -385,7 +388,11 @@ abstract class MutableViewData {
// tag values to aggregation data.
private Map<List<TagValue>, AggregationData> combineBucketsAndGetAggregationMap(Timestamp now) {
Multimap<List<TagValue>, MutableAggregation> multimap = HashMultimap.create();
+
+ // TODO(sebright): Decide whether to use a different class instead of LinkedList.
+ @SuppressWarnings("JdkObsolete")
LinkedList<IntervalBucket> shallowCopy = new LinkedList<IntervalBucket>(buckets);
+
Aggregation aggregation = super.view.getAggregation();
putBucketsIntoMultiMap(shallowCopy, multimap, aggregation, now);
Map<List<TagValue>, MutableAggregation> singleMap =
diff --git a/impl_core/src/main/java/io/opencensus/implcore/trace/export/SpanExporterImpl.java b/impl_core/src/main/java/io/opencensus/implcore/trace/export/SpanExporterImpl.java
index c7664ecc..13eee9da 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/trace/export/SpanExporterImpl.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/trace/export/SpanExporterImpl.java
@@ -138,6 +138,8 @@ public final class SpanExporterImpl extends SpanExporter {
}
}
+ // TODO: Decide whether to use a different class instead of LinkedList.
+ @SuppressWarnings("JdkObsolete")
private WorkerThread(int bufferSize, long scheduleDelayMillis) {
spans = new LinkedList<SpanImpl>();
this.bufferSize = bufferSize;
diff --git a/testing/src/main/java/io/opencensus/testing/export/TestHandler.java b/testing/src/main/java/io/opencensus/testing/export/TestHandler.java
index 4d745230..221a9b3e 100644
--- a/testing/src/main/java/io/opencensus/testing/export/TestHandler.java
+++ b/testing/src/main/java/io/opencensus/testing/export/TestHandler.java
@@ -29,7 +29,9 @@ public final class TestHandler extends SpanExporter.Handler {
private final Object monitor = new Object();
+ // TODO: Decide whether to use a different class instead of LinkedList.
@GuardedBy("monitor")
+ @SuppressWarnings("JdkObsolete")
private final List<SpanData> spanDataList = new LinkedList<SpanData>();
@Override