diff --git a/universal-profiling-integration/src/main/java/co/elastic/otel/ProfilerSharedMemoryWriter.java b/universal-profiling-integration/src/main/java/co/elastic/otel/ProfilerSharedMemoryWriter.java index 0c1771fc5..f4030ef14 100644 --- a/universal-profiling-integration/src/main/java/co/elastic/otel/ProfilerSharedMemoryWriter.java +++ b/universal-profiling-integration/src/main/java/co/elastic/otel/ProfilerSharedMemoryWriter.java @@ -52,8 +52,7 @@ static ByteBuffer generateProcessCorrelationStorage( if (serviceName == null) { throw new IllegalStateException("A service name must be configured!"); } - String environment = - serviceResource.getAttribute(UniversalProfilingIncubatingAttributes.SERVICE_NAMESPACE); + String environment = serviceResource.getAttribute(ServiceAttributes.SERVICE_NAMESPACE); ByteBuffer buffer = ByteBuffer.allocateDirect(4096); buffer.order(ByteOrder.nativeOrder()); diff --git a/universal-profiling-integration/src/main/java/co/elastic/otel/UniversalProfilingIncubatingAttributes.java b/universal-profiling-integration/src/main/java/co/elastic/otel/UniversalProfilingIncubatingAttributes.java index 96d03c829..d46f80971 100644 --- a/universal-profiling-integration/src/main/java/co/elastic/otel/UniversalProfilingIncubatingAttributes.java +++ b/universal-profiling-integration/src/main/java/co/elastic/otel/UniversalProfilingIncubatingAttributes.java @@ -26,7 +26,5 @@ private UniversalProfilingIncubatingAttributes() {} // not yet part of stable semantic conventions, inlined here to prevent dependency issues - public static final AttributeKey SERVICE_NAMESPACE = - AttributeKey.stringKey("service.namespace"); public static final AttributeKey HOST_ID = AttributeKey.stringKey("host.id"); } diff --git a/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingIncubatingAttributesTest.java b/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingIncubatingAttributesTest.java index e74e369b4..37a10a130 100644 --- a/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingIncubatingAttributesTest.java +++ b/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingIncubatingAttributesTest.java @@ -22,18 +22,10 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; public class UniversalProfilingIncubatingAttributesTest { - @Test - void serviceNamespace() { - check( - UniversalProfilingIncubatingAttributes.SERVICE_NAMESPACE, - ServiceIncubatingAttributes.SERVICE_NAMESPACE); - } - @Test void hostId() { check(UniversalProfilingIncubatingAttributes.HOST_ID, HostIncubatingAttributes.HOST_ID); diff --git a/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingProcessorTest.java b/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingProcessorTest.java index a7d68ccc6..0d0e09af2 100644 --- a/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingProcessorTest.java +++ b/universal-profiling-integration/src/test/java/co/elastic/otel/UniversalProfilingProcessorTest.java @@ -49,7 +49,6 @@ import io.opentelemetry.sdk.trace.samplers.SamplingResult; import io.opentelemetry.semconv.ServiceAttributes; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.lang.ref.WeakReference; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -254,7 +253,7 @@ public void testProcessStoragePopulated() { Resource withNamespace = Resource.builder() .put(ServiceAttributes.SERVICE_NAME, "service Ä 1") - .put(ServiceIncubatingAttributes.SERVICE_NAMESPACE, "my nameßspace") + .put(ServiceAttributes.SERVICE_NAMESPACE, "my nameßspace") .build(); try (OpenTelemetrySdk sdk = initSdk(withNamespace, b -> {}, Sampler.alwaysOn())) { checkProcessStorage("service Ä 1", "my nameßspace");