Skip to content

fix version resolution for semconv #2263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 15, 2025
Merged

fix version resolution for semconv #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baeb2ed
fix version resolution for semconv
zeitlinger Sep 15, 2025
11fbc11
fix version resolution for semconv
zeitlinger Sep 15, 2025
0eccc4e
fix version resolution for semconv
zeitlinger Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...resources/src/main/java/io/opentelemetry/contrib/azure/resource/IncubatingAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ final class IncubatingAttributes {
AttributeKey.stringKey("cloud.resource_id");

public static final class CloudPlatformIncubatingValues {
public static final String AZURE_VM = "azure_vm";
public static final String AZURE_AKS = "azure_aks";
public static final String AZURE_FUNCTIONS = "azure_functions";
public static final String AZURE_APP_SERVICE = "azure_app_service";
public static final String AZURE_VM = "azure.vm";
public static final String AZURE_AKS = "azure.aks";
public static final String AZURE_FUNCTIONS = "azure.functions";
public static final String AZURE_APP_SERVICE = "azure.app_service";

private CloudPlatformIncubatingValues() {}
}
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void defaultValues() {
createResource(DEFAULT_ENV_VARS)
.containsEntry(SERVICE_NAME, TEST_WEBSITE_SITE_NAME)
.containsEntry(CLOUD_PROVIDER, "azure")
.containsEntry(CLOUD_PLATFORM, "azure_app_service")
.containsEntry(CLOUD_PLATFORM, "azure.app_service")
.containsEntry(
CLOUD_RESOURCE_ID,
"/subscriptions/TEST_WEBSITE_OWNER_NAME/resourceGroups/TEST_WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/TEST_WEBSITE_SITE_NAME")
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AzureFunctionsResourceProviderTest {
void defaultValues() {
createResource(DEFAULT_ENV_VARS)
.containsEntry(CLOUD_PROVIDER, "azure")
.containsEntry(CLOUD_PLATFORM, "azure_functions")
.containsEntry(CLOUD_PLATFORM, "azure.functions")
.containsEntry(FAAS_NAME, TEST_WEBSITE_SITE_NAME)
.containsEntry(FAAS_VERSION, TEST_FUNCTION_VERSION)
.containsEntry(FAAS_INSTANCE, TEST_WEBSITE_INSTANCE_ID)
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ tasks {
exceptionFormat = TestExceptionFormat.FULL
showStandardStreams = true
}

configure<JacocoTaskExtension> {
// only care about code coverage for code in this repository
// (in particular avoiding netty classes which sometimes end up
Expand Down
10 changes: 5 additions & 5 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ dependencies {
// under JvmTestSuite so they don't show up as runtime dependencies in license and vulnerability scans
// (the constraints section below doesn't have this issue, and will only show up
// as runtime dependencies if they are actually used as runtime dependencies)
api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.20.0"))
api(enforcedPlatform("com.google.protobuf:protobuf-bom:4.32.1"))
api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
api(platform("com.google.protobuf:protobuf-bom:4.32.1"))
api(platform("com.squareup.okhttp3:okhttp-bom:5.1.0"))

constraints {
api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}")
api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}-alpha")

api("com.google.auto.service:auto-service:1.1.1")
api("com.google.auto.service:auto-service-annotations:1.1.1")
Expand Down
Loading