Skip to content

Commit 9284308

Browse files
Copilottrask
andcommitted
Update aws-resources module to follow style guide: add @autoservice and static imports
Co-authored-by: trask <[email protected]>
1 parent 5633e28 commit 9284308

File tree

10 files changed

+22
-10
lines changed

10 files changed

+22
-10
lines changed

aws-resources/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ 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+
compileOnly("com.google.auto.service:auto-service")
13+
1114
api("io.opentelemetry:opentelemetry-api")
1215
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
1316
api("io.opentelemetry:opentelemetry-sdk")
@@ -23,6 +26,7 @@ dependencies {
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/EcsResource.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_NAME;
2727
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ECS;
2828
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
29+
import static java.util.Collections.emptyMap;
30+
import static java.util.Collections.singletonList;
2931

3032
import com.fasterxml.jackson.core.JsonFactory;
3133
import com.fasterxml.jackson.core.JsonParser;
@@ -35,7 +37,6 @@
3537
import io.opentelemetry.sdk.resources.Resource;
3638
import io.opentelemetry.semconv.SchemaUrls;
3739
import java.io.IOException;
38-
import java.util.Collections;
3940
import java.util.Locale;
4041
import java.util.Map;
4142
import java.util.Optional;
@@ -88,7 +89,7 @@ static Resource buildResource(Map<String, String> sysEnv, SimpleHttpClient httpC
8889

8990
static void fetchMetadata(
9091
SimpleHttpClient httpClient, String url, AttributesBuilder attrBuilders) {
91-
String json = httpClient.fetchString("GET", url, Collections.emptyMap(), null);
92+
String json = httpClient.fetchString("GET", url, emptyMap(), null);
9293
if (json.isEmpty()) {
9394
return;
9495
}
@@ -103,14 +104,14 @@ static void fetchMetadata(
103104
.getLogGroupArn()
104105
.ifPresent(
105106
logGroupArn -> {
106-
attrBuilders.put(AWS_LOG_GROUP_ARNS, Collections.singletonList(logGroupArn));
107+
attrBuilders.put(AWS_LOG_GROUP_ARNS, singletonList(logGroupArn));
107108
});
108109

109110
logArnBuilder
110111
.getLogStreamArn()
111112
.ifPresent(
112113
logStreamArn -> {
113-
attrBuilders.put(AWS_LOG_STREAM_ARNS, Collections.singletonList(logStreamArn));
114+
attrBuilders.put(AWS_LOG_STREAM_ARNS, singletonList(logStreamArn));
114115
});
115116
} catch (IOException e) {
116117
logger.log(Level.WARNING, "Can't get ECS metadata", e);

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: 3 additions & 0 deletions
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,6 +16,8 @@
1516
import io.opentelemetry.sdk.resources.Resource;
1617
import io.opentelemetry.sdk.resources.ResourceBuilder;
1718

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

2023
@Override

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)