Skip to content

Commit 85de56d

Browse files
heyamszeitlinger
authored andcommitted
Update
1 parent fafaf49 commit 85de56d

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

azure-resources/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@ plugins {
22
id("otel.java-conventions")
33

44
id("otel.publish-conventions")
5+
id("maven-publish")
56
}
67

78
description = "OpenTelemetry GCP Resources Support"
89
otelJava.moduleName.set("io.opentelemetry.contrib.gcp.resource")
910

11+
// enable publishing to maven local
12+
java {
13+
withSourcesJar()
14+
}
15+
1016
dependencies {
1117
api("io.opentelemetry:opentelemetry-api")
1218
api("io.opentelemetry:opentelemetry-sdk")

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.contrib.azure.resource;
77

88
import io.opentelemetry.api.common.AttributeKey;
9+
import io.opentelemetry.api.common.Attributes;
910
import io.opentelemetry.api.common.AttributesBuilder;
1011
import io.opentelemetry.api.internal.StringUtils;
1112
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -53,9 +54,13 @@ public AzureAppServiceResourceProvider() {
5354

5455
@Override
5556
public Resource createResource(ConfigProperties config) {
57+
return Resource.create(getAttributes());
58+
}
59+
60+
public Attributes getAttributes() {
5661
AzureEnvVarPlatform detect = AzureEnvVarPlatform.detect(env);
5762
if (detect != AzureEnvVarPlatform.APP_SERVICE) {
58-
return Resource.empty();
63+
return Attributes.empty();
5964
}
6065
String name = Objects.requireNonNull(env.get(WEBSITE_SITE_NAME));
6166
AttributesBuilder builder =
@@ -70,7 +75,7 @@ public Resource createResource(ConfigProperties config) {
7075

7176
AzureEnvVarPlatform.addAttributesFromEnv(ENV_VAR_MAPPING, env, builder);
7277

73-
return Resource.create(builder.build());
78+
return builder.build();
7479
}
7580

7681
@Nullable

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.contrib.azure.resource;
77

88
import io.opentelemetry.api.common.AttributeKey;
9+
import io.opentelemetry.api.common.Attributes;
910
import io.opentelemetry.api.common.AttributesBuilder;
1011
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1112
import io.opentelemetry.sdk.resources.Resource;
@@ -42,16 +43,20 @@ public AzureContainersResourceProvider() {
4243

4344
@Override
4445
public Resource createResource(ConfigProperties config) {
46+
return Resource.create(getAttributes());
47+
}
48+
49+
private Attributes getAttributes() {
4550
AzureEnvVarPlatform detect = AzureEnvVarPlatform.detect(env);
4651
if (detect != AzureEnvVarPlatform.CONTAINERS) {
47-
return Resource.empty();
52+
return Attributes.empty();
4853
}
4954

5055
AttributesBuilder builder =
5156
AzureVmResourceProvider.azureAttributeBuilder("azure_container_apps");
5257

5358
AzureEnvVarPlatform.addAttributesFromEnv(ENV_VAR_MAPPING, env, builder);
5459

55-
return Resource.create(builder.build());
60+
return builder.build();
5661
}
5762
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.contrib.azure.resource;
77

88
import io.opentelemetry.api.common.AttributeKey;
9+
import io.opentelemetry.api.common.Attributes;
910
import io.opentelemetry.api.common.AttributesBuilder;
1011
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1112
import io.opentelemetry.sdk.resources.Resource;
@@ -44,9 +45,13 @@ public AzureFunctionsResourceProvider() {
4445

4546
@Override
4647
public Resource createResource(ConfigProperties config) {
48+
return Resource.create(getAttributes());
49+
}
50+
51+
public Attributes getAttributes() {
4752
AzureEnvVarPlatform detect = AzureEnvVarPlatform.detect(env);
4853
if (detect != AzureEnvVarPlatform.FUNCTIONS) {
49-
return Resource.empty();
54+
return Attributes.empty();
5055
}
5156

5257
AttributesBuilder builder =
@@ -60,6 +65,6 @@ public Resource createResource(ConfigProperties config) {
6065

6166
AzureEnvVarPlatform.addAttributesFromEnv(ENV_VAR_MAPPING, env, builder);
6267

63-
return Resource.create(builder.build());
68+
return builder.build();
6469
}
6570
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
io.opentelemetry.contrib.azure.resource.AzureAppServiceResourceProvider
2+
io.opentelemetry.contrib.azure.resource.AzureFunctionsResourceProvider
23
io.opentelemetry.contrib.azure.resource.AzureVmResourceProvider

0 commit comments

Comments
 (0)