Skip to content

Commit 1dcbfc1

Browse files
renovate[bot]otelbot[bot]breedx-splklaurit
authored
fix(deps): update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.37.0 (#14535)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <[email protected]> Co-authored-by: Jason Plumb <[email protected]> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent b501775 commit 1dcbfc1

File tree

18 files changed

+540
-481
lines changed

18 files changed

+540
-481
lines changed

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.8"
4343
val jmhVersion = "1.37"
4444
val mockitoVersion = "4.11.0"
4545
val slf4jVersion = "2.0.17"
46-
val semConvVersion = "1.36.0"
46+
val semConvVersion = "1.37.0"
4747
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
4848

4949
val CORE_DEPENDENCIES = listOf(

docs/instrumentation-list.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ libraries:
12791279
type: STRING
12801280
- name: gen_ai.request.model
12811281
type: STRING
1282-
- name: gen_ai.system
1282+
- name: gen_ai.provider.name
12831283
type: STRING
12841284
- name: gen_ai.client.token.usage
12851285
description: Measures number of input and output tokens used.
@@ -1290,7 +1290,7 @@ libraries:
12901290
type: STRING
12911291
- name: gen_ai.request.model
12921292
type: STRING
1293-
- name: gen_ai.system
1293+
- name: gen_ai.provider.name
12941294
type: STRING
12951295
- name: gen_ai.token.type
12961296
type: STRING
@@ -1353,7 +1353,7 @@ libraries:
13531353
type: DOUBLE
13541354
- name: gen_ai.response.finish_reasons
13551355
type: STRING_ARRAY
1356-
- name: gen_ai.system
1356+
- name: gen_ai.provider.name
13571357
type: STRING
13581358
- name: gen_ai.usage.input_tokens
13591359
type: LONG
@@ -4596,7 +4596,7 @@ libraries:
45964596
type: STRING
45974597
- name: gen_ai.response.model
45984598
type: STRING
4599-
- name: gen_ai.system
4599+
- name: gen_ai.provider.name
46004600
type: STRING
46014601
- name: gen_ai.client.token.usage
46024602
description: Measures number of input and output tokens used.
@@ -4609,7 +4609,7 @@ libraries:
46094609
type: STRING
46104610
- name: gen_ai.response.model
46114611
type: STRING
4612-
- name: gen_ai.system
4612+
- name: gen_ai.provider.name
46134613
type: STRING
46144614
- name: gen_ai.token.type
46154615
type: STRING
@@ -4624,7 +4624,7 @@ libraries:
46244624
type: STRING
46254625
- name: gen_ai.response.model
46264626
type: STRING
4627-
- name: gen_ai.system
4627+
- name: gen_ai.provider.name
46284628
type: STRING
46294629
- name: gen_ai.usage.input_tokens
46304630
type: LONG
@@ -4654,7 +4654,7 @@ libraries:
46544654
type: STRING
46554655
- name: gen_ai.response.model
46564656
type: STRING
4657-
- name: gen_ai.system
4657+
- name: gen_ai.provider.name
46584658
type: STRING
46594659
- name: gen_ai.usage.input_tokens
46604660
type: LONG

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/genai/GenAiAttributesExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public final class GenAiAttributesExtractor<REQUEST, RESPONSE>
5252
stringArrayKey("gen_ai.response.finish_reasons");
5353
private static final AttributeKey<String> GEN_AI_RESPONSE_ID = stringKey("gen_ai.response.id");
5454
static final AttributeKey<String> GEN_AI_RESPONSE_MODEL = stringKey("gen_ai.response.model");
55-
static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
55+
static final AttributeKey<String> GEN_AI_PROVIDER_NAME = stringKey("gen_ai.provider.name");
5656
static final AttributeKey<Long> GEN_AI_USAGE_INPUT_TOKENS = longKey("gen_ai.usage.input_tokens");
5757
static final AttributeKey<Long> GEN_AI_USAGE_OUTPUT_TOKENS =
5858
longKey("gen_ai.usage.output_tokens");
@@ -72,7 +72,7 @@ private GenAiAttributesExtractor(GenAiAttributesGetter<REQUEST, RESPONSE> getter
7272
@Override
7373
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
7474
internalSet(attributes, GEN_AI_OPERATION_NAME, getter.getOperationName(request));
75-
internalSet(attributes, GEN_AI_SYSTEM, getter.getSystem(request));
75+
internalSet(attributes, GEN_AI_PROVIDER_NAME, getter.getSystem(request));
7676
internalSet(attributes, GEN_AI_REQUEST_MODEL, getter.getRequestModel(request));
7777
internalSet(attributes, GEN_AI_REQUEST_SEED, getter.getRequestSeed(request));
7878
internalSet(

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/genai/GenAiMetricsAdvice.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package io.opentelemetry.instrumentation.api.incubator.semconv.genai;
77

88
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_OPERATION_NAME;
9+
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_PROVIDER_NAME;
910
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_REQUEST_MODEL;
1011
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_RESPONSE_MODEL;
11-
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_SYSTEM;
1212
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiClientMetrics.GEN_AI_TOKEN_TYPE;
1313
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1414
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
@@ -44,7 +44,7 @@ static void applyClientTokenUsageAdvice(LongHistogramBuilder builder) {
4444
.setAttributesAdvice(
4545
asList(
4646
GEN_AI_OPERATION_NAME,
47-
GEN_AI_SYSTEM,
47+
GEN_AI_PROVIDER_NAME,
4848
GEN_AI_TOKEN_TYPE,
4949
GEN_AI_REQUEST_MODEL,
5050
SERVER_PORT,
@@ -60,7 +60,7 @@ static void applyClientOperationDurationAdvice(DoubleHistogramBuilder builder) {
6060
.setAttributesAdvice(
6161
asList(
6262
GEN_AI_OPERATION_NAME,
63-
GEN_AI_SYSTEM,
63+
GEN_AI_PROVIDER_NAME,
6464
ErrorAttributes.ERROR_TYPE,
6565
GEN_AI_REQUEST_MODEL,
6666
SERVER_PORT,

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeAttributesGetter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ enum BedrockRuntimeAttributesGetter
1717
implements GenAiAttributesGetter<ExecutionAttributes, Response> {
1818
INSTANCE;
1919

20-
static final class GenAiSystemIncubatingValues {
20+
static final class GenAiProviderNameIncubatingValues {
2121
static final String AWS_BEDROCK = "aws.bedrock";
2222

23-
private GenAiSystemIncubatingValues() {}
23+
private GenAiProviderNameIncubatingValues() {}
2424
}
2525

2626
@Override
@@ -30,7 +30,7 @@ public String getOperationName(ExecutionAttributes executionAttributes) {
3030

3131
@Override
3232
public String getSystem(ExecutionAttributes executionAttributes) {
33-
return GenAiSystemIncubatingValues.AWS_BEDROCK;
33+
return GenAiProviderNameIncubatingValues.AWS_BEDROCK;
3434
}
3535

3636
@Nullable

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ private GenAiOperationNameIncubatingValues() {}
8888
}
8989

9090
private static final AttributeKey<String> EVENT_NAME = stringKey("event.name");
91-
private static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
91+
private static final AttributeKey<String> GEN_AI_PROVIDER_NAME =
92+
stringKey("gen_ai.provider.name");
9293

9394
private static final ExecutionAttribute<Document> INVOKE_MODEL_REQUEST_BODY =
9495
new ExecutionAttribute<>(BedrockRuntimeImpl.class.getName() + ".InvokeModelRequestBody");
@@ -1618,7 +1619,8 @@ private static LogRecordBuilder newEvent(Context otelContext, Logger eventLogger
16181619
.logRecordBuilder()
16191620
.setContext(otelContext)
16201621
.setAttribute(
1621-
GEN_AI_SYSTEM, BedrockRuntimeAttributesGetter.GenAiSystemIncubatingValues.AWS_BEDROCK);
1622+
GEN_AI_PROVIDER_NAME,
1623+
BedrockRuntimeAttributesGetter.GenAiProviderNameIncubatingValues.AWS_BEDROCK);
16221624
}
16231625

16241626
private static void emitToolResultEvents(

0 commit comments

Comments
 (0)