Skip to content

Commit 547b295

Browse files
committed
autoconfigure
1 parent 3f8ad53 commit 547b295

File tree

8 files changed

+166
-20
lines changed

8 files changed

+166
-20
lines changed

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/DynamoDbClientTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ class DynamoDbClientTest extends AbstractDynamoDbClientTest {
1616
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1717

1818
@Override
19-
public AmazonDynamoDBClientBuilder configureClient(AmazonDynamoDBClientBuilder client) {
20-
return client;
19+
protected InstrumentationExtension testing() {
20+
return testing;
2121
}
2222

2323
@Override
24-
protected InstrumentationExtension testing() {
25-
return testing;
24+
public AmazonDynamoDBClientBuilder configureClient(AmazonDynamoDBClientBuilder clientBuilder) {
25+
return clientBuilder;
2626
}
2727
}

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

Lines changed: 0 additions & 16 deletions
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.v1_11;
7+
8+
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractDynamoDbClientTest;
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 DynamoDbClientTest extends AbstractDynamoDbClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension testing() {
20+
return testing;
21+
}
22+
23+
@Override
24+
public AmazonDynamoDBClientBuilder configureClient(AmazonDynamoDBClientBuilder client) {
25+
return client;
26+
}
27+
}
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.v1_11;
7+
8+
import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractEc2ClientTest;
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 Ec2ClientTest extends AbstractEc2ClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension testing() {
20+
return testing;
21+
}
22+
23+
@Override
24+
public AmazonEC2ClientBuilder configureClient(AmazonEC2ClientBuilder clientBuilder) {
25+
return clientBuilder;
26+
}
27+
}
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.v1_11;
7+
8+
import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractKinesisClientTest;
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 KinesisClientTest extends AbstractKinesisClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension testing() {
20+
return testing;
21+
}
22+
23+
@Override
24+
public AmazonKinesisClientBuilder configureClient(AmazonKinesisClientBuilder clientBuilder) {
25+
return clientBuilder;
26+
}
27+
}
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.v1_11;
7+
8+
import com.amazonaws.services.rds.AmazonRDSClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractRdsClientTest;
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 RdsClientTest extends AbstractRdsClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension testing() {
20+
return testing;
21+
}
22+
23+
@Override
24+
public AmazonRDSClientBuilder configureClient(AmazonRDSClientBuilder client) {
25+
return client;
26+
}
27+
}
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.v1_11;
7+
8+
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractS3ClientTest;
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 S3ClientTest extends AbstractS3ClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension testing() {
20+
return testing;
21+
}
22+
23+
@Override
24+
public AmazonS3ClientBuilder configureClient(AmazonS3ClientBuilder client) {
25+
return client;
26+
}
27+
}
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.v1_11;
7+
8+
import com.amazonaws.services.sns.AmazonSNSClientBuilder;
9+
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractSnsClientTest;
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 SnsClientTest extends AbstractSnsClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
protected InstrumentationExtension testing() {
20+
return testing;
21+
}
22+
23+
@Override
24+
public AmazonSNSClientBuilder configureClient(AmazonSNSClientBuilder clientBuilder) {
25+
return clientBuilder;
26+
}
27+
}

0 commit comments

Comments
 (0)