Skip to content

Commit e010e8d

Browse files
authored
fix version resolution for semconv (#2263)
1 parent 269ef39 commit e010e8d

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ final class IncubatingAttributes {
2424
AttributeKey.stringKey("cloud.resource_id");
2525

2626
public static final class CloudPlatformIncubatingValues {
27-
public static final String AZURE_VM = "azure_vm";
28-
public static final String AZURE_AKS = "azure_aks";
29-
public static final String AZURE_FUNCTIONS = "azure_functions";
30-
public static final String AZURE_APP_SERVICE = "azure_app_service";
27+
public static final String AZURE_VM = "azure.vm";
28+
public static final String AZURE_AKS = "azure.aks";
29+
public static final String AZURE_FUNCTIONS = "azure.functions";
30+
public static final String AZURE_APP_SERVICE = "azure.app_service";
3131

3232
private CloudPlatformIncubatingValues() {}
3333
}

azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void defaultValues() {
4848
createResource(DEFAULT_ENV_VARS)
4949
.containsEntry(SERVICE_NAME, TEST_WEBSITE_SITE_NAME)
5050
.containsEntry(CLOUD_PROVIDER, "azure")
51-
.containsEntry(CLOUD_PLATFORM, "azure_app_service")
51+
.containsEntry(CLOUD_PLATFORM, "azure.app_service")
5252
.containsEntry(
5353
CLOUD_RESOURCE_ID,
5454
"/subscriptions/TEST_WEBSITE_OWNER_NAME/resourceGroups/TEST_WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/TEST_WEBSITE_SITE_NAME")

azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AzureFunctionsResourceProviderTest {
3838
void defaultValues() {
3939
createResource(DEFAULT_ENV_VARS)
4040
.containsEntry(CLOUD_PROVIDER, "azure")
41-
.containsEntry(CLOUD_PLATFORM, "azure_functions")
41+
.containsEntry(CLOUD_PLATFORM, "azure.functions")
4242
.containsEntry(FAAS_NAME, TEST_WEBSITE_SITE_NAME)
4343
.containsEntry(FAAS_VERSION, TEST_FUNCTION_VERSION)
4444
.containsEntry(FAAS_INSTANCE, TEST_WEBSITE_INSTANCE_ID)

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ tasks {
7777
exceptionFormat = TestExceptionFormat.FULL
7878
showStandardStreams = true
7979
}
80-
80+
8181
configure<JacocoTaskExtension> {
8282
// only care about code coverage for code in this repository
8383
// (in particular avoiding netty classes which sometimes end up

dependencyManagement/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ dependencies {
1414
// under JvmTestSuite so they don't show up as runtime dependencies in license and vulnerability scans
1515
// (the constraints section below doesn't have this issue, and will only show up
1616
// as runtime dependencies if they are actually used as runtime dependencies)
17-
api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
18-
api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.20.0"))
19-
api(enforcedPlatform("com.google.protobuf:protobuf-bom:4.32.1"))
20-
api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
17+
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
18+
api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
19+
api(platform("com.google.protobuf:protobuf-bom:4.32.1"))
20+
api(platform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
2121

2222
constraints {
2323
api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
24-
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}")
24+
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}-alpha")
2525

2626
api("com.google.auto.service:auto-service:1.1.1")
2727
api("com.google.auto.service:auto-service-annotations:1.1.1")

0 commit comments

Comments
 (0)