Review fixes for camel-2.20:javaagent

Automated code review of instrumentation/camel-2.20/javaagent.

Author: otelbot[bot]

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camel/v2_20/ActiveContextManager.java

@@ -84,7 +84,11 @@ private static class ContextWithScope {
     private final CamelRequest request;
     @Nullable private final Scope scope;
 
-    ContextWithScope(ContextWithScope parent, Context context, CamelRequest request, Scope scope) {
+    ContextWithScope(
+        @Nullable ContextWithScope parent,
+        @Nullable Context context,
+        CamelRequest request,
+        @Nullable Scope scope) {
       this.parent = parent;
       this.context = context;
       this.request = request;
@@ -97,11 +101,12 @@ static ContextWithScope activate(
       return new ContextWithScope(parent, context, request, scope);
     }
 
+    @Nullable
     ContextWithScope getParent() {
       return parent;
     }
 
-    void deactivate(Exception exception) {
+    void deactivate(@Nullable Exception exception) {
       if (scope == null) {
         return;
       }

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camel/v2_20/decorators/DecoratorRegistry.java

@@ -12,8 +12,8 @@
 
 public class DecoratorRegistry {
 
-  private static final SpanDecorator DEFAULT = new BaseSpanDecorator();
-  private static final Map<String, SpanDecorator> DECORATORS = loadDecorators();
+  private static final SpanDecorator defaultDecorator = new BaseSpanDecorator();
+  private static final Map<String, SpanDecorator> decorators = loadDecorators();
 
   private static Map<String, SpanDecorator> loadDecorators() {
     Map<String, SpanDecorator> result = new HashMap<>();
@@ -64,6 +64,6 @@ private static Map<String, SpanDecorator> loadDecorators() {
 
   public SpanDecorator forComponent(String component) {
 
-    return DECORATORS.getOrDefault(component, DEFAULT);
+    return decorators.getOrDefault(component, defaultDecorator);
   }
 }

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/camel/v2_20/decorators/RestSpanDecorator.java

@@ -28,13 +28,15 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.logging.Logger;
+import javax.annotation.Nullable;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 
 class RestSpanDecorator extends HttpSpanDecorator {
 
   private static final Logger logger = Logger.getLogger(RestSpanDecorator.class.getName());
 
+  @Nullable
   @Override
   protected String getPath(Exchange exchange, Endpoint endpoint) {
     String endpointUri = endpoint.getEndpointUri();

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/camel/v2_20/TwoServicesWithDirectClientCamelTest.java

@@ -77,8 +77,11 @@ protected void setUp() {
   }
 
   @AfterAll
-  protected void cleanUp() {
+  protected void cleanUp() throws Exception {
     cleanupServer();
+    if (clientContext != null) {
+      clientContext.stop();
+    }
   }
 
   void createAndStartClient() throws Exception {