Updated the review comments

Author: adharshctr

packages/opentelemetry-instrumentation-google-generativeai/opentelemetry/instrumentation/google_generativeai/__init__.py

@@ -213,8 +213,8 @@ async def _awrap(
         duration_histogram.record(
             duration,
             attributes={
-                "gen_ai.provider.name": "Google",
-                "gen_ai.response.model": llm_model
+                GenAIAttributes.GEN_AI_PROVIDER_NAME: "Google",
+                GenAIAttributes.GEN_AI_RESPONSE_MODEL: llm_model
             },
         )
     if response:
@@ -284,8 +284,8 @@ def _wrap(
         duration_histogram.record(
             duration,
             attributes={
-                "gen_ai.provider.name": "Google",
-                "gen_ai.response.model": llm_model
+                GenAIAttributes.GEN_AI_PROVIDER_NAME: "Google",
+                GenAIAttributes.GEN_AI_RESPONSE_MODEL: llm_model
             },
         )
     if response:

packages/opentelemetry-instrumentation-google-generativeai/opentelemetry/instrumentation/google_generativeai/span_utils.py

@@ -473,17 +473,17 @@ def set_model_response_attributes(span, response, llm_model, token_histogram):
         token_histogram.record(
             response.usage_metadata.prompt_token_count,
             attributes={
-                "gen_ai.provider.name": "Google",
-                "gen_ai.token.type": "input",
-                "gen_ai.response.model": llm_model,
+                GenAIAttributes.GEN_AI_PROVIDER_NAME: "Google",
+                GenAIAttributes.GEN_AI_TOKEN_TYPE: "input",
+                GenAIAttributes.GEN_AI_RESPONSE_MODEL: llm_model,
             }
         )
         token_histogram.record(
                     response.usage_metadata.candidates_token_count,
                     attributes={
-                        "gen_ai.provider.name": "Google",
-                        "gen_ai.token.type": "output",
-                        "gen_ai.response.model": llm_model,
+                        GenAIAttributes.GEN_AI_PROVIDER_NAME: "Google",
+                        GenAIAttributes.GEN_AI_TOKEN_TYPE: "output",
+                        GenAIAttributes.GEN_AI_RESPONSE_MODEL: llm_model,
                     },
                 )
 

packages/opentelemetry-instrumentation-google-generativeai/tests/test_generate_content.py

@@ -94,12 +94,12 @@ def test_generate_metrics(metrics_test_context, genai_client):
 
     # ---- Required metrics (semantic conventions) ----
     required_metrics = {
-        "gen_ai.client.operation.duration",
-        "gen_ai.client.token.usage",
+        Meters.LLM_OPERATION_DURATION,
+        Meters.LLM_TOKEN_USAGE,
     }
     assert required_metrics.issubset(metrics.keys())
 
-    duration_metric = metrics["gen_ai.client.operation.duration"]
+    duration_metric = metrics[Meters.LLM_OPERATION_DURATION]
 
     assert duration_metric.unit is not None
     assert duration_metric.data.data_points
@@ -111,16 +111,16 @@ def test_generate_metrics(metrics_test_context, genai_client):
     assert duration_dp.sum >= 0
 
     # Required attributes (values are intentionally not hard-coded)
-    assert "gen_ai.provider.name" in duration_dp.attributes
-    assert "gen_ai.response.model" in duration_dp.attributes
+    assert GenAIAttributes.GEN_AI_PROVIDER_NAME in duration_dp.attributes
+    assert GenAIAttributes.GEN_AI_RESPONSE_MODEL in duration_dp.attributes
 
     token_metric = metrics[Meters.LLM_TOKEN_USAGE]
 
     assert token_metric.unit == "token"
     assert token_metric.data.data_points
 
     token_points_by_type = {
-        dp.attributes.get("gen_ai.token.type"): dp
+        dp.attributes.get(SpanAttributes.LLM_TOKEN_TYPE): dp
         for dp in token_metric.data.data_points
     }
 
@@ -132,5 +132,5 @@ def test_generate_metrics(metrics_test_context, genai_client):
         assert dp.sum >= 0
 
         # Required semantic attributes
-        assert "gen_ai.provider.name" in dp.attributes
-        assert "gen_ai.response.model" in dp.attributes
+        assert GenAIAttributes.GEN_AI_PROVIDER_NAME in dp.attributes
+        assert GenAIAttributes.GEN_AI_RESPONSE_MODEL in dp.attributes