Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
14 changes: 7 additions & 7 deletions docs/instrumentation-list.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ libraries:
type: STRING
- name: gen_ai.request.model
type: STRING
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.client.token.usage
description: Measures number of input and output tokens used.
Expand All @@ -1290,7 +1290,7 @@ libraries:
type: STRING
- name: gen_ai.request.model
type: STRING
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.token.type
type: STRING
Expand Down Expand Up @@ -1353,7 +1353,7 @@ libraries:
type: DOUBLE
- name: gen_ai.response.finish_reasons
type: STRING_ARRAY
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.usage.input_tokens
type: LONG
Expand Down Expand Up @@ -4596,7 +4596,7 @@ libraries:
type: STRING
- name: gen_ai.response.model
type: STRING
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.client.token.usage
description: Measures number of input and output tokens used.
Expand All @@ -4609,7 +4609,7 @@ libraries:
type: STRING
- name: gen_ai.response.model
type: STRING
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.token.type
type: STRING
Expand All @@ -4624,7 +4624,7 @@ libraries:
type: STRING
- name: gen_ai.response.model
type: STRING
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.usage.input_tokens
type: LONG
Expand Down Expand Up @@ -4654,7 +4654,7 @@ libraries:
type: STRING
- name: gen_ai.response.model
type: STRING
- name: gen_ai.system
- name: gen_ai.provider.name
type: STRING
- name: gen_ai.usage.input_tokens
type: LONG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class GenAiAttributesExtractor<REQUEST, RESPONSE>
stringArrayKey("gen_ai.response.finish_reasons");
private static final AttributeKey<String> GEN_AI_RESPONSE_ID = stringKey("gen_ai.response.id");
static final AttributeKey<String> GEN_AI_RESPONSE_MODEL = stringKey("gen_ai.response.model");
static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
static final AttributeKey<String> GEN_AI_PROVIDER_NAME = stringKey("gen_ai.provider.name");
static final AttributeKey<Long> GEN_AI_USAGE_INPUT_TOKENS = longKey("gen_ai.usage.input_tokens");
static final AttributeKey<Long> GEN_AI_USAGE_OUTPUT_TOKENS =
longKey("gen_ai.usage.output_tokens");
Expand All @@ -72,7 +72,7 @@ private GenAiAttributesExtractor(GenAiAttributesGetter<REQUEST, RESPONSE> getter
@Override
public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
internalSet(attributes, GEN_AI_OPERATION_NAME, getter.getOperationName(request));
internalSet(attributes, GEN_AI_SYSTEM, getter.getSystem(request));
internalSet(attributes, GEN_AI_PROVIDER_NAME, getter.getSystem(request));
internalSet(attributes, GEN_AI_REQUEST_MODEL, getter.getRequestModel(request));
internalSet(attributes, GEN_AI_REQUEST_SEED, getter.getRequestSeed(request));
internalSet(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
package io.opentelemetry.instrumentation.api.incubator.semconv.genai;

import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_OPERATION_NAME;
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_PROVIDER_NAME;
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_REQUEST_MODEL;
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_RESPONSE_MODEL;
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiAttributesExtractor.GEN_AI_SYSTEM;
import static io.opentelemetry.instrumentation.api.incubator.semconv.genai.GenAiClientMetrics.GEN_AI_TOKEN_TYPE;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
Expand Down Expand Up @@ -44,7 +44,7 @@ static void applyClientTokenUsageAdvice(LongHistogramBuilder builder) {
.setAttributesAdvice(
asList(
GEN_AI_OPERATION_NAME,
GEN_AI_SYSTEM,
GEN_AI_PROVIDER_NAME,
GEN_AI_TOKEN_TYPE,
GEN_AI_REQUEST_MODEL,
SERVER_PORT,
Expand All @@ -60,7 +60,7 @@ static void applyClientOperationDurationAdvice(DoubleHistogramBuilder builder) {
.setAttributesAdvice(
asList(
GEN_AI_OPERATION_NAME,
GEN_AI_SYSTEM,
GEN_AI_PROVIDER_NAME,
ErrorAttributes.ERROR_TYPE,
GEN_AI_REQUEST_MODEL,
SERVER_PORT,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ enum BedrockRuntimeAttributesGetter
implements GenAiAttributesGetter<ExecutionAttributes, Response> {
INSTANCE;

static final class GenAiSystemIncubatingValues {
static final class GenAiProviderNameIncubatingValues {
static final String AWS_BEDROCK = "aws.bedrock";

private GenAiSystemIncubatingValues() {}
private GenAiProviderNameIncubatingValues() {}
}

@Override
Expand All @@ -30,7 +30,7 @@ public String getOperationName(ExecutionAttributes executionAttributes) {

@Override
public String getSystem(ExecutionAttributes executionAttributes) {
return GenAiSystemIncubatingValues.AWS_BEDROCK;
return GenAiProviderNameIncubatingValues.AWS_BEDROCK;
}

@Nullable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ private GenAiOperationNameIncubatingValues() {}
}

private static final AttributeKey<String> EVENT_NAME = stringKey("event.name");
private static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
private static final AttributeKey<String> GEN_AI_PROVIDER_NAME =
stringKey("gen_ai.provider.name");

private static final ExecutionAttribute<Document> INVOKE_MODEL_REQUEST_BODY =
new ExecutionAttribute<>(BedrockRuntimeImpl.class.getName() + ".InvokeModelRequestBody");
Expand Down Expand Up @@ -1618,7 +1619,8 @@ private static LogRecordBuilder newEvent(Context otelContext, Logger eventLogger
.logRecordBuilder()
.setContext(otelContext)
.setAttribute(
GEN_AI_SYSTEM, BedrockRuntimeAttributesGetter.GenAiSystemIncubatingValues.AWS_BEDROCK);
GEN_AI_PROVIDER_NAME,
BedrockRuntimeAttributesGetter.GenAiProviderNameIncubatingValues.AWS_BEDROCK);
}

private static void emitToolResultEvents(
Expand Down
Loading
Loading