Merge pull request #104 from ligangty/otel

Code refinement to remove IDE warnings
Commonjava · Sep 26, 2023 · aea1580 · aea1580
2 parents 9916c19 + 9804e27
commit aea1580
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/trace/api/src/main/java/org/commonjava/o11yphant/trace/TracerConfiguration.java b/trace/api/src/main/java/org/commonjava/o11yphant/trace/TracerConfiguration.java
@@ -19,21 +19,26 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import static org.commonjava.o11yphant.metrics.RequestContextConstants.*;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.CLIENT_ADDR;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.CONTENT_TRACKING_ID;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.HTTP_METHOD;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.HTTP_STATUS;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.PACKAGE_TYPE;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.PATH;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.REQUEST_LATENCY_MILLIS;
+import static org.commonjava.o11yphant.metrics.RequestContextConstants.REST_ENDPOINT_PATH;
 
 public interface TracerConfiguration
 {
     Integer DEFAULT_BASE_SAMPLE_RATE = 100;
 
-    Set<String> DEFAULT_FIELDS = Collections.unmodifiableSet(
-                    new HashSet<>( Arrays.asList( CONTENT_TRACKING_ID, HTTP_METHOD, HTTP_STATUS, CLIENT_ADDR,
-                                                  PATH, PACKAGE_TYPE, REST_ENDPOINT_PATH, REQUEST_LATENCY_MILLIS ) ) );
+    Set<String> DEFAULT_FIELDS =
+            Set.of( CONTENT_TRACKING_ID, HTTP_METHOD, HTTP_STATUS, CLIENT_ADDR, PATH, PACKAGE_TYPE, REST_ENDPOINT_PATH,
+                    REQUEST_LATENCY_MILLIS );
 
     boolean isEnabled();
 

diff --git a/...src/main/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceMeasureInterceptor.java b/...src/main/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceMeasureInterceptor.java
@@ -40,7 +40,6 @@ public class FlatTraceMeasureInterceptor
     @Inject
     private TracerConfiguration config;
 
-    @SuppressWarnings( "rawtypes" )
     @Inject
     private TraceManager traceManager;
 

diff --git a/.../main/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceWrapperEndInterceptor.java b/.../main/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceWrapperEndInterceptor.java
@@ -42,7 +42,6 @@ public class FlatTraceWrapperEndInterceptor
     @Inject
     private TracerConfiguration config;
 
-    @SuppressWarnings( "rawtypes" )
     @Inject
     private TraceManager traceManager;
 

diff --git a/...src/main/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceWrapperInterceptor.java b/...src/main/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceWrapperInterceptor.java
@@ -42,7 +42,6 @@ public class FlatTraceWrapperInterceptor
     @Inject
     private TracerConfiguration config;
 
-    @SuppressWarnings( "rawtypes" )
     @Inject
     private TraceManager traceManager;
 

diff --git a/...ain/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceWrapperStartInterceptor.java b/...ain/java/org/commonjava/o11yphant/trace/interceptor/FlatTraceWrapperStartInterceptor.java
@@ -42,7 +42,6 @@ public class FlatTraceWrapperStartInterceptor
     @Inject
     private TracerConfiguration config;
 
-    @SuppressWarnings( "rawtypes" )
     @Inject
     private TraceManager traceManager;
 

diff --git a/trace/helper-jhttpc/src/main/java/org/commonjava/o11yphant/jhttpc/SpanningHttpFactory.java b/trace/helper-jhttpc/src/main/java/org/commonjava/o11yphant/jhttpc/SpanningHttpFactory.java
@@ -29,7 +29,6 @@
 import java.util.List;
 import java.util.Optional;
 
-@SuppressWarnings( "rawtypes" )
 public class SpanningHttpFactory
                 implements HttpFactoryIfc
 {

diff --git a/trace/helper-servlet/src/main/java/org/commonjava/o11yphant/trace/servlet/TraceFilter.java b/trace/helper-servlet/src/main/java/org/commonjava/o11yphant/trace/servlet/TraceFilter.java
@@ -43,7 +43,6 @@
 public class TraceFilter
         implements Filter
 {
-    @SuppressWarnings( "rawtypes" )
     @Inject
     private TraceManager traceManager;
 

diff --git a/trace/otel/src/main/java/org/commonjava/o11yphant/otel/OtelUtil.java b/trace/otel/src/main/java/org/commonjava/o11yphant/otel/OtelUtil.java
@@ -21,7 +21,6 @@
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.exporter.logging.LoggingSpanExporter;
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ public class FlatTraceMeasureInterceptor @@
         @Inject
         private TracerConfiguration config;
-        @SuppressWarnings( "rawtypes" )
         @Inject
         private TraceManager traceManager;
@@ Expand Down @@