From b01996e12fa6fceceb924a7259b05a19216dd3dd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 3 Apr 2023 11:26:23 -0700 Subject: [PATCH] Rename apache-pulsar to pulsar and apache-camel to camel (#8195) Closes #8004 --- CHANGELOG.md | 2 +- instrumentation/apache-camel-2.20/README.md | 5 ----- .../apache-pulsar/apache-pulsar-2.8/README.md | 5 ----- .../javaagent-unit-tests/build.gradle.kts | 7 ------- instrumentation/camel-2.20/README.md | 5 +++++ .../javaagent-unit-tests/build.gradle.kts | 2 +- .../apachecamel/CamelPropagationUtilTest.java | 0 .../decorators/SanitizationTest.groovy | 0 .../javaagent/build.gradle.kts | 2 +- .../apachecamel/ActiveContextManager.java | 0 .../ApacheCamelInstrumentationModule.java | 2 +- .../CamelContextInstrumentation.java | 0 .../apachecamel/CamelDirection.java | 0 .../apachecamel/CamelEventNotifier.java | 0 .../apachecamel/CamelPropagationUtil.java | 0 .../apachecamel/CamelRequest.java | 0 .../apachecamel/CamelRoutePolicy.java | 0 .../apachecamel/CamelSingletons.java | 2 +- .../apachecamel/CamelTracingService.java | 0 .../apachecamel/SpanDecorator.java | 0 .../decorators/BaseSpanDecorator.java | 4 ++-- .../decorators/DbSpanDecorator.java | 0 .../decorators/DecoratorRegistry.java | 0 .../decorators/Http4SpanDecorator.java | 0 .../decorators/HttpSpanDecorator.java | 0 .../decorators/Https4SpanDecorator.java | 0 .../decorators/InternalSpanDecorator.java | 0 .../decorators/KafkaSpanDecorator.java | 6 +++--- .../decorators/LogSpanDecorator.java | 0 .../decorators/MessagingSpanDecorator.java | 0 .../decorators/RestSpanDecorator.java | 0 .../decorators/S3SpanDecorator.java | 0 .../decorators/TimerSpanDecorator.java | 0 .../apachecamel/DirectCamelTest.groovy | 4 ++-- .../apachecamel/DirectConfig.groovy | 0 .../apachecamel/MulticastConfig.groovy | 0 .../MulticastDirectCamelTest.groovy | 6 +++--- .../apachecamel/RestCamelTest.groovy | 12 +++++------ .../apachecamel/RestConfig.groovy | 0 .../apachecamel/SingleServiceCamelTest.groovy | 2 +- .../apachecamel/SingleServiceConfig.groovy | 0 .../apachecamel/TwoServicesConfig.groovy | 0 ...woServicesWithDirectClientCamelTest.groovy | 20 +++++++++---------- .../apachecamel/aws/AwsConnector.groovy | 0 .../apachecamel/aws/AwsSpan.groovy | 0 .../apachecamel/aws/CamelSpan.groovy | 10 +++++----- .../apachecamel/aws/CamelSpringApp.groovy | 0 .../apachecamel/aws/S3CamelTest.groovy | 0 .../apachecamel/aws/S3Config.groovy | 0 .../apachecamel/aws/SnsCamelTest.groovy | 0 .../apachecamel/aws/SnsConfig.groovy | 0 .../apachecamel/aws/SqsCamelTest.groovy | 0 .../apachecamel/aws/SqsConfig.groovy | 0 .../decorators/CassandraConfig.groovy | 0 .../decorators/CassandraTest.groovy | 4 ++-- .../src/test/resources/logback-test.xml | 0 .../pulsar/apache-pulsar-2.8/README.md | 5 +++++ .../javaagent-unit-tests/build.gradle.kts | 7 +++++++ .../pulsar/v2_8/UrlParserTest.java | 0 .../javaagent/build.gradle.kts | 2 +- .../v2_8/ConsumerImplInstrumentation.java | 0 .../pulsar/v2_8/MessageInstrumentation.java | 0 .../v2_8/MessageListenerInstrumentation.java | 0 .../pulsar/v2_8/ProducerData.java | 0 .../v2_8/ProducerImplInstrumentation.java | 0 .../v2_8/PulsarInstrumentationModule.java | 2 +- .../pulsar/v2_8/UrlParser.java | 0 .../pulsar/v2_8/VirtualFieldStore.java | 0 ...perimentalProducerAttributesExtractor.java | 0 .../v2_8/telemetry/MessageTextMapGetter.java | 0 .../v2_8/telemetry/MessageTextMapSetter.java | 0 .../PulsarMessagingAttributesGetter.java | 0 .../PulsarNetClientAttributesGetter.java | 0 .../pulsar/v2_8/telemetry/PulsarRequest.java | 0 .../v2_8/telemetry/PulsarSingletons.java | 4 ++-- .../pulsar/v2_8/PulsarClientTest.groovy | 0 settings.gradle.kts | 8 ++++---- 77 files changed, 62 insertions(+), 66 deletions(-) delete mode 100644 instrumentation/apache-camel-2.20/README.md delete mode 100644 instrumentation/apache-pulsar/apache-pulsar-2.8/README.md delete mode 100644 instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts create mode 100644 instrumentation/camel-2.20/README.md rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent-unit-tests/build.gradle.kts (87%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/build.gradle.kts (97%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java (94%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelContextInstrumentation.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRequest.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java (99%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracingService.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java (95%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Http4SpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Https4SpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/InternalSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java (95%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/LogSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/RestSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/S3SpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/TimerSpanDecorator.java (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy (93%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy (92%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy (90%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy (95%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy (87%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsConnector.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy (82%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpringApp.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3CamelTest.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3Config.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsCamelTest.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraConfig.groovy (100%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.groovy (96%) rename instrumentation/{apache-camel-2.20 => camel-2.20}/javaagent/src/test/resources/logback-test.xml (100%) create mode 100644 instrumentation/pulsar/apache-pulsar-2.8/README.md create mode 100644 instrumentation/pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParserTest.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/build.gradle.kts (88%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ConsumerImplInstrumentation.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageInstrumentation.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageListenerInstrumentation.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerData.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerImplInstrumentation.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java (94%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParser.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/VirtualFieldStore.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/ExperimentalProducerAttributesExtractor.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapGetter.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapSetter.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarRequest.java (100%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java (98%) rename instrumentation/{apache-pulsar => pulsar}/apache-pulsar-2.8/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.groovy (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4602e41aac..fe2c4ddbae 100644 --- 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 deleted file mode 100644 index 084423593f..0000000000 --- a/instrumentation/apache-camel-2.20/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Settings for the Apache Camel instrumentation - -| System property | Type | Default | Description | -|---|---|---|---| -| `otel.instrumentation.apache-camel.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. | diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/README.md b/instrumentation/apache-pulsar/apache-pulsar-2.8/README.md deleted file mode 100644 index 8a86fdf251..0000000000 --- a/instrumentation/apache-pulsar/apache-pulsar-2.8/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Settings for the Apache Pulsar instrumentation - -| System property | Type | Default | Description | -|---|---|---|---| -| `otel.instrumentation.apache-pulsar.experimental-span-attributes` | `Boolean | `false` | Enable the capture of experimental span attributes. | 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 deleted file mode 100644 index 54a23136eb..0000000000 --- a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent-unit-tests/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("otel.java-conventions") -} - -dependencies { - testImplementation(project(":instrumentation:apache-pulsar:apache-pulsar-2.8:javaagent")) -} diff --git a/instrumentation/camel-2.20/README.md b/instrumentation/camel-2.20/README.md new file mode 100644 index 0000000000..0d3dd09472 --- /dev/null +++ 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/instrumentation/apache-camel-2.20/javaagent-unit-tests/build.gradle.kts b/instrumentation/camel-2.20/javaagent-unit-tests/build.gradle.kts similarity index 87% rename from instrumentation/apache-camel-2.20/javaagent-unit-tests/build.gradle.kts rename to instrumentation/camel-2.20/javaagent-unit-tests/build.gradle.kts index 56cbcfea8c..fe571317f1 100644 --- a/instrumentation/apache-camel-2.20/javaagent-unit-tests/build.gradle.kts +++ b/instrumentation/camel-2.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/instrumentation/apache-camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java b/instrumentation/camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java rename to instrumentation/camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java diff --git a/instrumentation/apache-camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.groovy b/instrumentation/camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.groovy rename to instrumentation/camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts similarity index 97% rename from instrumentation/apache-camel-2.20/javaagent/build.gradle.kts rename to instrumentation/camel-2.20/javaagent/build.gradle.kts index 8210a73c94..88663c7c46 100644 --- a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/camel-2.20/javaagent/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { tasks { withType().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/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveContextManager.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java similarity index 94% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java index 7371e19e77..4eda502235 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java @@ -16,7 +16,7 @@ import java.util.List; public class ApacheCamelInstrumentationModule extends InstrumentationModule { public ApacheCamelInstrumentationModule() { - super("apache-camel", "apache-camel-2.20"); + super("camel", "camel-2.20"); } @Override diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelContextInstrumentation.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelContextInstrumentation.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelContextInstrumentation.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelContextInstrumentation.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRequest.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRequest.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRequest.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRequest.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java similarity index 99% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java index 048914ce46..248aa66727 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelSingletons.java @@ -21,7 +21,7 @@ import org.apache.camel.util.StringHelper; 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 INSTRUMENTER; diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracingService.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracingService.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracingService.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelTracingService.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java similarity index 95% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java index 20fc44c98b..322bed6a71 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/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 @@ class BaseSpanDecorator implements SpanDecorator { 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/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Http4SpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Http4SpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Http4SpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Http4SpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Https4SpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Https4SpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Https4SpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/Https4SpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/InternalSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/InternalSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/InternalSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/InternalSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java similarity index 95% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java index 082ea3db02..04cdfd23e9 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java @@ -75,17 +75,17 @@ class KafkaSpanDecorator extends MessagingSpanDecorator { 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/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/LogSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/LogSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/LogSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/LogSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/RestSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/RestSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/RestSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/RestSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/S3SpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/S3SpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/S3SpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/S3SpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/TimerSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/TimerSpanDecorator.java similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/TimerSpanDecorator.java rename to instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/TimerSpanDecorator.java diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy similarity index 93% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy index 7bad3422be..0607928193 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy @@ -48,7 +48,7 @@ class DirectCamelTest extends AgentInstrumentationSpecification { kind INTERNAL hasNoParent() attributes { - "apache-camel.uri" "direct://input" + "camel.uri" "direct://input" } } it.span(1) { @@ -56,7 +56,7 @@ class DirectCamelTest extends AgentInstrumentationSpecification { kind INTERNAL parentSpanId parent.span(0).spanId attributes { - "apache-camel.uri" "direct://receiver" + "camel.uri" "direct://receiver" } } } diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy similarity index 92% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy index a238011af0..69aad50c30 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/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,7 +59,7 @@ class MulticastDirectCamelTest extends AgentInstrumentationSpecification { kind INTERNAL parentSpanId parent.span(0).spanId attributes { - "apache-camel.uri" "direct://first" + "camel.uri" "direct://first" } } it.span(indexOfSecond) { @@ -67,7 +67,7 @@ class MulticastDirectCamelTest extends AgentInstrumentationSpecification { kind INTERNAL parentSpanId parent.span(0).spanId attributes { - "apache-camel.uri" "direct://second" + "camel.uri" "direct://second" } } } diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy similarity index 90% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy index af4c226717..6ff4af0c5b 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/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,7 +108,7 @@ 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) { @@ -118,7 +116,7 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn kind INTERNAL parentSpanId(span(3).spanId) attributes { - "apache-camel.uri" "direct://moduleUnit" + "camel.uri" "direct://moduleUnit" } } } diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy similarity index 95% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy index 7c8f9f1bdd..16d6728990 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/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/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy similarity index 87% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy index e310354ff5..15c236d380 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.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/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsConnector.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsConnector.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsConnector.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsConnector.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy similarity index 82% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy index 8d2d9361dd..b084f45f31 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/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/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpringApp.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpringApp.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpringApp.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpringApp.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3CamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3CamelTest.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3CamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3CamelTest.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3Config.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3Config.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3Config.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/S3Config.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsCamelTest.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SnsConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsCamelTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsCamelTest.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsCamelTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsCamelTest.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/SqsConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraConfig.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraConfig.groovy similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraConfig.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraConfig.groovy diff --git a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.groovy b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.groovy similarity index 96% rename from instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.groovy rename to instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.groovy index 31c9cf07d9..519ce27327 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.groovy +++ b/instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/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/instrumentation/apache-camel-2.20/javaagent/src/test/resources/logback-test.xml b/instrumentation/camel-2.20/javaagent/src/test/resources/logback-test.xml similarity index 100% rename from instrumentation/apache-camel-2.20/javaagent/src/test/resources/logback-test.xml rename to instrumentation/camel-2.20/javaagent/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 new file mode 100644 index 0000000000..8c7d5f25c2 --- /dev/null +++ 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 new file mode 100644 index 0000000000..4a143d7886 --- /dev/null +++ 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/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParserTest.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParserTest.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParserTest.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParserTest.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/build.gradle.kts b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/build.gradle.kts similarity index 88% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/build.gradle.kts rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/build.gradle.kts index 67b91f7665..8aaff41166 100644 --- a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/build.gradle.kts +++ b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/build.gradle.kts @@ -21,6 +21,6 @@ dependencies { tasks.withType().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/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ConsumerImplInstrumentation.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ConsumerImplInstrumentation.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ConsumerImplInstrumentation.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ConsumerImplInstrumentation.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageInstrumentation.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageInstrumentation.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageInstrumentation.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageInstrumentation.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageListenerInstrumentation.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageListenerInstrumentation.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageListenerInstrumentation.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageListenerInstrumentation.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerData.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerData.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerData.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerData.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerImplInstrumentation.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerImplInstrumentation.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerImplInstrumentation.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerImplInstrumentation.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java similarity index 94% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java index 0f0f784897..849b1fc86c 100644 --- a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java +++ b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarInstrumentationModule.java @@ -14,7 +14,7 @@ import java.util.List; @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/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParser.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParser.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParser.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParser.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/VirtualFieldStore.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/VirtualFieldStore.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/VirtualFieldStore.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/VirtualFieldStore.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/ExperimentalProducerAttributesExtractor.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/ExperimentalProducerAttributesExtractor.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/ExperimentalProducerAttributesExtractor.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/ExperimentalProducerAttributesExtractor.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapGetter.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapGetter.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapGetter.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapGetter.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapSetter.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapSetter.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapSetter.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/MessageTextMapSetter.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarMessagingAttributesGetter.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarNetClientAttributesGetter.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarRequest.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarRequest.java similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarRequest.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarRequest.java diff --git a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java similarity index 98% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java index c2b6e786f9..19789d9578 100644 --- a/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java +++ b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java @@ -29,7 +29,7 @@ import org.apache.pulsar.client.api.Consumer; 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 @@ public final class PulsarSingletons { 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/instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.groovy b/instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.groovy similarity index 100% rename from instrumentation/apache-pulsar/apache-pulsar-2.8/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.groovy rename to instrumentation/pulsar/apache-pulsar-2.8/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.groovy diff --git a/settings.gradle.kts b/settings.gradle.kts index ee2ffdec5b..56b3399d73 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -134,8 +134,6 @@ hideFromDependabot(":smoke-tests:images:spring-boot") hideFromDependabot("instrumentation:akka:akka-actor-2.3:javaagent") hideFromDependabot(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent") hideFromDependabot(":instrumentation:akka:akka-http-10.0:javaagent") -hideFromDependabot(":instrumentation:apache-camel-2.20:javaagent") -hideFromDependabot(":instrumentation:apache-camel-2.20:javaagent-unit-tests") hideFromDependabot(":instrumentation:apache-dbcp-2.0:javaagent") hideFromDependabot(":instrumentation:apache-dbcp-2.0:library") hideFromDependabot(":instrumentation:apache-dbcp-2.0:testing") @@ -148,8 +146,6 @@ hideFromDependabot(":instrumentation:apache-httpclient:apache-httpclient-4.0:jav hideFromDependabot(":instrumentation:apache-httpclient:apache-httpclient-4.3:library") hideFromDependabot(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing") hideFromDependabot(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent") -hideFromDependabot(":instrumentation:apache-pulsar:apache-pulsar-2.8:javaagent") -hideFromDependabot(":instrumentation:apache-pulsar:apache-pulsar-2.8:javaagent-unit-tests") hideFromDependabot(":instrumentation:armeria-1.3:javaagent") hideFromDependabot(":instrumentation:armeria-1.3:library") hideFromDependabot(":instrumentation:armeria-1.3:testing") @@ -175,6 +171,8 @@ hideFromDependabot(":instrumentation:azure-core:azure-core-1.19:javaagent") hideFromDependabot(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded") hideFromDependabot(":instrumentation:azure-core:azure-core-1.36:javaagent") hideFromDependabot(":instrumentation:azure-core:azure-core-1.36:library-instrumentation-shaded") +hideFromDependabot(":instrumentation:camel-2.20:javaagent") +hideFromDependabot(":instrumentation:camel-2.20:javaagent-unit-tests") hideFromDependabot(":instrumentation:cassandra:cassandra-3.0:javaagent") hideFromDependabot(":instrumentation:cassandra:cassandra-4.0:javaagent") hideFromDependabot(":instrumentation:cassandra:cassandra-4.4:javaagent") @@ -398,6 +396,8 @@ hideFromDependabot(":instrumentation:play:play-ws:play-ws-2.0:javaagent") hideFromDependabot(":instrumentation:play:play-ws:play-ws-2.1:javaagent") hideFromDependabot(":instrumentation:play:play-ws:play-ws-common:javaagent") hideFromDependabot(":instrumentation:play:play-ws:play-ws-common:testing") +hideFromDependabot(":instrumentation:pulsar:pulsar-2.8:javaagent") +hideFromDependabot(":instrumentation:pulsar:pulsar-2.8:javaagent-unit-tests") hideFromDependabot(":instrumentation:quartz-2.0:javaagent") hideFromDependabot(":instrumentation:quartz-2.0:library") hideFromDependabot(":instrumentation:quartz-2.0:testing")