Fix errorprone errors and re-enable errorprone for jmh (open-telemetr…

…y#887)

Signed-off-by: Bogdan Cristian Drutu <[email protected]>

api/src/jmh/java/io/opentelemetry/trace/propagation/HttpTraceContextExtractBenchmark.java

@@ -20,7 +20,6 @@
 import io.opentelemetry.trace.SpanContext;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -39,28 +38,28 @@
 @State(Scope.Thread)
 public class HttpTraceContextExtractBenchmark {
 
- private String traceparent = "traceparent";
- private HttpTraceContext httpTraceContext = new HttpTraceContext();
- private Map<String, String> carrier = new LinkedHashMap<>();
- private Getter<Map<String, String>> getter =
- new Getter<Map<String, String>>() {
- @Override
- public String get(Map<String, String> carrier, String key) {
- return carrier.get(key);
- }
- };
- private List<String> traceparentsHeaders =
+ private static final String TRACEPARENT = "traceparent";
+ private static final List<String> traceparentsHeaders =
  Arrays.asList(
  "00-905734c59b913b4a905734c59b913b4a-9909983295041501-01",
  "00-21196a77f299580e21196a77f299580e-993a97ee3691eb26-00",
  "00-2e7d0ad2390617702e7d0ad239061770-d49582a2de984b86-01",
  "00-905734c59b913b4a905734c59b913b4a-776ff807b787538a-00",
  "00-68ec932c33b3f2ee68ec932c33b3f2ee-68ec932c33b3f2ee-00");
+ private final HttpTraceContext httpTraceContext = new HttpTraceContext();
+ private final Map<String, String> carrier = new HashMap<>();
+ private final Getter<Map<String, String>> getter =
+ new Getter<Map<String, String>>() {
+ @Override
+ public String get(Map<String, String> carrier, String key) {
+ return carrier.get(key);
+ }
+ };
  private Integer iteration = 0;
 
  @Setup
  public void setup() {
- carrier.put(traceparent, traceparentsHeaders.get(0));
+ carrier.put(TRACEPARENT, traceparentsHeaders.get(0));
  }
 
  @Benchmark
@@ -74,8 +73,7 @@ public SpanContext measureExtract() {
 
  @TearDown(Level.Iteration)
  public void tearDown() {
- this.carrier = new HashMap<>();
  this.carrier.put(
- traceparent, traceparentsHeaders.get(++iteration % traceparentsHeaders.size()));
+ TRACEPARENT, traceparentsHeaders.get(++iteration % traceparentsHeaders.size()));
  }
 }

api/src/jmh/java/io/opentelemetry/trace/propagation/HttpTraceContextInjectBenchmark.java

@@ -23,7 +23,7 @@
 import io.opentelemetry.trace.TraceId;
 import io.opentelemetry.trace.TraceState;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -34,39 +34,32 @@
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 
 @State(Scope.Thread)
 public class HttpTraceContextInjectBenchmark {
 
- private HttpTraceContext httpTraceContext;
- private Map<String, String> carrier;
- private Setter<Map<String, String>> setter =
- new Setter<Map<String, String>>() {
- @Override
- public void set(Map<String, String> carrier, String key, String value) {
- carrier.put(key, value);
- }
- };
- private List<SpanContext> spanContexts =
+ private static final List<SpanContext> spanContexts =
  Arrays.asList(
  createTestSpanContext("905734c59b913b4a905734c59b913b4a", "9909983295041501"),
  createTestSpanContext("21196a77f299580e21196a77f299580e", "993a97ee3691eb26"),
  createTestSpanContext("2e7d0ad2390617702e7d0ad239061770", "d49582a2de984b86"),
  createTestSpanContext("905734c59b913b4a905734c59b913b4a", "776ff807b787538a"),
  createTestSpanContext("68ec932c33b3f2ee68ec932c33b3f2ee", "68ec932c33b3f2ee"));
+ private final HttpTraceContext httpTraceContext = new HttpTraceContext();
+ private final Map<String, String> carrier = new HashMap<>();
+ private final Setter<Map<String, String>> setter =
+ new Setter<Map<String, String>>() {
+ @Override
+ public void set(Map<String, String> carrier, String key, String value) {
+ carrier.put(key, value);
+ }
+ };
  private Integer iteration = 0;
  private SpanContext contextToTest = spanContexts.get(iteration);
 
- @Setup
- public void setup() {
- this.httpTraceContext = new HttpTraceContext();
- this.carrier = new LinkedHashMap<>();
- }
-
  /** Benchmark for measuring inject with default trace state and sampled trace options. */
  @Benchmark
  @BenchmarkMode({Mode.Throughput, Mode.AverageTime})
@@ -83,7 +76,7 @@ public void tearDown() {
  this.contextToTest = spanContexts.get(++iteration % spanContexts.size());
  }
 
- private SpanContext createTestSpanContext(String traceId, String spanId) {
+ private static SpanContext createTestSpanContext(String traceId, String spanId) {
  byte sampledTraceOptionsBytes = 1;
  TraceFlags sampledTraceOptions = TraceFlags.fromByte(sampledTraceOptionsBytes);
  TraceState traceStateDefault = TraceState.builder().build();

build.gradle

@@ -83,7 +83,7 @@ subprojects {
  it.options.errorprone.excludedPaths = ".*generated.*" // "-XepExcludedPaths:.*/build/generated/source/proto/.*"
 
  // Enforce errorprone warnings to be errors.
- if (!JavaVersion.current().isJava9() && !JavaVersion.current().isJava10() && !JavaVersion.current().isJava11() && it != compileJmhJava) {
+ if (!JavaVersion.current().isJava9() && !JavaVersion.current().isJava10() && !JavaVersion.current().isJava11()) {
  // TODO: Enable -Werror for Java 9+
  it.options.compilerArgs += ["-Werror"]
  }