Skip to content

Commit 2f94c78

Browse files
renovate[bot]otelbot[bot]traskCopilot
authored
fix(deps): update semconvversion to v1.42.0 (#19020)
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> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 7a4599e commit 2f94c78

9 files changed

Lines changed: 21 additions & 5 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.10.1"
4343
val jmhVersion = "1.37"
4444
val mockitoVersion = "4.11.0"
4545
val slf4jVersion = "2.0.18"
46-
val semConvVersion = "1.41.1"
46+
val semConvVersion = "1.42.0"
4747
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
4848

4949
val CORE_DEPENDENCIES = listOf(

instrumentation/aws-sdk/aws-sdk-2.2/library/src/testBedrockRuntime/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/Aws2BedrockRuntimeTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
import software.amazon.awssdk.services.bedrockruntime.model.ToolUseBlockStart;
7272
import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
7373

74+
// TODO: Remove after https://github.com/open-telemetry/semantic-conventions-genai/issues/247
75+
// is resolved.
76+
@SuppressWarnings("OtelDeprecatedApiUsage")
7477
class Aws2BedrockRuntimeTest extends AbstractAws2BedrockRuntimeTest {
7578

7679
@RegisterExtension

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2BedrockRuntimeTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
import software.amazon.awssdk.services.bedrockruntime.model.ToolUseBlockStart;
8787
import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory;
8888

89+
// TODO: Remove after https://github.com/open-telemetry/semantic-conventions-genai/issues/247
90+
// is resolved.
91+
@SuppressWarnings("OtelDeprecatedApiUsage")
8992
public abstract class AbstractAws2BedrockRuntimeTest {
9093
protected static final String INSTRUMENTATION_NAME = "io.opentelemetry.aws-sdk-2.2";
9194

instrumentation/openai/openai-java-1.1/library/src/test/java/io/opentelemetry/instrumentation/openai/v1_1/ChatTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
import org.junit.jupiter.api.Test;
4848
import org.junit.jupiter.api.extension.RegisterExtension;
4949

50+
// TODO: Remove after https://github.com/open-telemetry/semantic-conventions-genai/issues/247
51+
// is resolved.
52+
@SuppressWarnings("OtelDeprecatedApiUsage")
5053
class ChatTest extends AbstractChatTest {
5154

5255
@RegisterExtension

instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractChatTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
import org.junit.jupiter.api.Test;
8080
import org.junit.jupiter.api.extension.RegisterExtension;
8181

82+
// TODO: Remove after https://github.com/open-telemetry/semantic-conventions-genai/issues/247
83+
// is resolved.
84+
@SuppressWarnings("OtelDeprecatedApiUsage")
8285
public abstract class AbstractChatTest extends AbstractOpenAiTest {
8386

8487
protected static final String TEST_CHAT_MODEL = "gpt-4o-mini";

instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractEmbeddingsTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
import org.junit.jupiter.api.Test;
3939
import org.junit.jupiter.api.extension.RegisterExtension;
4040

41+
// TODO: Remove after https://github.com/open-telemetry/semantic-conventions-genai/issues/247
42+
// is resolved.
43+
@SuppressWarnings("OtelDeprecatedApiUsage")
4144
public abstract class AbstractEmbeddingsTest extends AbstractOpenAiTest {
4245
private static final String MODEL = "text-embedding-3-small";
4346

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java

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

66
package io.opentelemetry.instrumentation.resources;
77

8-
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
8+
import static io.opentelemetry.semconv.ContainerAttributes.CONTAINER_ID;
99
import static java.nio.charset.StandardCharsets.UTF_8;
1010
import static org.assertj.core.api.Assertions.assertThat;
1111
import static org.mockito.Mockito.verifyNoInteractions;
@@ -26,6 +26,7 @@
2626
class ContainerResourceTest {
2727

2828
private static final String TEST_CONTAINER_ID = "abcdef123123deadbeef";
29+
2930
@Mock CgroupV1ContainerIdExtractor v1;
3031
@Mock CgroupV2ContainerIdExtractor v2;
3132

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/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package io.opentelemetry.smoketest;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
9+
import static io.opentelemetry.semconv.ContainerAttributes.CONTAINER_ID;
910
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
1011
import static io.opentelemetry.semconv.TelemetryAttributes.TELEMETRY_DISTRO_NAME;
11-
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
1212
import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_NAME;
1313
import static io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH;
1414

0 commit comments

Comments
 (0)