Merge PR #386: [WIP] Update inferred-spans module to follow style guide

Author: trask

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.contrib.inferredspans;
 
+import static java.util.stream.Collectors.toList;
+
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
@@ -17,11 +19,10 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 @AutoService(AutoConfigurationCustomizerProvider.class)
-public class InferredSpansAutoConfig implements AutoConfigurationCustomizerProvider {
+public final class InferredSpansAutoConfig implements AutoConfigurationCustomizerProvider {
 
   private static final Logger log = Logger.getLogger(InferredSpansAutoConfig.class.getName());
 
@@ -117,7 +118,7 @@ void applyWildcards(String configKey, Consumer<? super List<WildcardMatcher>> fu
             Arrays.stream(wildcardListString.split(","))
                 .filter(str -> !str.isEmpty())
                 .map(WildcardMatcher::valueOf)
-                .collect(Collectors.toList());
+                .collect(toList());
         if (!values.isEmpty()) {
           funcToApply.accept(values);
         }

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessor.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.contrib.inferredspans;
 
+import static java.util.Objects.requireNonNull;
+
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
@@ -19,7 +21,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -28,19 +29,17 @@
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
-public class InferredSpansProcessor implements SpanProcessor {
+public final class InferredSpansProcessor implements SpanProcessor {
 
   private static final Logger logger = Logger.getLogger(InferredSpansProcessor.class.getName());
 
   public static final String TRACER_NAME = "inferred-spans";
-
   public static final String TRACER_VERSION = readInferredSpansVersion();
 
   // Visible for testing
   final SamplingProfiler profiler;
 
   private Supplier<TracerProvider> tracerProvider = GlobalOpenTelemetry::getTracerProvider;
-
   @Nullable private volatile Tracer tracer;
 
   InferredSpansProcessor(
@@ -134,7 +133,7 @@ private static String readInferredSpansVersion() {
       Properties properties = new Properties();
       properties.load(is);
       String version = (String) properties.get("contrib.version");
-      Objects.requireNonNull(version);
+      requireNonNull(version);
       return version;
     } catch (IOException e) {
       throw new IllegalStateException(e);

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessorBuilder.java

@@ -5,20 +5,21 @@
 
 package io.opentelemetry.contrib.inferredspans;
 
+import static java.util.Arrays.asList;
+
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.contrib.inferredspans.internal.CallTree;
 import io.opentelemetry.contrib.inferredspans.internal.InferredSpansConfiguration;
 import io.opentelemetry.contrib.inferredspans.internal.SpanAnchoredClock;
 import java.io.File;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.BiConsumer;
 import javax.annotation.Nullable;
 
 @SuppressWarnings("CanIgnoreReturnValueSuggester")
-public class InferredSpansProcessorBuilder {
+public final class InferredSpansProcessorBuilder {
   private boolean profilerLoggingEnabled = true;
   private boolean backupDiagnosticFiles = false;
   private int asyncProfilerSafeMode = 0;
@@ -27,7 +28,7 @@ public class InferredSpansProcessorBuilder {
   private Duration inferredSpansMinDuration = Duration.ZERO;
   private List<WildcardMatcher> includedClasses = WildcardMatcher.matchAllList();
   private List<WildcardMatcher> excludedClasses =
-      Arrays.asList(
+      asList(
           WildcardMatcher.caseSensitiveMatcher("java.*"),
           WildcardMatcher.caseSensitiveMatcher("javax.*"),
           WildcardMatcher.caseSensitiveMatcher("sun.*"),
@@ -43,13 +44,11 @@ public class InferredSpansProcessorBuilder {
           WildcardMatcher.caseSensitiveMatcher("io.undertow.*"));
   private Duration profilerInterval = Duration.ofSeconds(5);
   private Duration profilingDuration = Duration.ofSeconds(5);
-
   @Nullable private String profilerLibDirectory = null;
 
   // The following options are only intended to be modified in tests
   private SpanAnchoredClock clock = new SpanAnchoredClock();
   private boolean startScheduledProfiling = true;
-
   @Nullable private File activationEventsFile = null;
   @Nullable private File jfrFile = null;
   private BiConsumer<SpanBuilder, SpanContext> parentOverrideHandler =

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/WildcardMatcher.java

@@ -5,8 +5,9 @@
 
 package io.opentelemetry.contrib.inferredspans;
 
+import static java.util.Collections.singletonList;
+
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
 
@@ -32,7 +33,7 @@ public abstract class WildcardMatcher {
   private static final String CASE_SENSITIVE_PREFIX = "(?-i)";
   private static final String WILDCARD = "*";
   private static final WildcardMatcher MATCH_ALL = valueOf(WILDCARD);
-  private static final List<WildcardMatcher> MATCH_ALL_LIST = Collections.singletonList(MATCH_ALL);
+  private static final List<WildcardMatcher> MATCH_ALL_LIST = singletonList(MATCH_ALL);
 
   public static WildcardMatcher caseSensitiveMatcher(String matcher) {
     return valueOf(CASE_SENSITIVE_PREFIX + matcher);