diff options
| author | Kristen Kozak <sebright@google.com> | 2017-11-13 19:03:58 -0800 |
|---|---|---|
| committer | Kristen Kozak <sebright@google.com> | 2017-11-13 19:54:33 -0800 |
| commit | d80e6de38c6959aac5736634ca3950101b3392bd (patch) | |
| tree | 0f96068dfe9a8cf526f72af5f570e9cc0841c6d6 | |
| parent | c39d244ca356ee2bbbb9a2eaf7323d3d468dbee7 (diff) | |
| download | opencensus-java-d80e6de38c6959aac5736634ca3950101b3392bd.tar.gz | |
Enable new InconsistentOverloads Error Prone experimental warning.
This commit also fixes two occurrences.
| -rw-r--r-- | gradle/errorprone/experimental_warnings | 1 | ||||
| -rw-r--r-- | impl_core/src/main/java/io/opencensus/implcore/trace/export/SampledSpanStoreImpl.java | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gradle/errorprone/experimental_warnings b/gradle/errorprone/experimental_warnings index 30ff6540..a5a45f4b 100644 --- a/gradle/errorprone/experimental_warnings +++ b/gradle/errorprone/experimental_warnings @@ -6,6 +6,7 @@ errorProneExperimentalWarnings = \ -Xep:EmptyTopLevelDeclaration:ERROR,\ -Xep:ExpectedExceptionChecker:ERROR,\ -Xep:HardCodedSdCardPath:ERROR,\ +-Xep:InconsistentOverloads:ERROR,\ -Xep:MissingDefault:OFF,\ -Xep:NonCanonicalStaticMemberImport:ERROR,\ -Xep:PrimitiveArrayPassedToVarargsMethod:ERROR,\ diff --git a/impl_core/src/main/java/io/opencensus/implcore/trace/export/SampledSpanStoreImpl.java b/impl_core/src/main/java/io/opencensus/implcore/trace/export/SampledSpanStoreImpl.java index e0f9b832..60b1433c 100644 --- a/impl_core/src/main/java/io/opencensus/implcore/trace/export/SampledSpanStoreImpl.java +++ b/impl_core/src/main/java/io/opencensus/implcore/trace/export/SampledSpanStoreImpl.java @@ -91,12 +91,12 @@ public final class SampledSpanStoreImpl extends SampledSpanStore { } private void getSamples(int maxSpansToReturn, List<SpanImpl> output) { - getSamples(sampledSpansQueue, maxSpansToReturn, output); - getSamples(notSampledSpansQueue, maxSpansToReturn, output); + getSamples(maxSpansToReturn, output, sampledSpansQueue); + getSamples(maxSpansToReturn, output, notSampledSpansQueue); } private static void getSamples( - EvictingQueue<SpanImpl> queue, int maxSpansToReturn, List<SpanImpl> output) { + int maxSpansToReturn, List<SpanImpl> output, EvictingQueue<SpanImpl> queue) { for (SpanImpl span : queue) { if (output.size() >= maxSpansToReturn) { break; @@ -108,17 +108,17 @@ public final class SampledSpanStoreImpl extends SampledSpanStore { private void getSamplesFilteredByLatency( long latencyLowerNs, long latencyUpperNs, int maxSpansToReturn, List<SpanImpl> output) { getSamplesFilteredByLatency( - sampledSpansQueue, latencyLowerNs, latencyUpperNs, maxSpansToReturn, output); + latencyLowerNs, latencyUpperNs, maxSpansToReturn, output, sampledSpansQueue); getSamplesFilteredByLatency( - notSampledSpansQueue, latencyLowerNs, latencyUpperNs, maxSpansToReturn, output); + latencyLowerNs, latencyUpperNs, maxSpansToReturn, output, notSampledSpansQueue); } private static void getSamplesFilteredByLatency( - EvictingQueue<SpanImpl> queue, long latencyLowerNs, long latencyUpperNs, int maxSpansToReturn, - List<SpanImpl> output) { + List<SpanImpl> output, + EvictingQueue<SpanImpl> queue) { for (SpanImpl span : queue) { if (output.size() >= maxSpansToReturn) { break; |