Skip to content

Commit 8a44464

Browse files
committed
Merge PR #241: Update azure-resources module to follow style guide
2 parents 670f193 + fc6cbd1 commit 8a44464

10 files changed

+26
-13
lines changed

azure-resources/build.gradle.kts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55
id("maven-publish")
66
}
77

8-
description = "OpenTelemetry GCP Resources Support"
9-
otelJava.moduleName.set("io.opentelemetry.contrib.gcp.resource")
8+
description = "OpenTelemetry Azure Resources Support"
9+
otelJava.moduleName.set("io.opentelemetry.contrib.azure.resource")
1010

1111
// enable publishing to maven local
1212
java {
@@ -22,6 +22,9 @@ dependencies {
2222

2323
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
2424

25+
annotationProcessor("com.google.auto.service:auto-service")
26+
compileOnly("com.google.auto.service:auto-service-annotations")
27+
2528
implementation("com.fasterxml.jackson.core:jackson-core")
2629
implementation("com.squareup.okhttp3:okhttp")
2730

@@ -30,6 +33,8 @@ dependencies {
3033
testImplementation("io.opentelemetry:opentelemetry-api-incubator")
3134
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
3235

36+
testImplementation("com.google.auto.service:auto-service")
37+
3338
// testImplementation("org.mockito:mockito-core")
3439
testImplementation("com.google.guava:guava")
3540

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAksResourceProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.Optional;
1515
import java.util.function.Supplier;
1616

17-
public class AzureAksResourceProvider extends CloudResourceProvider {
17+
public final class AzureAksResourceProvider extends CloudResourceProvider {
1818

1919
private static final Map<String, AzureVmResourceProvider.Entry> COMPUTE_MAPPING = new HashMap<>();
2020

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@
1313
import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.SERVICE_INSTANCE_ID;
1414
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
1515

16+
import com.google.auto.service.AutoService;
1617
import io.opentelemetry.api.common.AttributeKey;
1718
import io.opentelemetry.api.common.Attributes;
1819
import io.opentelemetry.api.common.AttributesBuilder;
1920
import io.opentelemetry.api.internal.StringUtils;
21+
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
2022
import io.opentelemetry.sdk.resources.Resource;
2123
import java.util.HashMap;
2224
import java.util.Map;
2325
import java.util.Objects;
2426
import javax.annotation.Nullable;
2527

26-
public class AzureAppServiceResourceProvider extends CloudResourceProvider {
28+
@AutoService(ResourceProvider.class)
29+
public final class AzureAppServiceResourceProvider extends CloudResourceProvider {
2730

2831
static final AttributeKey<String> AZURE_APP_SERVICE_STAMP_RESOURCE_ATTRIBUTE =
2932
AttributeKey.stringKey("azure.app.service.stamp");

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.HashMap;
1717
import java.util.Map;
1818

19-
public class AzureContainersResourceProvider extends CloudResourceProvider {
19+
public final class AzureContainersResourceProvider extends CloudResourceProvider {
2020

2121
static final String CONTAINER_APP_NAME = "CONTAINER_APP_NAME";
2222

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.FAAS_NAME;
1313
import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.FAAS_VERSION;
1414

15+
import com.google.auto.service.AutoService;
1516
import io.opentelemetry.api.common.AttributeKey;
1617
import io.opentelemetry.api.common.Attributes;
1718
import io.opentelemetry.api.common.AttributesBuilder;
19+
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1820
import io.opentelemetry.sdk.resources.Resource;
1921
import java.util.HashMap;
2022
import java.util.Map;
2123

22-
public class AzureFunctionsResourceProvider extends CloudResourceProvider {
24+
@AutoService(ResourceProvider.class)
25+
public final class AzureFunctionsResourceProvider extends CloudResourceProvider {
2326

2427
static final String FUNCTIONS_VERSION = "FUNCTIONS_EXTENSION_VERSION";
2528
private static final String FUNCTIONS_MEM_LIMIT = "WEBSITE_MEMORY_LIMIT_MB";

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureMetadataService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import okhttp3.Request;
2020
import okhttp3.Response;
2121

22-
public class AzureMetadataService {
22+
public final class AzureMetadataService {
2323
static final JsonFactory JSON_FACTORY = new JsonFactory();
2424
private static final URL METADATA_URL;
2525

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureResourceDetector.java

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

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

8+
import com.google.auto.service.AutoService;
89
import io.opentelemetry.api.common.Attributes;
910
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1011
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1112
import io.opentelemetry.sdk.resources.Resource;
1213
import io.opentelemetry.sdk.resources.ResourceBuilder;
1314

14-
public class AzureResourceDetector implements ComponentProvider<Resource> {
15+
@AutoService(ComponentProvider.class)
16+
@SuppressWarnings("rawtypes")
17+
public final class AzureResourceDetector implements ComponentProvider<Resource> {
1518

1619
@Override
1720
public Class<Resource> getType() {

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919

2020
import com.fasterxml.jackson.core.JsonParser;
2121
import com.fasterxml.jackson.core.JsonToken;
22+
import com.google.auto.service.AutoService;
2223
import io.opentelemetry.api.common.AttributeKey;
2324
import io.opentelemetry.api.common.Attributes;
2425
import io.opentelemetry.api.common.AttributesBuilder;
26+
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
2527
import io.opentelemetry.sdk.resources.Resource;
2628
import java.io.IOException;
2729
import java.util.HashMap;
@@ -34,7 +36,8 @@
3436
import java.util.logging.Logger;
3537
import org.jetbrains.annotations.NotNull;
3638

37-
public class AzureVmResourceProvider extends CloudResourceProvider {
39+
@AutoService(ResourceProvider.class)
40+
public final class AzureVmResourceProvider extends CloudResourceProvider {
3841

3942
static class Entry {
4043
final AttributeKey<String> key;

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

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

azure-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)