update claude support to replace legacy model

Author: ezhang6811

src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSLlmModelProcessor.cs

@@ -376,28 +376,27 @@ private static void ProcessClaudeModelAttributes(Activity activity, Dictionary<s
                     activity.SetTag(AWSSemanticConventions.AttributeGenAiTemperature, temperature.GetDouble());
                 }
 
-                if (jsonBody.TryGetValue("max_tokens_to_sample", out var maxTokens))
+                if (jsonBody.TryGetValue("max_tokens", out var maxTokens))
                 {
                     activity.SetTag(AWSSemanticConventions.AttributeGenAiMaxTokens, maxTokens.GetInt32());
                 }
-
-                // input tokens not provided in Claude response body, so we estimate the value based on input length
-                if (jsonBody.TryGetValue("prompt", out var input))
-                {
-                    activity.SetTag(AWSSemanticConventions.AttributeGenAiInputTokens, Convert.ToInt32(Math.Ceiling((double) input.GetString().Length / 6)));
-                }
             }
             else
             {
-                if (jsonBody.TryGetValue("stop_reason", out var finishReasons))
+                if (jsonBody.TryGetValue("usage", out var usage))
                 {
-                    activity.SetTag(AWSSemanticConventions.AttributeGenAiFinishReasons, new string[] { finishReasons.GetString() });
+                    if (usage.TryGetProperty("input_tokens", out var inputTokens))
+                    {
+                        activity.SetTag(AWSSemanticConventions.AttributeGenAiInputTokens, inputTokens.GetInt32());
+                    }
+                    if (usage.TryGetProperty("output_tokens", out var outputTokens))
+                    {
+                        activity.SetTag(AWSSemanticConventions.AttributeGenAiOutputTokens, outputTokens.GetInt32());
+                    }
                 }
-
-                // output tokens not provided in Claude response body, so we estimate the value based on output length
-                if (jsonBody.TryGetValue("completion", out var output))
+                if (jsonBody.TryGetValue("stop_reason", out var finishReasons))
                 {
-                    activity.SetTag(AWSSemanticConventions.AttributeGenAiOutputTokens, Convert.ToInt32(Math.Ceiling((double) output.GetString().Length / 6)));
+                    activity.SetTag(AWSSemanticConventions.AttributeGenAiFinishReasons, new string[] { finishReasons.GetString() });
                 }
             }
         }

test/contract-tests/tests/test/amazon/awssdk/awssdk_test.py

@@ -487,8 +487,8 @@ def test_bedrock_runtime_invoke_model_mistral(self):
                 _GEN_AI_REQUEST_TEMPERATURE: 0.123,
                 _GEN_AI_REQUEST_TOP_P: 0.456,
                 _GEN_AI_REQUEST_MAX_TOKENS: 123,
-                _GEN_AI_USAGE_INPUT_TOKENS: 12,
-                _GEN_AI_USAGE_OUTPUT_TOKENS: 10,
+                _GEN_AI_USAGE_INPUT_TOKENS: 456,
+                _GEN_AI_USAGE_OUTPUT_TOKENS: 789,
                 _GEN_AI_RESPONSE_FINISH_REASONS: ["finish_reason"],
             },
             span_name="Bedrock Runtime.InvokeModel",