Skip to content

Commit 19ecad4

Browse files
committed
Merge PR #235: Update aws-resources module to follow style guide
2 parents dcbbab0 + 941b89d commit 19ecad4

File tree

9 files changed

+18
-7
lines changed

9 files changed

+18
-7
lines changed

aws-resources/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ description = "OpenTelemetry AWS Resources Support"
88
otelJava.moduleName.set("io.opentelemetry.contrib.aws.resource")
99

1010
dependencies {
11+
annotationProcessor("com.google.auto.service:auto-service")
12+
1113
api("io.opentelemetry:opentelemetry-api")
1214
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
1315
api("io.opentelemetry:opentelemetry-sdk")
@@ -16,13 +18,15 @@ dependencies {
1618
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1719

1820
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
21+
compileOnly("com.google.auto.service:auto-service")
1922

2023
implementation("com.fasterxml.jackson.core:jackson-core")
2124
implementation("com.squareup.okhttp3:okhttp")
2225

2326
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
2427
testImplementation("io.opentelemetry:opentelemetry-api-incubator")
2528
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
29+
testImplementation("com.google.auto.service:auto-service")
2630

2731
testImplementation("com.linecorp.armeria:armeria-junit5")
2832
testRuntimeOnly("org.bouncycastle:bcpkix-jdk15on")

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package io.opentelemetry.contrib.aws.resource;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
910
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1011
import io.opentelemetry.sdk.resources.Resource;
1112

1213
/** {@link ResourceProvider} for automatically configuring {@link BeanstalkResource}. */
14+
@AutoService(ResourceProvider.class)
1315
public final class BeanstalkResourceProvider extends CloudResourceProvider {
1416
@Override
1517
public Resource createResource(ConfigProperties config) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package io.opentelemetry.contrib.aws.resource;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
910
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1011
import io.opentelemetry.sdk.resources.Resource;
1112

1213
/** {@link ResourceProvider} for automatically configuring {@link Ec2Resource}. */
14+
@AutoService(ResourceProvider.class)
1315
public final class Ec2ResourceProvider extends CloudResourceProvider {
1416
@Override
1517
public Resource createResource(ConfigProperties config) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResourceProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package io.opentelemetry.contrib.aws.resource;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
910
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1011
import io.opentelemetry.sdk.resources.Resource;
1112

1213
/** {@link ResourceProvider} for automatically configuring {@link EcsResource}. */
14+
@AutoService(ResourceProvider.class)
1315
public final class EcsResourceProvider extends CloudResourceProvider {
1416
@Override
1517
public Resource createResource(ConfigProperties config) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResourceProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package io.opentelemetry.contrib.aws.resource;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
910
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1011
import io.opentelemetry.sdk.resources.Resource;
1112

1213
/** {@link ResourceProvider} for automatically configuring {@link EksResource}. */
14+
@AutoService(ResourceProvider.class)
1315
public final class EksResourceProvider extends CloudResourceProvider {
1416
@Override
1517
public Resource createResource(ConfigProperties config) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResourceProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package io.opentelemetry.contrib.aws.resource;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
910
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1011
import io.opentelemetry.sdk.resources.Resource;
1112

1213
/** {@link ResourceProvider} for automatically configuring {@link LambdaResource}. */
14+
@AutoService(ResourceProvider.class)
1315
public final class LambdaResourceProvider extends CloudResourceProvider {
1416
@Override
1517
public Resource createResource(ConfigProperties config) {

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.aws.resource.internal;
77

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
910
import io.opentelemetry.contrib.aws.resource.BeanstalkResource;
1011
import io.opentelemetry.contrib.aws.resource.Ec2Resource;
@@ -15,7 +16,9 @@
1516
import io.opentelemetry.sdk.resources.Resource;
1617
import io.opentelemetry.sdk.resources.ResourceBuilder;
1718

18-
public class AwsResourceDetector implements ComponentProvider<Resource> {
19+
@AutoService(ComponentProvider.class)
20+
@SuppressWarnings("rawtypes")
21+
public final class AwsResourceDetector implements ComponentProvider<Resource> {
1922

2023
@Override
2124
public Class<Resource> getType() {

aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider

Lines changed: 0 additions & 5 deletions
This file was deleted.

aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)