diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 64c6f00c6d57..0b9c4971826f 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -43,7 +43,7 @@ val asmVersion = "9.9.1" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.17" -val semConvVersion = "1.40.0" +val semConvVersion = "1.41.0" val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1") val CORE_DEPENDENCIES = listOf( diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java index 6426c8efb3f4..4d212ecc15ab 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.jbosslogmanager.appender.v1_1; -import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OTEL_EVENT_NAME; +import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME; import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID; import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME; import static java.util.Collections.emptyList; diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java index 8a975a3e9b62..33e6f2898133 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java @@ -10,7 +10,7 @@ import static io.opentelemetry.semconv.CodeAttributes.CODE_FILE_PATH; import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME; import static io.opentelemetry.semconv.CodeAttributes.CODE_LINE_NUMBER; -import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OTEL_EVENT_NAME; +import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME; import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID; import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME; import static java.util.Collections.emptyList; diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java index 31bce68dc306..6921fe4d2785 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java @@ -11,6 +11,7 @@ import static io.opentelemetry.semconv.CodeAttributes.CODE_FILE_PATH; import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME; import static io.opentelemetry.semconv.CodeAttributes.CODE_LINE_NUMBER; +import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME; import static java.util.Collections.emptyList; import io.opentelemetry.api.common.AttributeKey; @@ -42,8 +43,6 @@ public final class LogEventMapper { // copied from ThreadIncubatingAttributes private static final AttributeKey THREAD_ID = AttributeKey.longKey("thread.id"); private static final AttributeKey THREAD_NAME = stringKey("thread.name"); - // copied from OtelIncubatingAttributes - private static final AttributeKey OTEL_EVENT_NAME = stringKey("otel.event.name"); private static final String SPECIAL_MAP_MESSAGE_ATTRIBUTE = "message"; private static final Cache> contextDataAttributeKeyCache = diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index 07b9e44c4d1e..bdc577c96c71 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -10,6 +10,7 @@ import static io.opentelemetry.semconv.CodeAttributes.CODE_FILE_PATH; import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME; import static io.opentelemetry.semconv.CodeAttributes.CODE_LINE_NUMBER; +import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -72,9 +73,6 @@ public final class LoggingEventMapper { AttributeKey.stringKey("log.body.template"); private static final AttributeKey> LOG_BODY_PARAMETERS = AttributeKey.stringArrayKey("log.body.parameters"); - // copied from OtelIncubatingAttributes - private static final AttributeKey OTEL_EVENT_NAME = - AttributeKey.stringKey("otel.event.name"); private final boolean captureExperimentalAttributes; private final List> captureMdcAttributeKeys; diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java index 782878082ea7..ac4011b66e1c 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java @@ -5,8 +5,8 @@ package io.opentelemetry.javaagent.tooling.resources; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION; import com.google.auto.service.AutoService; import io.opentelemetry.api.common.Attributes; diff --git a/licenses/licenses.md b/licenses/licenses.md index fd8ec06c66e1..b21759349ba0 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -181,11 +181,11 @@ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**42** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.40.0` +**42** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.41.0` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**43** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.40.0-alpha` +**43** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.41.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) diff --git a/smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java index 486ad50189ae..421615cf7e7e 100644 --- a/smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java @@ -9,8 +9,8 @@ import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION; import io.opentelemetry.api.trace.SpanKind; import org.assertj.core.api.AbstractCharSequenceAssert; diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java index e4c6b4f20807..142d4cd11f39 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java @@ -7,10 +7,10 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME; import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID; import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_NAME; import static io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.params.ParameterizedTest; diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java index 63e053af6ef4..6f552a2287e3 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.smoketest; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION; import static org.assertj.core.api.Assertions.assertThat; import io.grpc.ManagedChannel; diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java index c3fbb7c92494..dd1768299983 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java @@ -6,7 +6,7 @@ package io.opentelemetry.smoketest; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION; import java.time.Duration; import org.junit.jupiter.api.condition.DisabledIf; diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java index 773216ea3f43..7a11af4b9611 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java @@ -10,8 +10,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION; import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OS_TYPE; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID; import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME; diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java index 8644e35ec9e4..c6b847454160 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java @@ -11,12 +11,12 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.ClientAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION; import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; import static io.opentelemetry.semconv.UrlAttributes.URL_PATH; import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OS_TYPE; import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OsTypeIncubatingValues.LINUX; import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OsTypeIncubatingValues.WINDOWS; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; import static org.junit.jupiter.api.Assumptions.assumeFalse; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index 7c277f0ee16a..da8ff53be8f0 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -25,9 +25,9 @@ import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME; import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; -import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; import static io.opentelemetry.semconv.incubating.UrlIncubatingAttributes.URL_TEMPLATE; import static java.util.Arrays.asList; import static java.util.Collections.emptyMap;