From 0ae1a59bdfe773c4ce58b8256eed1f7fbcfbc1b2 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 9 Oct 2023 14:34:12 +0300 Subject: [PATCH] Remove last usages of old semconv (#9627) --- examples/distro/agent/build.gradle | 1 - examples/distro/testing/agent-for-testing/build.gradle | 1 - .../javaagent/src/test/groovy/AbstractServlet3Test.groovy | 2 +- .../javaagent/src/test/groovy/AbstractServlet5Test.groovy | 2 +- testing-common/build.gradle.kts | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/distro/agent/build.gradle b/examples/distro/agent/build.gradle index 99d96a227d..32dceefe8a 100644 --- a/examples/distro/agent/build.gradle +++ b/examples/distro/agent/build.gradle @@ -75,7 +75,6 @@ tasks { exclude("io.opentelemetry:opentelemetry-api") exclude("io.opentelemetry:opentelemetry-api-events") exclude("io.opentelemetry:opentelemetry-context") - exclude("io.opentelemetry:opentelemetry-semconv") // metrics advice API exclude("io.opentelemetry:opentelemetry-extension-incubator") } diff --git a/examples/distro/testing/agent-for-testing/build.gradle b/examples/distro/testing/agent-for-testing/build.gradle index bc10db1d18..69c1944143 100644 --- a/examples/distro/testing/agent-for-testing/build.gradle +++ b/examples/distro/testing/agent-for-testing/build.gradle @@ -72,7 +72,6 @@ tasks { exclude("io.opentelemetry:opentelemetry-api") exclude("io.opentelemetry:opentelemetry-api-events") exclude("io.opentelemetry:opentelemetry-context") - exclude("io.opentelemetry:opentelemetry-semconv") // metrics advice API exclude("io.opentelemetry:opentelemetry-extension-incubator") } diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy index 40e780135f..9e0f5b7228 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.semconv.SemanticAttributes import javax.servlet.Servlet diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy index ea8957d496..995033e14f 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/AbstractServlet5Test.groovy @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.semconv.SemanticAttributes import jakarta.servlet.Servlet import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.AUTH_REQUIRED diff --git a/testing-common/build.gradle.kts b/testing-common/build.gradle.kts index ba5070f562..eed7b91d5e 100644 --- a/testing-common/build.gradle.kts +++ b/testing-common/build.gradle.kts @@ -34,7 +34,6 @@ dependencies { api("org.junit.jupiter:junit-jupiter-params") api("io.opentelemetry:opentelemetry-api") - api("io.opentelemetry:opentelemetry-semconv") api("io.opentelemetry:opentelemetry-sdk") api("io.opentelemetry:opentelemetry-sdk-testing") api(project(":instrumentation-api"))