Rename apache-pulsar to pulsar and apache-camel to camel (#8195)

Closes #8004
open-telemetry · Apr 3, 2023 · b01996e · b01996e
1 parent 8704510
commit b01996e
Show file tree

Hide file tree

Showing 77 changed files with 62 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1272,7 +1272,7 @@ The `opentelemetry-instrumentation-api` artifact is declared stable in this rele
 
 - Renamed Apache Dubbo and Log4j MDC library artifacts
   ([#4779](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/4779))
-- Added http4 handler to apache-camel instrumentation
+- Added http4 handler to camel instrumentation
   ([#4650](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/4650))
 - Capture servlet request parameters
   ([#4703](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/4703))

diff --git a/instrumentation/apache-camel-2.20/README.md b/instrumentation/apache-camel-2.20/README.md
diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/README.md b/instrumentation/apache-pulsar/apache-pulsar-2.8/README.md
diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts b/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts
diff --git a/instrumentation/camel-2.20/README.md b/instrumentation/camel-2.20/README.md
@@ -0,0 +1,5 @@
+# Settings for the Apache Camel instrumentation
+
+| System property | Type | Default | Description |
+|---|---|---|---|
+| `otel.instrumentation.camel.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes.  |
diff --git a/....20/javaagent-unit-tests/build.gradle.kts → ....20/javaagent-unit-tests/build.gradle.kts b/....20/javaagent-unit-tests/build.gradle.kts → ....20/javaagent-unit-tests/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  testImplementation(project(":instrumentation:apache-camel-2.20:javaagent"))
+  testImplementation(project(":instrumentation:camel-2.20:javaagent"))
   testImplementation(project(":instrumentation-api-semconv"))
   testImplementation(project(":javaagent-extension-api"))
 

diff --git a/...apachecamel/CamelPropagationUtilTest.java → ...apachecamel/CamelPropagationUtilTest.java b/...apachecamel/CamelPropagationUtilTest.java → ...apachecamel/CamelPropagationUtilTest.java
diff --git a/...ecamel/decorators/SanitizationTest.groovy → ...ecamel/decorators/SanitizationTest.groovy b/...ecamel/decorators/SanitizationTest.groovy → ...ecamel/decorators/SanitizationTest.groovy
diff --git a/...che-camel-2.20/javaagent/build.gradle.kts → ...ion/camel-2.20/javaagent/build.gradle.kts b/...che-camel-2.20/javaagent/build.gradle.kts → ...ion/camel-2.20/javaagent/build.gradle.kts
@@ -62,7 +62,7 @@ dependencies {
 tasks {
   withType<Test>().configureEach {
     // TODO run tests both with and without experimental span attributes
-    jvmArgs("-Dotel.instrumentation.apache-camel.experimental-span-attributes=true")
+    jvmArgs("-Dotel.instrumentation.camel.experimental-span-attributes=true")
     jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true")
 
     // TODO: fix camel instrumentation so that it uses semantic attributes extractors

diff --git a/...ion/apachecamel/ActiveContextManager.java → ...ion/apachecamel/ActiveContextManager.java b/...ion/apachecamel/ActiveContextManager.java → ...ion/apachecamel/ActiveContextManager.java
diff --git a/...mel/ApacheCamelInstrumentationModule.java → ...mel/ApacheCamelInstrumentationModule.java b/...mel/ApacheCamelInstrumentationModule.java → ...mel/ApacheCamelInstrumentationModule.java
@@ -16,7 +16,7 @@
 public class ApacheCamelInstrumentationModule extends InstrumentationModule {
 
   public ApacheCamelInstrumentationModule() {
-    super("apache-camel", "apache-camel-2.20");
+    super("camel", "camel-2.20");
   }
 
   @Override

diff --git a/...checamel/CamelContextInstrumentation.java → ...checamel/CamelContextInstrumentation.java b/...checamel/CamelContextInstrumentation.java → ...checamel/CamelContextInstrumentation.java
diff --git a/...mentation/apachecamel/CamelDirection.java → ...mentation/apachecamel/CamelDirection.java b/...mentation/apachecamel/CamelDirection.java → ...mentation/apachecamel/CamelDirection.java
diff --git a/...ation/apachecamel/CamelEventNotifier.java → ...ation/apachecamel/CamelEventNotifier.java b/...ation/apachecamel/CamelEventNotifier.java → ...ation/apachecamel/CamelEventNotifier.java
diff --git a/...ion/apachecamel/CamelPropagationUtil.java → ...ion/apachecamel/CamelPropagationUtil.java b/...ion/apachecamel/CamelPropagationUtil.java → ...ion/apachecamel/CamelPropagationUtil.java
diff --git a/...rumentation/apachecamel/CamelRequest.java → ...rumentation/apachecamel/CamelRequest.java b/...rumentation/apachecamel/CamelRequest.java → ...rumentation/apachecamel/CamelRequest.java
diff --git a/...ntation/apachecamel/CamelRoutePolicy.java → ...ntation/apachecamel/CamelRoutePolicy.java b/...ntation/apachecamel/CamelRoutePolicy.java → ...ntation/apachecamel/CamelRoutePolicy.java
diff --git a/...entation/apachecamel/CamelSingletons.java → ...entation/apachecamel/CamelSingletons.java b/...entation/apachecamel/CamelSingletons.java → ...entation/apachecamel/CamelSingletons.java
@@ -21,7 +21,7 @@
 
 public final class CamelSingletons {
 
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-camel-2.20";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.camel-2.20";
 
   private static final DecoratorRegistry registry = new DecoratorRegistry();
   private static final Instrumenter<CamelRequest, Void> INSTRUMENTER;

diff --git a/...tion/apachecamel/CamelTracingService.java → ...tion/apachecamel/CamelTracingService.java b/...tion/apachecamel/CamelTracingService.java → ...tion/apachecamel/CamelTracingService.java
diff --git a/...umentation/apachecamel/SpanDecorator.java → ...umentation/apachecamel/SpanDecorator.java b/...umentation/apachecamel/SpanDecorator.java → ...umentation/apachecamel/SpanDecorator.java
diff --git a/...hecamel/decorators/BaseSpanDecorator.java → ...hecamel/decorators/BaseSpanDecorator.java b/...hecamel/decorators/BaseSpanDecorator.java → ...hecamel/decorators/BaseSpanDecorator.java
@@ -42,7 +42,7 @@ class BaseSpanDecorator implements SpanDecorator {
 
   static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
       InstrumentationConfig.get()
-          .getBoolean("otel.instrumentation.apache-camel.experimental-span-attributes", false);
+          .getBoolean("otel.instrumentation.camel.experimental-span-attributes", false);
 
   static final String DEFAULT_OPERATION_NAME = "CamelOperation";
 
@@ -102,7 +102,7 @@ public void pre(
       Endpoint endpoint,
       CamelDirection camelDirection) {
     if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
-      attributes.put("apache-camel.uri", URISupport.sanitizeUri(endpoint.getEndpointUri()));
+      attributes.put("camel.uri", URISupport.sanitizeUri(endpoint.getEndpointUri()));
     }
   }
 

diff --git a/...achecamel/decorators/DbSpanDecorator.java → ...achecamel/decorators/DbSpanDecorator.java b/...achecamel/decorators/DbSpanDecorator.java → ...achecamel/decorators/DbSpanDecorator.java
diff --git a/...hecamel/decorators/DecoratorRegistry.java → ...hecamel/decorators/DecoratorRegistry.java b/...hecamel/decorators/DecoratorRegistry.java → ...hecamel/decorators/DecoratorRegistry.java
diff --git a/...ecamel/decorators/Http4SpanDecorator.java → ...ecamel/decorators/Http4SpanDecorator.java b/...ecamel/decorators/Http4SpanDecorator.java → ...ecamel/decorators/Http4SpanDecorator.java
diff --git a/...hecamel/decorators/HttpSpanDecorator.java → ...hecamel/decorators/HttpSpanDecorator.java b/...hecamel/decorators/HttpSpanDecorator.java → ...hecamel/decorators/HttpSpanDecorator.java
diff --git a/...camel/decorators/Https4SpanDecorator.java → ...camel/decorators/Https4SpanDecorator.java b/...camel/decorators/Https4SpanDecorator.java → ...camel/decorators/Https4SpanDecorator.java
diff --git a/...mel/decorators/InternalSpanDecorator.java → ...mel/decorators/InternalSpanDecorator.java b/...mel/decorators/InternalSpanDecorator.java → ...mel/decorators/InternalSpanDecorator.java
diff --git a/...ecamel/decorators/KafkaSpanDecorator.java → ...ecamel/decorators/KafkaSpanDecorator.java b/...ecamel/decorators/KafkaSpanDecorator.java → ...ecamel/decorators/KafkaSpanDecorator.java
@@ -75,17 +75,17 @@ public void pre(
     if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
       String partitionKey = (String) exchange.getIn().getHeader(PARTITION_KEY);
       if (partitionKey != null) {
-        attributes.put("apache-camel.kafka.partitionKey", partitionKey);
+        attributes.put("camel.kafka.partitionKey", partitionKey);
       }
 
       String key = (String) exchange.getIn().getHeader(KEY);
       if (key != null) {
-        attributes.put("apache-camel.kafka.key", key);
+        attributes.put("camel.kafka.key", key);
       }
 
       String offset = getValue(exchange, OFFSET, Long.class);
       if (offset != null) {
-        attributes.put("apache-camel.kafka.offset", offset);
+        attributes.put("camel.kafka.offset", offset);
       }
     }
   }

diff --git a/...checamel/decorators/LogSpanDecorator.java → ...checamel/decorators/LogSpanDecorator.java b/...checamel/decorators/LogSpanDecorator.java → ...checamel/decorators/LogSpanDecorator.java
diff --git a/...el/decorators/MessagingSpanDecorator.java → ...el/decorators/MessagingSpanDecorator.java b/...el/decorators/MessagingSpanDecorator.java → ...el/decorators/MessagingSpanDecorator.java
diff --git a/...hecamel/decorators/RestSpanDecorator.java → ...hecamel/decorators/RestSpanDecorator.java b/...hecamel/decorators/RestSpanDecorator.java → ...hecamel/decorators/RestSpanDecorator.java
diff --git a/...achecamel/decorators/S3SpanDecorator.java → ...achecamel/decorators/S3SpanDecorator.java b/...achecamel/decorators/S3SpanDecorator.java → ...achecamel/decorators/S3SpanDecorator.java
diff --git a/...ecamel/decorators/TimerSpanDecorator.java → ...ecamel/decorators/TimerSpanDecorator.java b/...ecamel/decorators/TimerSpanDecorator.java → ...ecamel/decorators/TimerSpanDecorator.java
diff --git a/...tation/apachecamel/DirectCamelTest.groovy → ...tation/apachecamel/DirectCamelTest.groovy b/...tation/apachecamel/DirectCamelTest.groovy → ...tation/apachecamel/DirectCamelTest.groovy
@@ -48,15 +48,15 @@ class DirectCamelTest extends AgentInstrumentationSpecification {
           kind INTERNAL
           hasNoParent()
           attributes {
-            "apache-camel.uri" "direct://input"
+            "camel.uri" "direct://input"
           }
         }
         it.span(1) {
           name "receiver"
           kind INTERNAL
           parentSpanId parent.span(0).spanId
           attributes {
-            "apache-camel.uri" "direct://receiver"
+            "camel.uri" "direct://receiver"
           }
         }
       }

diff --git a/...mentation/apachecamel/DirectConfig.groovy → ...mentation/apachecamel/DirectConfig.groovy b/...mentation/apachecamel/DirectConfig.groovy → ...mentation/apachecamel/DirectConfig.groovy
diff --git a/...tation/apachecamel/MulticastConfig.groovy → ...tation/apachecamel/MulticastConfig.groovy b/...tation/apachecamel/MulticastConfig.groovy → ...tation/apachecamel/MulticastConfig.groovy
diff --git a/...achecamel/MulticastDirectCamelTest.groovy → ...achecamel/MulticastDirectCamelTest.groovy b/...achecamel/MulticastDirectCamelTest.groovy → ...achecamel/MulticastDirectCamelTest.groovy
@@ -48,7 +48,7 @@ class MulticastDirectCamelTest extends AgentInstrumentationSpecification {
           kind INTERNAL
           hasNoParent()
           attributes {
-            "apache-camel.uri" "direct://input"
+            "camel.uri" "direct://input"
           }
         }
         // there is no strict ordering of "first" and "second" span
@@ -59,15 +59,15 @@ class MulticastDirectCamelTest extends AgentInstrumentationSpecification {
           kind INTERNAL
           parentSpanId parent.span(0).spanId
           attributes {
-            "apache-camel.uri" "direct://first"
+            "camel.uri" "direct://first"
           }
         }
         it.span(indexOfSecond) {
           name "second"
           kind INTERNAL
           parentSpanId parent.span(0).spanId
           attributes {
-            "apache-camel.uri" "direct://second"
+            "camel.uri" "direct://second"
           }
         }
       }

diff --git a/...entation/apachecamel/RestCamelTest.groovy → ...entation/apachecamel/RestCamelTest.groovy b/...entation/apachecamel/RestCamelTest.groovy → ...entation/apachecamel/RestCamelTest.groovy
@@ -15,9 +15,7 @@ import org.springframework.boot.SpringApplication
 import org.springframework.context.ConfigurableApplicationContext
 import spock.lang.Shared
 
-import static io.opentelemetry.api.trace.SpanKind.CLIENT
-import static io.opentelemetry.api.trace.SpanKind.INTERNAL
-import static io.opentelemetry.api.trace.SpanKind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.*
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
 
 class RestCamelTest extends AgentInstrumentationSpecification implements RetryOnAddressAlreadyInUseTrait {
@@ -70,7 +68,7 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn
           name "start"
           kind INTERNAL
           attributes {
-            "apache-camel.uri" "direct://start"
+            "camel.uri" "direct://start"
           }
         }
         it.span(1) {
@@ -80,7 +78,7 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn
           attributes {
             "$SemanticAttributes.HTTP_METHOD" "GET"
             "$SemanticAttributes.HTTP_STATUS_CODE" 200
-            "apache-camel.uri" "rest://get:api/%7Bmodule%7D/unit/%7BunitId%7D"
+            "camel.uri" "rest://get:api/%7Bmodule%7D/unit/%7BunitId%7D"
           }
         }
         it.span(2) {
@@ -110,15 +108,15 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn
           attributes {
             "$SemanticAttributes.HTTP_METHOD" "GET"
             "$SemanticAttributes.HTTP_URL" "http://localhost:$port/api/firstModule/unit/unitOne"
-            "apache-camel.uri" String
+            "camel.uri" String
           }
         }
         it.span(4) {
           name "moduleUnit"
           kind INTERNAL
           parentSpanId(span(3).spanId)
           attributes {
-            "apache-camel.uri" "direct://moduleUnit"
+            "camel.uri" "direct://moduleUnit"
           }
         }
       }

diff --git a/...rumentation/apachecamel/RestConfig.groovy → ...rumentation/apachecamel/RestConfig.groovy b/...rumentation/apachecamel/RestConfig.groovy → ...rumentation/apachecamel/RestConfig.groovy
diff --git a/...apachecamel/SingleServiceCamelTest.groovy → ...apachecamel/SingleServiceCamelTest.groovy b/...apachecamel/SingleServiceCamelTest.groovy → ...apachecamel/SingleServiceCamelTest.groovy
@@ -65,7 +65,7 @@ class SingleServiceCamelTest extends AgentInstrumentationSpecification implement
           attributes {
             "$SemanticAttributes.HTTP_METHOD" "POST"
             "$SemanticAttributes.HTTP_URL" "${address.resolve("/camelService")}"
-            "apache-camel.uri" "${address.resolve("/camelService")}".replace("localhost", "0.0.0.0")
+            "camel.uri" "${address.resolve("/camelService")}".replace("localhost", "0.0.0.0")
           }
         }
       }

diff --git a/...on/apachecamel/SingleServiceConfig.groovy → ...on/apachecamel/SingleServiceConfig.groovy b/...on/apachecamel/SingleServiceConfig.groovy → ...on/apachecamel/SingleServiceConfig.groovy
diff --git a/...tion/apachecamel/TwoServicesConfig.groovy → ...tion/apachecamel/TwoServicesConfig.groovy b/...tion/apachecamel/TwoServicesConfig.groovy → ...tion/apachecamel/TwoServicesConfig.groovy
diff --git a/...oServicesWithDirectClientCamelTest.groovy → ...oServicesWithDirectClientCamelTest.groovy b/...oServicesWithDirectClientCamelTest.groovy → ...oServicesWithDirectClientCamelTest.groovy
@@ -17,9 +17,7 @@ import org.springframework.boot.SpringApplication
 import org.springframework.context.ConfigurableApplicationContext
 import spock.lang.Shared
 
-import static io.opentelemetry.api.trace.SpanKind.CLIENT
-import static io.opentelemetry.api.trace.SpanKind.INTERNAL
-import static io.opentelemetry.api.trace.SpanKind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.*
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
 
 class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecification implements RetryOnAddressAlreadyInUseTrait {
@@ -52,9 +50,9 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
     clientContext.addRoutes(new RouteBuilder() {
       void configure() {
         from("direct:input")
-          .log("SENT Client request")
-          .to("http://localhost:$portOne/serviceOne")
-          .log("RECEIVED Client response")
+            .log("SENT Client request")
+            .to("http://localhost:$portOne/serviceOne")
+            .log("RECEIVED Client response")
       }
     })
     clientContext.start()
@@ -82,7 +80,7 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
           name "input"
           kind INTERNAL
           attributes {
-            "apache-camel.uri" "direct://input"
+            "camel.uri" "direct://input"
           }
         }
         it.span(1) {
@@ -93,7 +91,7 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
             "$SemanticAttributes.HTTP_METHOD" "POST"
             "$SemanticAttributes.HTTP_URL" "http://localhost:$portOne/serviceOne"
             "$SemanticAttributes.HTTP_STATUS_CODE" 200
-            "apache-camel.uri" "http://localhost:$portOne/serviceOne"
+            "camel.uri" "http://localhost:$portOne/serviceOne"
           }
         }
         it.span(2) {
@@ -104,7 +102,7 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
             "$SemanticAttributes.HTTP_METHOD" "POST"
             "$SemanticAttributes.HTTP_URL" "http://localhost:$portOne/serviceOne"
             "$SemanticAttributes.HTTP_STATUS_CODE" 200
-            "apache-camel.uri" "http://0.0.0.0:$portOne/serviceOne"
+            "camel.uri" "http://0.0.0.0:$portOne/serviceOne"
           }
         }
         it.span(3) {
@@ -115,7 +113,7 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
             "$SemanticAttributes.HTTP_METHOD" "POST"
             "$SemanticAttributes.HTTP_URL" "http://127.0.0.1:$portTwo/serviceTwo"
             "$SemanticAttributes.HTTP_STATUS_CODE" 200
-            "apache-camel.uri" "http://127.0.0.1:$portTwo/serviceTwo"
+            "camel.uri" "http://127.0.0.1:$portTwo/serviceTwo"
           }
         }
         it.span(4) {
@@ -145,7 +143,7 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
           attributes {
             "$SemanticAttributes.HTTP_METHOD" "POST"
             "$SemanticAttributes.HTTP_URL" "http://127.0.0.1:$portTwo/serviceTwo"
-            "apache-camel.uri" "jetty:http://0.0.0.0:$portTwo/serviceTwo?arg=value"
+            "camel.uri" "jetty:http://0.0.0.0:$portTwo/serviceTwo?arg=value"
           }
         }
       }

diff --git a/...ation/apachecamel/aws/AwsConnector.groovy → ...ation/apachecamel/aws/AwsConnector.groovy b/...ation/apachecamel/aws/AwsConnector.groovy → ...ation/apachecamel/aws/AwsConnector.groovy
diff --git a/...umentation/apachecamel/aws/AwsSpan.groovy → ...umentation/apachecamel/aws/AwsSpan.groovy b/...umentation/apachecamel/aws/AwsSpan.groovy → ...umentation/apachecamel/aws/AwsSpan.groovy
diff --git a/...entation/apachecamel/aws/CamelSpan.groovy → ...entation/apachecamel/aws/CamelSpan.groovy b/...entation/apachecamel/aws/CamelSpan.groovy → ...entation/apachecamel/aws/CamelSpan.groovy
@@ -18,7 +18,7 @@ class CamelSpan {
       kind INTERNAL
       hasNoParent()
       attributes {
-        "apache-camel.uri" "direct://${spanName}"
+        "camel.uri" "direct://${spanName}"
       }
     }
   }
@@ -33,7 +33,7 @@ class CamelSpan {
         childOf parentSpan
       }
       attributes {
-        "apache-camel.uri" "aws-sqs://${queueName}?amazonSQSClient=%23sqsClient&delay=1000"
+        "camel.uri" "aws-sqs://${queueName}?amazonSQSClient=%23sqsClient&delay=1000"
         "$SemanticAttributes.MESSAGING_DESTINATION_NAME" queueName
       }
     }
@@ -49,7 +49,7 @@ class CamelSpan {
         childOf parentSpan
       }
       attributes {
-        "apache-camel.uri" "aws-sqs://${queueName}?amazonSQSClient=%23sqsClient&delay=1000"
+        "camel.uri" "aws-sqs://${queueName}?amazonSQSClient=%23sqsClient&delay=1000"
         "$SemanticAttributes.MESSAGING_DESTINATION_NAME" queueName
         "$SemanticAttributes.MESSAGING_MESSAGE_ID" String
       }
@@ -62,7 +62,7 @@ class CamelSpan {
       kind INTERNAL
       childOf parentSpan
       attributes {
-        "apache-camel.uri" "aws-sns://${topicName}?amazonSNSClient=%23snsClient"
+        "camel.uri" "aws-sns://${topicName}?amazonSNSClient=%23snsClient"
         "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicName
       }
     }
@@ -74,7 +74,7 @@ class CamelSpan {
       kind INTERNAL
       childOf parentSpan
       attributes {
-        "apache-camel.uri" "aws-s3://${bucketName}?amazonS3Client=%23s3Client"
+        "camel.uri" "aws-s3://${bucketName}?amazonS3Client=%23s3Client"
       }
     }
   }

diff --git a/...ion/apachecamel/aws/CamelSpringApp.groovy → ...ion/apachecamel/aws/CamelSpringApp.groovy b/...ion/apachecamel/aws/CamelSpringApp.groovy → ...ion/apachecamel/aws/CamelSpringApp.groovy
diff --git a/...tation/apachecamel/aws/S3CamelTest.groovy → ...tation/apachecamel/aws/S3CamelTest.groovy b/...tation/apachecamel/aws/S3CamelTest.groovy → ...tation/apachecamel/aws/S3CamelTest.groovy
diff --git a/...mentation/apachecamel/aws/S3Config.groovy → ...mentation/apachecamel/aws/S3Config.groovy b/...mentation/apachecamel/aws/S3Config.groovy → ...mentation/apachecamel/aws/S3Config.groovy
diff --git a/...ation/apachecamel/aws/SnsCamelTest.groovy → ...ation/apachecamel/aws/SnsCamelTest.groovy b/...ation/apachecamel/aws/SnsCamelTest.groovy → ...ation/apachecamel/aws/SnsCamelTest.groovy
diff --git a/...entation/apachecamel/aws/SnsConfig.groovy → ...entation/apachecamel/aws/SnsConfig.groovy b/...entation/apachecamel/aws/SnsConfig.groovy → ...entation/apachecamel/aws/SnsConfig.groovy
diff --git a/...ation/apachecamel/aws/SqsCamelTest.groovy → ...ation/apachecamel/aws/SqsCamelTest.groovy b/...ation/apachecamel/aws/SqsCamelTest.groovy → ...ation/apachecamel/aws/SqsCamelTest.groovy
diff --git a/...entation/apachecamel/aws/SqsConfig.groovy → ...entation/apachecamel/aws/SqsConfig.groovy b/...entation/apachecamel/aws/SqsConfig.groovy → ...entation/apachecamel/aws/SqsConfig.groovy
diff --git a/...hecamel/decorators/CassandraConfig.groovy → ...hecamel/decorators/CassandraConfig.groovy b/...hecamel/decorators/CassandraConfig.groovy → ...hecamel/decorators/CassandraConfig.groovy
diff --git a/...achecamel/decorators/CassandraTest.groovy → ...achecamel/decorators/CassandraTest.groovy b/...achecamel/decorators/CassandraTest.groovy → ...achecamel/decorators/CassandraTest.groovy
@@ -94,13 +94,13 @@ class CassandraTest extends AgentInstrumentationSpecification implements RetryOn
           kind INTERNAL
           hasNoParent()
           attributes {
-            "apache-camel.uri" "direct://input"
+            "camel.uri" "direct://input"
           }
         }
         span(1) {
           kind CLIENT
           attributes {
-            "apache-camel.uri" "cql://$host:$port/test"
+            "camel.uri" "cql://$host:$port/test"
             "$SemanticAttributes.DB_NAME" "test"
             "$SemanticAttributes.DB_STATEMENT" "select * from test.users where id=? ALLOW FILTERING"
             "$SemanticAttributes.DB_SYSTEM" "cassandra"

diff --git a/...agent/src/test/resources/logback-test.xml → ...agent/src/test/resources/logback-test.xml b/...agent/src/test/resources/logback-test.xml → ...agent/src/test/resources/logback-test.xml
diff --git a/instrumentation/pulsar/apache-pulsar-2.8/README.md b/instrumentation/pulsar/apache-pulsar-2.8/README.md
@@ -0,0 +1,5 @@
+# Settings for the Apache Pulsar instrumentation
+
+| System property | Type | Default | Description |
+|---|---|---|---|
+| `otel.instrumentation.pulsar.experimental-span-attributes` | `Boolean | `false` | Enable the capture of experimental span attributes. |
diff --git a/instrumentation/pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts b/instrumentation/pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+dependencies {
+  testImplementation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
+}
diff --git a/...umentation/pulsar/v2_8/UrlParserTest.java → ...umentation/pulsar/v2_8/UrlParserTest.java b/...umentation/pulsar/v2_8/UrlParserTest.java → ...umentation/pulsar/v2_8/UrlParserTest.java
diff --git a/...che-pulsar-2.8/javaagent/build.gradle.kts → ...che-pulsar-2.8/javaagent/build.gradle.kts b/...che-pulsar-2.8/javaagent/build.gradle.kts → ...che-pulsar-2.8/javaagent/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
 
 tasks.withType<Test>().configureEach {
   // TODO run tests both with and without experimental span attributes
-  jvmArgs("-Dotel.instrumentation.apache-pulsar.experimental-span-attributes=true")
+  jvmArgs("-Dotel.instrumentation.pulsar.experimental-span-attributes=true")
   usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
 }
diff --git a/...sar/v2_8/ConsumerImplInstrumentation.java → ...sar/v2_8/ConsumerImplInstrumentation.java b/...sar/v2_8/ConsumerImplInstrumentation.java → ...sar/v2_8/ConsumerImplInstrumentation.java
diff --git a/...n/pulsar/v2_8/MessageInstrumentation.java → ...n/pulsar/v2_8/MessageInstrumentation.java b/...n/pulsar/v2_8/MessageInstrumentation.java → ...n/pulsar/v2_8/MessageInstrumentation.java
diff --git a/.../v2_8/MessageListenerInstrumentation.java → .../v2_8/MessageListenerInstrumentation.java b/.../v2_8/MessageListenerInstrumentation.java → .../v2_8/MessageListenerInstrumentation.java
diff --git a/...rumentation/pulsar/v2_8/ProducerData.java → ...rumentation/pulsar/v2_8/ProducerData.java b/...rumentation/pulsar/v2_8/ProducerData.java → ...rumentation/pulsar/v2_8/ProducerData.java
diff --git a/...sar/v2_8/ProducerImplInstrumentation.java → ...sar/v2_8/ProducerImplInstrumentation.java b/...sar/v2_8/ProducerImplInstrumentation.java → ...sar/v2_8/ProducerImplInstrumentation.java
diff --git a/...sar/v2_8/PulsarInstrumentationModule.java → ...sar/v2_8/PulsarInstrumentationModule.java b/...sar/v2_8/PulsarInstrumentationModule.java → ...sar/v2_8/PulsarInstrumentationModule.java
@@ -14,7 +14,7 @@
 @AutoService(InstrumentationModule.class)
 public class PulsarInstrumentationModule extends InstrumentationModule {
   public PulsarInstrumentationModule() {
-    super("apache-pulsar", "apache-pulsar-2.8.0");
+    super("pulsar", "pulsar-2.8.0");
   }
 
   @Override

diff --git a/...nstrumentation/pulsar/v2_8/UrlParser.java → ...nstrumentation/pulsar/v2_8/UrlParser.java b/...nstrumentation/pulsar/v2_8/UrlParser.java → ...nstrumentation/pulsar/v2_8/UrlParser.java
diff --git a/...tation/pulsar/v2_8/VirtualFieldStore.java → ...tation/pulsar/v2_8/VirtualFieldStore.java b/...tation/pulsar/v2_8/VirtualFieldStore.java → ...tation/pulsar/v2_8/VirtualFieldStore.java
diff --git a/...erimentalProducerAttributesExtractor.java → ...erimentalProducerAttributesExtractor.java b/...erimentalProducerAttributesExtractor.java → ...erimentalProducerAttributesExtractor.java
diff --git a/.../v2_8/telemetry/MessageTextMapGetter.java → .../v2_8/telemetry/MessageTextMapGetter.java b/.../v2_8/telemetry/MessageTextMapGetter.java → .../v2_8/telemetry/MessageTextMapGetter.java
diff --git a/.../v2_8/telemetry/MessageTextMapSetter.java → .../v2_8/telemetry/MessageTextMapSetter.java b/.../v2_8/telemetry/MessageTextMapSetter.java → .../v2_8/telemetry/MessageTextMapSetter.java
diff --git a/...etry/PulsarMessagingAttributesGetter.java → ...etry/PulsarMessagingAttributesGetter.java b/...etry/PulsarMessagingAttributesGetter.java → ...etry/PulsarMessagingAttributesGetter.java
diff --git a/...etry/PulsarNetClientAttributesGetter.java → ...etry/PulsarNetClientAttributesGetter.java b/...etry/PulsarNetClientAttributesGetter.java → ...etry/PulsarNetClientAttributesGetter.java
diff --git a/.../pulsar/v2_8/telemetry/PulsarRequest.java → .../pulsar/v2_8/telemetry/PulsarRequest.java b/.../pulsar/v2_8/telemetry/PulsarRequest.java → .../pulsar/v2_8/telemetry/PulsarRequest.java
diff --git a/...lsar/v2_8/telemetry/PulsarSingletons.java → ...lsar/v2_8/telemetry/PulsarSingletons.java b/...lsar/v2_8/telemetry/PulsarSingletons.java → ...lsar/v2_8/telemetry/PulsarSingletons.java
@@ -29,7 +29,7 @@
 import org.apache.pulsar.client.api.Message;
 
 public final class PulsarSingletons {
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-pulsar-2.8";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.pulsar-2.8";
 
   private static final OpenTelemetry TELEMETRY = GlobalOpenTelemetry.get();
   private static final TextMapPropagator PROPAGATOR =
@@ -96,7 +96,7 @@ private static Instrumenter<PulsarRequest, Void> createProducerInstrumenter() {
                 NetClientAttributesExtractor.create(new PulsarNetClientAttributesGetter()));
 
     if (InstrumentationConfig.get()
-        .getBoolean("otel.instrumentation.apache-pulsar.experimental-span-attributes", false)) {
+        .getBoolean("otel.instrumentation.pulsar.experimental-span-attributes", false)) {
       builder.addAttributesExtractor(ExperimentalProducerAttributesExtractor.INSTANCE);
     }
 

diff --git a/...ation/pulsar/v2_8/PulsarClientTest.groovy → ...ation/pulsar/v2_8/PulsarClientTest.groovy b/...ation/pulsar/v2_8/PulsarClientTest.groovy → ...ation/pulsar/v2_8/PulsarClientTest.groovy