Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Camel instrumentation - SNS propagation impl + tests #2562

Merged
merged 2 commits into from Mar 17, 2021
Merged

Camel instrumentation - SNS propagation impl + tests #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad225d
Camel instrumentation - SNS propagation impl + tests
kuba-wu Mar 11, 2021
d8268ac
code review
kuba-wu Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.+'
Expand Down
8 changes: 4 additions & 4 deletions ...ain/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions ...pentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -105,6 +106,7 @@ public SpanKind getInitiatorSpanKind() {
@Override
public SpanKind getReceiverSpanKind() {
switch (component) {
case "aws-sns":
case "aws-sqs":
return SpanKind.INTERNAL;
default:
Expand Down
Loading