Update prefix to match currently proposed SemConv.

Author: michaelsafyan

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/custom_semconv.py

@@ -15,4 +15,4 @@
 
 # Prefix to use for LLM model request attributes that are unique GCP
 # (or that have not yet been formally defined in the GenAI/LLM SIG).
-CUSTOM_LLM_REQUEST_PREFIX = "gen_ai.gcp.request"
+CUSTOM_LLM_REQUEST_PREFIX = "gcp.gen_ai.request"

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/generate_content.py

@@ -161,10 +161,10 @@ def _add_request_options_to_span(
         exclude_keys=[
             # System instruction can be overly long for a span attribute.
             # Additionally, it is recorded as an event (log), instead.
-            "gen_ai.gcp.request.system_instruction",
+            "gcp.gen_ai.request.system_instruction",
             # Headers could include sensitive information, therefore it is
             # best that we not record these options.
-            "gen_ai.gcp.request.http_options.headers",
+            "gcp.gen_ai.request.http_options.headers",
         ],
         # Although a custom prefix is used by default, some of the attributes
         # are captured in common, standard, Semantic Conventions. For the
@@ -173,15 +173,15 @@ def _add_request_options_to_span(
         rename_keys={
             # TODO: add more entries here as more semantic conventions are
             # generalized to cover more of the available config options.
-            "gen_ai.gcp.request.temperature": "gen_ai.request.temperature",
-            "gen_ai.gcp.request.top_k": "gen_ai.request.top_k",
-            "gen_ai.gcp.request.top_p": "gen_ai.request.top_p",
-            "gen_ai.gcp.request.candidate_count": "gen_ai.request.choice.count",
-            "gen_ai.gcp.request.max_output_tokens": "gen_ai.request.max_tokens",
-            "gen_ai.gcp.request.stop_sequences": "gen_ai.request.stop_sequences",
-            "gen_ai.gcp.request.frequency_penalty": "gen_ai.request.frequency_penalty",
-            "gen_ai.gcp.request.presence_penalty": "gen_ai.request.presence_penalty",
-            "gen_ai.gcp.request.seed": "gen_ai.request.seed",
+            "gcp.gen_ai.request.temperature": "gen_ai.request.temperature",
+            "gcp.gen_ai.request.top_k": "gen_ai.request.top_k",
+            "gcp.gen_ai.request.top_p": "gen_ai.request.top_p",
+            "gcp.gen_ai.request.candidate_count": "gen_ai.request.choice.count",
+            "gcp.gen_ai.request.max_output_tokens": "gen_ai.request.max_tokens",
+            "gcp.gen_ai.request.stop_sequences": "gen_ai.request.stop_sequences",
+            "gcp.gen_ai.request.frequency_penalty": "gen_ai.request.frequency_penalty",
+            "gcp.gen_ai.request.presence_penalty": "gen_ai.request.presence_penalty",
+            "gcp.gen_ai.request.seed": "gen_ai.request.seed",
         },
     )
     span.set_attributes(attributes)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_config_span_attributes.py

@@ -98,7 +98,7 @@ def test_option_not_reflected_to_span_attribute_system_instruction(self):
             config={"system_instruction": "Yadda yadda yadda"}
         )
         self.assertNotIn(
-            "gen_ai.gcp.request.system_instruction", span.attributes
+            "gcp.gen_ai.request.system_instruction", span.attributes
         )
         self.assertNotIn("gen_ai.request.system_instruction", span.attributes)
         for key in span.attributes:
@@ -118,11 +118,11 @@ def test_option_not_reflected_to_span_attribute_http_headers(self):
             }
         )
         self.assertEqual(
-            span.attributes["gen_ai.gcp.request.http_options.base_url"],
+            span.attributes["gcp.gen_ai.request.http_options.base_url"],
             "my.backend.override",
         )
         self.assertNotIn(
-            "gen_ai.gcp.request.http_options.headers.sensitive",
+            "gcp.gen_ai.request.http_options.headers.sensitive",
             span.attributes,
         )
 
@@ -136,6 +136,6 @@ def test_option_reflected_to_span_attribute_automatic_func_calling(self):
         )
         self.assertTrue(
             span.attributes[
-                "gen_ai.gcp.request.automatic_function_calling.ignore_call_history"
+                "gcp.gen_ai.request.automatic_function_calling.ignore_call_history"
             ]
         )