Camel instrumentation - SNS propagation impl + tests (#2562)

* Camel instrumentation - SNS propagation impl + tests * code review
open-telemetry · Mar 17, 2021 · fcc7004 · fcc7004
1 parent 0ce9ca5
commit fcc7004
Show file tree

Hide file tree

Showing 6 changed files with 784 additions and 12 deletions.
diff --git a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle b/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle
@@ -33,12 +33,9 @@ dependencies {
   testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock"
   testImplementation 'javax.xml.bind:jaxb-api:2.3.1'
   testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.12', version: '1.0.0'
-  /**
-   *    Temporarily using emq instead of localstack till the latter supports AWS trace propagation
-   *
-   *    testImplementation deps.testcontainers
-   *    testImplementation "org.testcontainers:localstack:${versions.testcontainers}
-   **/
+
+  testImplementation deps.testcontainers
+  testImplementation "org.testcontainers:localstack:${versions.testcontainers}"
 
   latestDepTestLibrary group: 'org.apache.camel', name: 'camel-core', version: '2.+'
   latestDepTestLibrary group: 'org.apache.camel', name: 'camel-spring-boot-starter', version: '2.+'

diff --git a/...ain/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java b/...ain/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java
@@ -18,16 +18,16 @@ final class CamelPropagationUtil {
 
   private CamelPropagationUtil() {}
 
-  private static boolean isAwsPropagated(Endpoint endpoint) {
-    return endpoint.getClass().getName().endsWith("SqsEndpoint");
-  }
-
   static Context extractParent(final Map<String, Object> exchangeHeaders, Endpoint endpoint) {
     return (isAwsPropagated(endpoint)
         ? extractAwsPropagationParent(exchangeHeaders)
         : extractHttpPropagationParent(exchangeHeaders));
   }
 
+  private static boolean isAwsPropagated(Endpoint endpoint) {
+    return endpoint.getClass().getName().endsWith("SqsEndpoint");
+  }
+
   private static Context extractAwsPropagationParent(final Map<String, Object> exchangeHeaders) {
     return AwsXrayPropagator.getInstance()
         .extract(

diff --git a/...pentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java b/...pentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java
@@ -95,6 +95,7 @@ protected String getDestination(Exchange exchange, Endpoint endpoint) {
   @Override
   public SpanKind getInitiatorSpanKind() {
     switch (component) {
+      case "aws-sns":
       case "aws-sqs":
         return SpanKind.INTERNAL;
       default:
@@ -105,6 +106,7 @@ public SpanKind getInitiatorSpanKind() {
   @Override
   public SpanKind getReceiverSpanKind() {
     switch (component) {
+      case "aws-sns":
       case "aws-sqs":
         return SpanKind.INTERNAL;
       default: