test

Author: liustve

.github/workflows/python-ec2-genai-test.yml

@@ -127,15 +127,15 @@ jobs:
           --instance-id ${{ env.INSTANCE_ID }}
           --trace-id ${{ env.W3C_TRACE_ID }}'
 
-      # - name: Validate generated metrics
-      #   if: (success() || failure()) && !cancelled()
-      #   run: ./gradlew validator:run --args='-c python/ec2/default/metric-validation.yml
-      #     --testing-id ${{ env.TESTING_ID }}
-      #     --endpoint http://${{ env.INSTANCE_IP }}:8000
-      #     --region ${{ env.E2E_TEST_AWS_REGION }}
-      #     --metric-namespace ${{ env.METRIC_NAMESPACE }}
-      #     --service-name langchain-traceloop-app
-      #     --instance-id ${{ env.INSTANCE_ID }}'
+      - name: Validate generated metrics
+        if: (success() || failure()) && !cancelled()
+        run: ./gradlew validator:run --args='-c python/ec2/adot-genai/metric-validation.yml
+          --testing-id ${{ env.TESTING_ID }}
+          --endpoint http://${{ env.INSTANCE_IP }}:8000
+          --region ${{ env.E2E_TEST_AWS_REGION }}
+          --metric-namespace ${{ env.METRIC_NAMESPACE }}
+          --service-name langchain-traceloop-app
+          --instance-id ${{ env.INSTANCE_ID }}'
 
       - name: Validate generated traces
         if: (success() || failure()) && !cancelled()

validator/src/main/java/com/amazon/aoc/fileconfigs/PredefinedExpectedTemplate.java

@@ -249,6 +249,7 @@ public enum PredefinedExpectedTemplate implements FileConfig {
   /** Python EC2 ADOT Gen AI Test Case Validation */
   PYTHON_EC2_ADOT_GENAI_LOG("/expected-data-template/python/ec2/adot-genai/genai-log.mustache"),
   PYTHON_EC2_ADOT_GENAI_TRACE("/expected-data-template/python/ec2/adot-genai/genai-trace.mustache"),
+  PYTHON_EC2_ADOT_GENAI_METRIC("/expected-data-template/python/ec2/adot-genai/genai-metric.mustache"),
 
   /** Python K8S Test Case Validations */
   PYTHON_K8S_OUTGOING_HTTP_CALL_LOG("/expected-data-template/python/k8s/outgoing-http-call-log.mustache"),

validator/src/main/resources/expected-data-template/python/ec2/adot-genai/genai-metric.mustache

@@ -0,0 +1,20 @@
+-
+  metricName: gen_ai.client.token.usage
+  namespace: {{metricNamespace}}
+  dimensions:
+    -
+      name: gen_ai.system
+      value: Langchain
+    -
+      name: gen_ai.token.type
+      value: input
+-
+  metricName: gen_ai.client.token.usage
+  namespace: {{metricNamespace}}
+  dimensions:
+    -
+      name: gen_ai.system
+      value: Langchain
+    -
+      name: gen_ai.token.type
+      value: output

validator/src/main/resources/validations/python/ec2/adot-genai/metric-validation.yml

@@ -0,0 +1,6 @@
+-
+  validationType: "cw-metric"
+  httpPath: "ai-chat"
+  httpMethod: "post"
+  callingType: "http"
+  expectedMetricTemplate: "PYTHON_EC2_ADOT_GENAI_METRIC"