Address comments.

Author: zzhlogin

sample-apps/python/django_frontend_service/.gitignore

@@ -0,0 +1,5 @@
+static
+.idea
+.env
+db.sqlite3
+*.iml

sample-apps/python/django_frontend_service/django_frontend_service/settings.py

@@ -2,7 +2,9 @@
 ## SPDX-License-Identifier: Apache-2.0
 import os
 from pathlib import Path
+from dotenv import load_dotenv
 
+load_dotenv()
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 

sample-apps/python/django_frontend_service/frontend_service_app/views.py

@@ -1,29 +1,31 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
 from django.http import HttpResponse, JsonResponse
 import boto3
 import logging
 import requests
 import schedule
 import time
-from threading import Thread
+import threading
 from opentelemetry import trace
-## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-## SPDX-License-Identifier: Apache-2.0
 from opentelemetry.trace.span import format_trace_id
 
 logger = logging.getLogger(__name__)
 
 should_send_local_root_client_call = False
+lock = threading.Lock()
 def run_local_root_client_call_recurring_service():
     def runnable_task():
         global should_send_local_root_client_call
-        if should_send_local_root_client_call:
-            should_send_local_root_client_call = False
-            try:
-                response = requests.get("http://local-root-client-call")
-                # Handle the response if needed
-            except Exception as e:
-                # Handle exceptions
-                pass
+        with lock:
+            if should_send_local_root_client_call:
+                should_send_local_root_client_call = False
+                try:
+                    response = requests.get("http://local-root-client-call")
+                    # Handle the response if needed
+                except Exception as e:
+                    # Handle exceptions
+                    pass
 
     # Schedule the task to run every 1 second
     schedule.every(1).seconds.do(runnable_task)
@@ -34,7 +36,7 @@ def run_scheduler():
             schedule.run_pending()
             time.sleep(0.1)  # Sleep to prevent high CPU usage
 
-    thread = Thread(target=run_scheduler)
+    thread = threading.Thread(target=run_scheduler)
     thread.daemon = True  # Daemonize the thread so it exits when the main thread exits
     thread.start()
 
@@ -68,8 +70,7 @@ def http_call(request):
 
 def downstream_service(request):
     ip = request.GET.get('ip', '')
-    print("ip!!!!!!!!!!!!!")
-    print(ip)
+    ip = ip.replace("/", "")
     url = f"http://{ip}:8001/health-check"
     try:
         response = requests.get(url)
@@ -86,13 +87,14 @@ def async_service(request):
     # Log the request
     logger.info("Client-call received")
     # Set the condition to trigger the recurring service
-    should_send_local_root_client_call = True
+    with lock:
+        should_send_local_root_client_call = True
     # Return a dummy traceId in the response
     return JsonResponse({'traceId': '1-00000000-000000000000000000000000'})
 
 def get_xray_trace_id():
     span = trace.get_current_span()
     trace_id = format_trace_id(span.get_span_context().trace_id)
-    xray_trace_id = "1-" + trace_id[:8] + "-" + trace_id[8:]
+    xray_trace_id = f"1-{trace_id[:8]}-{trace_id[8:]}"
 
-    return "traceId : " + xray_trace_id
+    return JsonResponse({"traceId": xray_trace_id})

sample-apps/python/django_frontend_service/requirements.txt

@@ -3,4 +3,5 @@ requests~=2.31.0
 boto3~=1.34.3
 requests~=2.31.0
 schedule~=1.2.1
+python-dotenv~=1.0.0
 opentelemetry-api~=1.22.0

sample-apps/python/django_remote_service/.gitignore

@@ -0,0 +1,5 @@
+static
+.idea
+.env
+db.sqlite3
+*.iml

sample-apps/python/docker-compose.yaml

@@ -10,8 +10,6 @@ services:
     container_name: django_frontend_service
     command: sh -c "python3 manage.py migrate --noinput && python3 manage.py collectstatic --noinput && python3 manage.py runserver 0.0.0.0:8000 --noreload"
     restart: always
-    volumes:
-      - $HOME/.aws/credentials:/home/app/.aws/credentials:ro
     environment:
       DJANGO_SETTINGS_MODULE: "django_frontend_service.settings"
     ports: