update sample app

Author: liustve

.github/workflows/python-sample-app-s3-deploy.yml

@@ -4,6 +4,9 @@
 name: Sample App Deployment - Python S3
 on:
   workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - python-genesis-app-metrics-fix
 
 permissions:
   id-token: write
@@ -46,24 +49,40 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.ACCOUNT_ID }}:role/${{ secrets.E2E_TEST_ROLE_ARN }}
           aws-region: ${{ matrix.aws-region }}
 
-      - name: Build Sample App Zip
-        working-directory: sample-apps/python
-        run: zip -r python-sample-app.zip .
+      # - name: Build Sample App Zip
+      #   working-directory: sample-apps/python
+      #   run: zip -r python-sample-app.zip .
 
-      - name: Upload to S3
-        working-directory: sample-apps/python
-        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app.zip --key python-sample-app.zip
+      # - name: Upload to S3
+      #   working-directory: sample-apps/python
+      #   run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app.zip --key python-sample-app.zip
 
-      - name: Build Lambda Sample App
-        uses: actions/checkout@v4
-        with:
-          repository: 'aws-observability/aws-otel-python-instrumentation'
-      - name: Build sample lambda function
-        shell: bash
-        run: ./package-lambda-function.sh
-        working-directory: lambda-layer/sample-apps
-
-      - name: Upload to Lambda Sample App to S3
-        working-directory: lambda-layer/sample-apps
-        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./build/function.zip --key pyfunction.zip
+      # - name: Build Lambda Sample App
+      #   uses: actions/checkout@v4
+      #   with:
+      #     repository: 'aws-observability/aws-otel-python-instrumentation'
+      # - name: Build sample lambda function
+      #   shell: bash
+      #   run: ./package-lambda-function.sh
+      #   working-directory: lambda-layer/sample-apps
+
+      # - name: Upload to Lambda Sample App to S3
+      #   working-directory: lambda-layer/sample-apps
+      #   run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./build/function.zip --key pyfunction.zip
+
+      # - name: Build Sample App Zip
+      #   working-directory: sample-apps/python
+      #   run: zip -r python-sample-app.zip .
+
+      # - name: Upload to S3
+      #   working-directory: sample-apps/python
+      #   run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-sample-app.zip --key python-sample-app.zip
+
+      - name: Build Gen AI Sample App Zip
+        working-directory: sample-apps/python-gen-ai
+        run: zip -r python-gen-ai-sample-app.zip .
+
+      - name: Upload Gen AI Sample App to S3
+        working-directory: sample-apps/python-gen-ai
+        run: aws s3api put-object --bucket ${{ secrets.APP_SIGNALS_E2E_EC2_JAR }}-prod-${{ matrix.aws-region }} --body ./python-gen-ai-sample-app.zip --key python-gen-ai-sample-app.zip
 

sample-apps/python/genai_service/server.py

@@ -6,11 +6,12 @@
 from langchain_aws import ChatBedrock
 from langchain.prompts import ChatPromptTemplate
 from langchain.chains import LLMChain
-from opentelemetry import trace
+from opentelemetry import trace, metrics
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from openinference.instrumentation.langchain import LangChainInstrumentor
+import random
 
 # Load environment variables
 load_dotenv()
@@ -92,7 +93,15 @@ async def chat(request: ChatRequest):
     """
     Chat endpoint that processes a single user message through AWS Bedrock
     """
+
     try:
+        # Emit OTel Metrics
+        meter = metrics.get_meter("genesis-meter", "1.0.0")
+        request_duration = meter.create_histogram(
+            name="Genesis_TestMetrics", description="Genesis request duration", unit="s"
+        )
+        request_duration.record(0.1 + (0.5 * random.random()), {"method": "GET", "status": "200"})
+
         # Process the input through the chain
         result = await chain.ainvoke({"input": request.message})
         return ChatResponse(response=result["text"])