Skip to content

Commit f9ac488

Browse files
committed
write new tests in java
1 parent 91a5f2c commit f9ac488

File tree

8 files changed

+201
-215
lines changed

8 files changed

+201
-215
lines changed

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

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

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

-17
This file was deleted.

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ tasks {
4747
// set the value directly (the "library" does not normally query it, only library-autoconfigure)
4848
systemProperty("otel.instrumentation.aws-sdk.experimental-span-attributes", true)
4949
systemProperty("otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", true)
50-
systemProperty("otel.instrumentation.aws-sdk.experimental-record-individual-http-error", true)
5150
}
5251
}

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

-28
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
public class Aws2ClientNotRecordHttpErrorTest extends AbstractAws2ClientRecordHttpErrorTest {
14+
@RegisterExtension
15+
public final LibraryInstrumentationExtension testing = LibraryInstrumentationExtension.create();
16+
17+
@Override
18+
public ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
19+
return ClientOverrideConfiguration.builder()
20+
.addExecutionInterceptor(
21+
AwsSdkTelemetry.builder(testing.getOpenTelemetry())
22+
.setCaptureExperimentalSpanAttributes(true)
23+
.setRecordIndividualHttpError(isRecordIndividualHttpErrorEnabled())
24+
.build()
25+
.newExecutionInterceptor());
26+
}
27+
28+
@Override
29+
public boolean isRecordIndividualHttpErrorEnabled() {
30+
return false;
31+
}
32+
33+
@Override
34+
protected InstrumentationExtension getTesting() {
35+
return testing;
36+
}
37+
}

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.groovy

-154
This file was deleted.

0 commit comments

Comments
 (0)