deps: remove library to prevent version conflicts

GoogleCloudPlatform · Feb 6, 2025 · 3de8a86 · 3de8a86
1 parent ef8f57f
commit 3de8a86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -132,12 +132,6 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-exporter-logging</artifactId>
     </dependency>
-    <dependency>
-      <!-- Not managed by opentelemetry-bom -->
-      <groupId>io.opentelemetry.semconv</groupId>
-      <artifactId>opentelemetry-semconv</artifactId>
-      <version>1.30.0-rc.1</version>
-    </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>

diff --git a/src/main/java/com/google/cloud/spanner/pgadapter/Server.java b/src/main/java/com/google/cloud/spanner/pgadapter/Server.java
@@ -14,8 +14,6 @@
 
 package com.google.cloud.spanner.pgadapter;
 
-import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
-
 import com.google.auth.Credentials;
 import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter;
 import com.google.cloud.opentelemetry.metric.MetricConfiguration;
@@ -28,6 +26,7 @@
 import com.google.devtools.cloudtrace.v2.AttributeValue;
 import com.google.devtools.cloudtrace.v2.TruncatableString;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
@@ -246,7 +245,7 @@ static OpenTelemetry setupOpenTelemetry(OptionsMetadata optionsMetadata) {
         }
         builder.setFixedAttributes(
             ImmutableMap.of(
-                SERVICE_NAME.getKey(),
+                "service.name",
                 AttributeValue.newBuilder()
                     .setStringValue(TruncatableString.newBuilder().setValue(serviceName).build())
                     .build()));
@@ -278,7 +277,9 @@ static OpenTelemetry setupOpenTelemetry(OptionsMetadata optionsMetadata) {
         openTelemetryBuilder.addMeterProviderCustomizer(
             (sdkMeterProviderBuilder, configProperties) ->
                 sdkMeterProviderBuilder
-                    .addResource(Resource.create(Attributes.of(SERVICE_NAME, serviceName)))
+                    .addResource(
+                        Resource.create(
+                            Attributes.of(AttributeKey.stringKey("service.name"), serviceName)))
                     .registerMetricReader(
                         PeriodicMetricReader.builder(cloudMonitoringExporter).build()));
       }