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.

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

Convert aws 1.11 client tests from groovy to java #12606

Merged
merged 8 commits into from
Nov 12, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
autoconfigure
jaydeluca committed Nov 10, 2024
commit 547b2950f5d66a84c6f13d118d334cbd61bba8ce
Original file line number Diff line number Diff line change
@@ -16,12 +16,12 @@ class DynamoDbClientTest extends AbstractDynamoDbClientTest {
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();

@Override
public AmazonDynamoDBClientBuilder configureClient(AmazonDynamoDBClientBuilder client) {
return client;
protected InstrumentationExtension testing() {
return testing;
}

@Override
protected InstrumentationExtension testing() {
return testing;
public AmazonDynamoDBClientBuilder configureClient(AmazonDynamoDBClientBuilder clientBuilder) {
return clientBuilder;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;

import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractDynamoDbClientTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;

class DynamoDbClientTest extends AbstractDynamoDbClientTest {
@RegisterExtension
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();

@Override
protected InstrumentationExtension testing() {
return testing;
}

@Override
public AmazonDynamoDBClientBuilder configureClient(AmazonDynamoDBClientBuilder client) {
return client;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;

import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractEc2ClientTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;

class Ec2ClientTest extends AbstractEc2ClientTest {
@RegisterExtension
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();

@Override
protected InstrumentationExtension testing() {
return testing;
}

@Override
public AmazonEC2ClientBuilder configureClient(AmazonEC2ClientBuilder clientBuilder) {
return clientBuilder;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;

import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractKinesisClientTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;

class KinesisClientTest extends AbstractKinesisClientTest {
@RegisterExtension
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();

@Override
protected InstrumentationExtension testing() {
return testing;
}

@Override
public AmazonKinesisClientBuilder configureClient(AmazonKinesisClientBuilder clientBuilder) {
return clientBuilder;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;

import com.amazonaws.services.rds.AmazonRDSClientBuilder;
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractRdsClientTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;

class RdsClientTest extends AbstractRdsClientTest {
@RegisterExtension
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();

@Override
protected InstrumentationExtension testing() {
return testing;
}

@Override
public AmazonRDSClientBuilder configureClient(AmazonRDSClientBuilder client) {
return client;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;

import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractS3ClientTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;

class S3ClientTest extends AbstractS3ClientTest {
@RegisterExtension
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();

@Override
protected InstrumentationExtension testing() {
return testing;
}

@Override
public AmazonS3ClientBuilder configureClient(AmazonS3ClientBuilder client) {
return client;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;

import com.amazonaws.services.sns.AmazonSNSClientBuilder;
import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractSnsClientTest;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
import org.junit.jupiter.api.extension.RegisterExtension;

class SnsClientTest extends AbstractSnsClientTest {
@RegisterExtension
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();

@Override
protected InstrumentationExtension testing() {
return testing;
}

@Override
public AmazonSNSClientBuilder configureClient(AmazonSNSClientBuilder clientBuilder) {
return clientBuilder;
}
}