Skip to content

Commit d69fd1a

Browse files
jaydelucalaurit
andauthored
Convert Aws sdk 2.2 Client core tests from groovy to java (#12949)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 94b330d commit d69fd1a

File tree

12 files changed

+1171
-834
lines changed

12 files changed

+1171
-834
lines changed

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/groovy/Aws2ClientTest.groovy

-15
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
7+
8+
import io.opentelemetry.instrumentation.awssdk.v2_2.AbstractAws2ClientTest;
9+
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
10+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
11+
import org.junit.jupiter.api.extension.RegisterExtension;
12+
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
13+
14+
class Aws2ClientTest extends AbstractAws2ClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension getTesting() {
20+
return testing;
21+
}
22+
23+
@Override
24+
protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
25+
return ClientOverrideConfiguration.builder();
26+
}
27+
}

instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/src/test/groovy/v2_2/Aws2ClientTest.groovy

-17
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.awssdk.v2_2;
7+
8+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
9+
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
10+
import org.junit.jupiter.api.extension.RegisterExtension;
11+
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
12+
13+
class Aws2ClientTest extends AbstractAws2ClientTest {
14+
@RegisterExtension
15+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
16+
17+
@Override
18+
protected InstrumentationExtension getTesting() {
19+
return testing;
20+
}
21+
22+
@Override
23+
protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
24+
return ClientOverrideConfiguration.builder();
25+
}
26+
}

instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2ClientTest.groovy

-22
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.awssdk.v2_2;
7+
8+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
9+
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
10+
import org.junit.jupiter.api.extension.RegisterExtension;
11+
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
12+
13+
class Aws2ClientTest extends AbstractAws2ClientTest {
14+
@RegisterExtension
15+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
16+
17+
@Override
18+
protected InstrumentationExtension getTesting() {
19+
return testing;
20+
}
21+
22+
@Override
23+
protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
24+
return ClientOverrideConfiguration.builder()
25+
.addExecutionInterceptor(
26+
AwsSdkTelemetry.builder(getTesting().getOpenTelemetry())
27+
.setCaptureExperimentalSpanAttributes(true)
28+
.setUseConfiguredPropagatorForMessaging(isSqsAttributeInjectionEnabled())
29+
.build()
30+
.newExecutionInterceptor());
31+
}
32+
}

instrumentation/aws-sdk/aws-sdk-2.2/library/src/testCoreOnly/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2ClientDynamodbTest.groovy

-24
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.awssdk.v2_2;
7+
8+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
9+
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
10+
import org.junit.jupiter.api.extension.RegisterExtension;
11+
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
12+
13+
class Aws2ClientDynamodbTest extends AbstractAws2ClientCoreTest {
14+
@RegisterExtension
15+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
16+
17+
@Override
18+
protected InstrumentationExtension getTesting() {
19+
return testing;
20+
}
21+
22+
@Override
23+
protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
24+
return ClientOverrideConfiguration.builder()
25+
.addExecutionInterceptor(
26+
AwsSdkTelemetry.builder(getTesting().getOpenTelemetry())
27+
.setCaptureExperimentalSpanAttributes(true)
28+
.setUseConfiguredPropagatorForMessaging(isSqsAttributeInjectionEnabled())
29+
.build()
30+
.newExecutionInterceptor());
31+
}
32+
}

0 commit comments

Comments
 (0)