Skip to content

Commit 9c2067f

Browse files
committed
app server component provider
1 parent 4ae3dec commit 9c2067f

File tree

8 files changed

+65
-8
lines changed

8 files changed

+65
-8
lines changed

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ComponentProviderTest.java renamed to aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ResourceComponentProviderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import org.junit.jupiter.api.Test;
88
import java.util.List;
99

10-
public class ComponentProviderTest {
10+
public class ResourceComponentProviderTest {
1111

1212
@Test
1313
@SuppressWarnings("rawtypes")
1414
void providerIsLoaded() {
1515
List<ComponentProvider> providers = SpiHelper.create(
16-
ComponentProviderTest.class.getClassLoader())
16+
ResourceComponentProviderTest.class.getClassLoader())
1717
.load(ComponentProvider.class);
1818
assertThat(providers).extracting(ComponentProvider::getName)
1919
.containsExactly("aws");

azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ComponentProviderTest.java renamed to azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ResourceComponentProviderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import java.util.List;
88
import org.junit.jupiter.api.Test;
99

10-
public class ComponentProviderTest {
10+
public class ResourceComponentProviderTest {
1111

1212
@Test
1313
@SuppressWarnings("rawtypes")
1414
void providerIsLoaded() {
1515
List<ComponentProvider> providers = SpiHelper.create(
16-
ComponentProviderTest.class.getClassLoader())
16+
ResourceComponentProviderTest.class.getClassLoader())
1717
.load(ComponentProvider.class);
1818
assertThat(providers).extracting(ComponentProvider::getName)
1919
.containsExactly("azure");
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import java.util.List;
88
import org.junit.jupiter.api.Test;
99

10-
public class ComponentProviderTest {
10+
public class ResourceComponentProviderTest {
1111

1212
@Test
1313
@SuppressWarnings("rawtypes")
1414
void providerIsLoaded() {
1515
List<ComponentProvider> providers = SpiHelper.create(
16-
ComponentProviderTest.class.getClassLoader())
16+
ResourceComponentProviderTest.class.getClassLoader())
1717
.load(ComponentProvider.class);
1818
assertThat(providers).extracting(ComponentProvider::getName)
1919
.containsExactly("cloud_foundry");

gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/ComponentProviderTest.java renamed to gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/ResourceComponentProviderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import java.util.List;
88
import org.junit.jupiter.api.Test;
99

10-
public class ComponentProviderTest {
10+
public class ResourceComponentProviderTest {
1111

1212
@Test
1313
@SuppressWarnings("rawtypes")
1414
void providerIsLoaded() {
1515
List<ComponentProvider> providers = SpiHelper.create(
16-
ComponentProviderTest.class.getClassLoader())
16+
ResourceComponentProviderTest.class.getClassLoader())
1717
.load(ComponentProvider.class);
1818
assertThat(providers).extracting(ComponentProvider::getName)
1919
.containsExactly("gcp");

resource-providers/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ dependencies {
1111

1212
compileOnly("com.google.auto.service:auto-service")
1313
compileOnly("io.opentelemetry:opentelemetry-api")
14+
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
1415
compileOnly("io.opentelemetry:opentelemetry-sdk")
1516
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
1617
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
1718
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
1819
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
1920
testImplementation("com.google.auto.service:auto-service")
2021
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
22+
testImplementation("io.opentelemetry:opentelemetry-api-incubator")
2123
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.contrib.resourceproviders;
7+
8+
import com.google.auto.service.AutoService;
9+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
10+
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
11+
import io.opentelemetry.sdk.resources.Resource;
12+
13+
@SuppressWarnings("rawtypes")
14+
@AutoService(ComponentProvider.class)
15+
public class AppServerResourceDetector implements ComponentProvider<Resource> {
16+
17+
@Override
18+
public Class<Resource> getType() {
19+
return Resource.class;
20+
}
21+
22+
@Override
23+
public String getName() {
24+
return "app_server";
25+
}
26+
27+
@Override
28+
public Resource create(DeclarativeConfigProperties config) {
29+
return new AppServerServiceNameProvider().create();
30+
}
31+
}

resource-providers/src/main/java/io/opentelemetry/contrib/resourceproviders/AppServerServiceNameProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ public AppServerServiceNameProvider() {
3838

3939
@Override
4040
public Resource createResource(ConfigProperties config) {
41+
return create();
42+
}
43+
44+
Resource create() {
4145
String serviceName = detectServiceName();
4246
if (serviceName == null) {
4347
logger.log(
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package io.opentelemetry.contrib.resourceproviders;
2+
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
6+
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
7+
import java.util.List;
8+
import org.junit.jupiter.api.Test;
9+
10+
public class ResourceComponentProviderTest {
11+
12+
@Test
13+
@SuppressWarnings("rawtypes")
14+
void providerIsLoaded() {
15+
List<ComponentProvider> providers = SpiHelper.create(
16+
ResourceComponentProviderTest.class.getClassLoader())
17+
.load(ComponentProvider.class);
18+
assertThat(providers).extracting(ComponentProvider::getName).contains("app_server");
19+
}
20+
}

0 commit comments

Comments
 (0)