move gen ai constants to avoid botocore dependency

Author: ADOT Patch workflow

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/_aws_metric_attribute_generator.py

@@ -71,7 +71,7 @@
     SERVICE_METRIC,
     MetricAttributeGenerator,
 )
-from amazon.opentelemetry.distro.patches._bedrock_agentcore_patches import (
+from amazon.opentelemetry.distro.patches.semconv._incubating.attributes.gen_ai_attributes import (
     GEN_AI_BROWSER_ID,
     GEN_AI_CODE_INTERPRETER_ID,
     GEN_AI_GATEWAY_ID,

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_bedrock_agentcore_patches.py

@@ -13,6 +13,13 @@
     AWS_BEDROCK_AGENTCORE_WORKLOAD_IDENTITY_ARN,
     AWS_GATEWAY_TARGET_ID,
 )
+from amazon.opentelemetry.distro.patches.semconv._incubating.attributes.gen_ai_attributes import (
+    GEN_AI_BROWSER_ID,
+    GEN_AI_CODE_INTERPRETER_ID,
+    GEN_AI_GATEWAY_ID,
+    GEN_AI_MEMORY_ID,
+    GEN_AI_RUNTIME_ID,
+)
 from opentelemetry.instrumentation.botocore.extensions.types import (
     _AttributeMapT,
     _AwsSdkExtension,
@@ -21,12 +28,6 @@
 )
 from opentelemetry.trace.span import Span
 
-GEN_AI_RUNTIME_ID = "gen_ai.runtime.id"
-GEN_AI_BROWSER_ID = "gen_ai.browser.id"
-GEN_AI_CODE_INTERPRETER_ID = "gen_ai.code_interpreter.id"
-GEN_AI_MEMORY_ID = "gen_ai.memory.id"
-GEN_AI_GATEWAY_ID = "gen_ai.gateway.id"
-
 # Mapping of flattened JSON paths to attribute keys
 _ATTRIBUTE_MAPPING = {
     "agentRuntimeArn": AWS_BEDROCK_AGENTCORE_RUNTIME_ARN,

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/semconv/_incubating/attributes/gen_ai_attributes.py

@@ -0,0 +1,10 @@
+"""
+Utility module holding attribute keys for incubating Gen AI semantic conventions.
+Remove this once we've contributed them to upstream.
+"""
+
+GEN_AI_RUNTIME_ID = "gen_ai.runtime.id"
+GEN_AI_BROWSER_ID = "gen_ai.browser.id"
+GEN_AI_CODE_INTERPRETER_ID = "gen_ai.code_interpreter.id"
+GEN_AI_MEMORY_ID = "gen_ai.memory.id"
+GEN_AI_GATEWAY_ID = "gen_ai.gateway.id"

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/patches/test_instrumentation_patch.py

@@ -21,17 +21,17 @@
     AWS_BEDROCK_AGENTCORE_WORKLOAD_IDENTITY_ARN,
     AWS_GATEWAY_TARGET_ID,
 )
-from amazon.opentelemetry.distro.patches._bedrock_agentcore_patches import (
+from amazon.opentelemetry.distro.patches._instrumentation_patch import (
+    AWS_GEVENT_PATCH_MODULES,
+    apply_instrumentation_patches,
+)
+from amazon.opentelemetry.distro.patches.semconv._incubating.attributes.gen_ai_attributes import (
     GEN_AI_BROWSER_ID,
     GEN_AI_CODE_INTERPRETER_ID,
     GEN_AI_GATEWAY_ID,
     GEN_AI_MEMORY_ID,
     GEN_AI_RUNTIME_ID,
 )
-from amazon.opentelemetry.distro.patches._instrumentation_patch import (
-    AWS_GEVENT_PATCH_MODULES,
-    apply_instrumentation_patches,
-)
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
 from opentelemetry.instrumentation.botocore.extensions import _KNOWN_EXTENSIONS, bedrock_utils
 from opentelemetry.propagate import get_global_textmap

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_metric_attribute_generator.py

@@ -50,7 +50,7 @@
 )
 from amazon.opentelemetry.distro._aws_metric_attribute_generator import _AwsMetricAttributeGenerator
 from amazon.opentelemetry.distro.metric_attribute_generator import DEPENDENCY_METRIC, SERVICE_METRIC
-from amazon.opentelemetry.distro.patches._bedrock_agentcore_patches import (
+from amazon.opentelemetry.distro.patches.semconv._incubating.attributes.gen_ai_attributes import (
     GEN_AI_BROWSER_ID,
     GEN_AI_CODE_INTERPRETER_ID,
     GEN_AI_GATEWAY_ID,