Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ val asmVersion = "9.8"
val jmhVersion = "1.37"
val mockitoVersion = "4.11.0"
val slf4jVersion = "2.0.17"
val semConvVersion = "1.36.0"
val semConvVersion = "1.37.0"
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")

val CORE_DEPENDENCIES = listOf(
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_OPERATION_NAME;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_PROVIDER_NAME;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_REQUEST_ENCODING_FORMATS;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_REQUEST_MODEL;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_RESPONSE_MODEL;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_SYSTEM;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_TOKEN_TYPE;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_USAGE_INPUT_TOKENS;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GenAiOperationNameIncubatingValues.EMBEDDINGS;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GenAiSystemIncubatingValues.OPENAI;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GenAiProviderNameIncubatingValues.OPENAI;
import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GenAiTokenTypeIncubatingValues.INPUT;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -92,7 +92,7 @@ void basic() {
span.hasName("embeddings text-embedding-3-small")
.hasKind(SpanKind.CLIENT)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
equalTo(GEN_AI_RESPONSE_MODEL, MODEL),
Expand Down Expand Up @@ -121,7 +121,7 @@ void basic() {
point
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
equalTo(GEN_AI_RESPONSE_MODEL, MODEL)))),
Expand All @@ -135,7 +135,7 @@ void basic() {
point
.hasSum(4.0)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
equalTo(GEN_AI_RESPONSE_MODEL, MODEL),
Expand Down Expand Up @@ -165,7 +165,7 @@ void allTheClientOptions() {
span.hasName("embeddings text-embedding-3-small")
.hasKind(SpanKind.CLIENT)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
equalTo(
Expand All @@ -186,7 +186,7 @@ GEN_AI_REQUEST_ENCODING_FORMATS, singletonList("base64")),
point
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
equalTo(GEN_AI_RESPONSE_MODEL, MODEL)))),
Expand All @@ -200,7 +200,7 @@ GEN_AI_REQUEST_ENCODING_FORMATS, singletonList("base64")),
point
.hasSum(4.0)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
equalTo(GEN_AI_RESPONSE_MODEL, MODEL),
Expand Down Expand Up @@ -243,7 +243,7 @@ void connectionError() {
.hasKind(SpanKind.CLIENT)
.hasException(thrown)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL),
// Newer versions of the library populate base64 when unset by
Expand All @@ -270,7 +270,7 @@ void connectionError() {
point
.hasSumGreaterThan(0.0)
.hasAttributesSatisfyingExactly(
equalTo(GEN_AI_SYSTEM, OPENAI),
equalTo(GEN_AI_PROVIDER_NAME, OPENAI),
equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
equalTo(GEN_AI_REQUEST_MODEL, MODEL)))));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void zos() {
Resource resource = OsResource.buildResource();
assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0);
assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE))
.isEqualTo(OsIncubatingAttributes.OsTypeIncubatingValues.Z_OS);
.isEqualTo(OsIncubatingAttributes.OsTypeIncubatingValues.ZOS);
assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty();
}

Expand Down
4 changes: 2 additions & 2 deletions licenses/licenses.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading