Skip to content

Commit c2efc5d

Browse files
committed
finish converting sqs tests
1 parent 220e860 commit c2efc5d

File tree

8 files changed

+236
-444
lines changed

8 files changed

+236
-444
lines changed

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/testSqs/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsTracingTest.groovy

-17
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;
77

88
import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;
9-
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractSqsTracingTest2;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractSqsTracingTest;
1010
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1111
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1212
import org.junit.jupiter.api.extension.RegisterExtension;
1313

14-
class SqsTracing2Test extends AbstractSqsTracingTest2 {
14+
class SqsTracingTest extends AbstractSqsTracingTest {
1515

1616
@RegisterExtension
1717
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/test/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/instrumentor/SqsTracingTest.groovy

-17
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;
7+
8+
import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractSqsTracingTest;
10+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
11+
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
12+
import org.junit.jupiter.api.extension.RegisterExtension;
13+
14+
class SqsTracingTest extends AbstractSqsTracingTest {
15+
16+
@RegisterExtension
17+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
18+
19+
@Override
20+
protected InstrumentationExtension testing() {
21+
return testing;
22+
}
23+
24+
@Override
25+
public AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {
26+
return client;
27+
}
28+
}

instrumentation/aws-sdk/aws-sdk-1.11/library/src/test/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/SqsTracingTest.groovy

-24
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.awssdk.v1_11;
7+
8+
import static java.util.Collections.singletonList;
9+
10+
import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;
11+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
12+
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
13+
import org.junit.jupiter.api.extension.RegisterExtension;
14+
15+
class SqsTracingTest extends AbstractSqsTracingTest {
16+
17+
@RegisterExtension
18+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
19+
20+
@Override
21+
protected InstrumentationExtension testing() {
22+
return testing;
23+
}
24+
25+
@Override
26+
public AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {
27+
return client.withRequestHandlers(
28+
AwsSdkTelemetry.builder(testing().getOpenTelemetry())
29+
.setCaptureExperimentalSpanAttributes(true)
30+
.setMessagingReceiveInstrumentationEnabled(true)
31+
.setCapturedHeaders(singletonList("test-message-header"))
32+
.build()
33+
.newRequestHandler());
34+
}
35+
}

0 commit comments

Comments
 (0)