Skip to content

Commit 53c7c3a

Browse files
renovate[bot]otelbot[bot]trask
authored
fix(deps): update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.41.0 (open-telemetry#18449)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 5ef2fa1 commit 53c7c3a

14 files changed

Lines changed: 17 additions & 20 deletions

File tree

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ val asmVersion = "9.9.1"
4343
val jmhVersion = "1.37"
4444
val mockitoVersion = "4.11.0"
4545
val slf4jVersion = "2.0.17"
46-
val semConvVersion = "1.40.0"
46+
val semConvVersion = "1.41.0"
4747
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
4848

4949
val CORE_DEPENDENCIES = listOf(

instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.jbosslogmanager.appender.v1_1;
77

8-
import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OTEL_EVENT_NAME;
8+
import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME;
99
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID;
1010
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME;
1111
import static java.util.Collections.emptyList;

instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static io.opentelemetry.semconv.CodeAttributes.CODE_FILE_PATH;
1111
import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME;
1212
import static io.opentelemetry.semconv.CodeAttributes.CODE_LINE_NUMBER;
13-
import static io.opentelemetry.semconv.incubating.OtelIncubatingAttributes.OTEL_EVENT_NAME;
13+
import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME;
1414
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID;
1515
import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME;
1616
import static java.util.Collections.emptyList;

instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static io.opentelemetry.semconv.CodeAttributes.CODE_FILE_PATH;
1212
import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME;
1313
import static io.opentelemetry.semconv.CodeAttributes.CODE_LINE_NUMBER;
14+
import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME;
1415
import static java.util.Collections.emptyList;
1516

1617
import io.opentelemetry.api.common.AttributeKey;
@@ -42,8 +43,6 @@ public final class LogEventMapper<T> {
4243
// copied from ThreadIncubatingAttributes
4344
private static final AttributeKey<Long> THREAD_ID = AttributeKey.longKey("thread.id");
4445
private static final AttributeKey<String> THREAD_NAME = stringKey("thread.name");
45-
// copied from OtelIncubatingAttributes
46-
private static final AttributeKey<String> OTEL_EVENT_NAME = stringKey("otel.event.name");
4746
private static final String SPECIAL_MAP_MESSAGE_ATTRIBUTE = "message";
4847

4948
private static final Cache<String, AttributeKey<String>> contextDataAttributeKeyCache =

instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import static io.opentelemetry.semconv.CodeAttributes.CODE_FILE_PATH;
1111
import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME;
1212
import static io.opentelemetry.semconv.CodeAttributes.CODE_LINE_NUMBER;
13+
import static io.opentelemetry.semconv.OtelAttributes.OTEL_EVENT_NAME;
1314
import static java.util.Collections.emptyList;
1415
import static java.util.Collections.singletonList;
1516
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -72,9 +73,6 @@ public final class LoggingEventMapper {
7273
AttributeKey.stringKey("log.body.template");
7374
private static final AttributeKey<List<String>> LOG_BODY_PARAMETERS =
7475
AttributeKey.stringArrayKey("log.body.parameters");
75-
// copied from OtelIncubatingAttributes
76-
private static final AttributeKey<String> OTEL_EVENT_NAME =
77-
AttributeKey.stringKey("otel.event.name");
7876

7977
private final boolean captureExperimentalAttributes;
8078
private final List<AttributeKey<String>> captureMdcAttributeKeys;

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package io.opentelemetry.javaagent.tooling.resources;
77

8-
import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME;
9-
import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION;
8+
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME;
9+
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION;
1010

1111
import com.google.auto.service.AutoService;
1212
import io.opentelemetry.api.common.Attributes;

licenses/licenses.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE;
1010
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID;
1111
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
12-
import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME;
13-
import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION;
12+
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME;
13+
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION;
1414

1515
import io.opentelemetry.api.trace.SpanKind;
1616
import org.assertj.core.api.AbstractCharSequenceAssert;

smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
99
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
10+
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME;
1011
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
1112
import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_NAME;
1213
import static io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH;
13-
import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME;
1414

1515
import org.junit.jupiter.api.condition.DisabledIf;
1616
import org.junit.jupiter.params.ParameterizedTest;

smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.smoketest;
77

8-
import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION;
8+
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_VERSION;
99
import static org.assertj.core.api.Assertions.assertThat;
1010

1111
import io.grpc.ManagedChannel;

0 commit comments

Comments
 (0)