diff --git a/applications/python-the-coffee-bar-apps/Dockerfile b/applications/python-the-coffee-bar-apps/Dockerfile index a53d102..081389c 100644 --- a/applications/python-the-coffee-bar-apps/Dockerfile +++ b/applications/python-the-coffee-bar-apps/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-alpine +FROM python:3.10-alpine RUN apk add --no-cache bash net-tools iproute2 build-base gcc pkgconfig postgresql-dev linux-headers tzdata diff --git a/applications/python-the-coffee-bar-apps/Pipfile b/applications/python-the-coffee-bar-apps/Pipfile index 5f81167..a85f6a5 100644 --- a/applications/python-the-coffee-bar-apps/Pipfile +++ b/applications/python-the-coffee-bar-apps/Pipfile @@ -6,27 +6,27 @@ verify_ssl = true [dev-packages] [packages] -APScheduler = "3.10.4" -cron-descriptor = "1.4.3" -Flask = "3.0.2" -flask-cors = "4.0.0" -opentelemetry-distro = "0.44b0" -opentelemetry-exporter-jaeger = "1.21.0" -opentelemetry-exporter-otlp-proto-http = "1.23.0" -opentelemetry-exporter-zipkin = "1.23.0" -opentelemetry-instrumentation = "0.44b0" -opentelemetry-sdk = "1.23.0" +APScheduler = "3.10.1" +cron-descriptor = "1.3.0" +Flask = "2.3.2" +flask-cors = "3.0.10" +opentelemetry-distro = "0.38b0" +opentelemetry-exporter-jaeger = "1.17.0" +opentelemetry-exporter-otlp-proto-http = "1.17.0" +opentelemetry-exporter-zipkin = "1.17.0" +opentelemetry-instrumentation = "0.38b0" +opentelemetry-sdk = "1.17.0" opentelemetry-propagator-aws-xray = "1.0.1" -opentelemetry-propagator-b3 = "1.23.0" -opentelemetry-util-http = "0.44b0" -paste = "3.7.1" -psycopg2 = "2.9.9" -pyjson5 = "1.6.6" -requests = "2.31.0" +opentelemetry-propagator-b3 = "1.17.0" +opentelemetry-util-http = "0.38b0" +paste = "3.5.3" +psycopg2 = "2.9.6" +pyjson5 = "1.6.2" +requests = "2.30.0" statsd = "4.0.1" tcconfig = "0.28.0" -waitress = "3.0.0" +waitress = "2.1.2" the-coffee-bar = {path = "."} [requires] -python_version = "3.11" +python_version = "3.10" diff --git a/applications/python-the-coffee-bar-apps/setup.py b/applications/python-the-coffee-bar-apps/setup.py index 3f6c4ef..b7fab9d 100644 --- a/applications/python-the-coffee-bar-apps/setup.py +++ b/applications/python-the-coffee-bar-apps/setup.py @@ -1,6 +1,5 @@ -# pylint: disable=line-too-long -from os import path from setuptools import setup, find_packages +from os import path here = path.abspath(path.dirname(__file__)) @@ -29,26 +28,26 @@ packages=find_packages(), python_requires='>=3.8, <4', - install_requires=['APScheduler==3.10.4', - 'cron-descriptor==1.4.3', - 'Flask==3.0.2', - 'flask-cors==4.0.0', - 'opentelemetry-distro==0.44b0', - 'opentelemetry-exporter-jaeger==1.21.0', - 'opentelemetry-exporter-otlp-proto-http==1.23.0', - 'opentelemetry-exporter-zipkin==1.23.0', - 'opentelemetry-instrumentation==0.44b0', - 'opentelemetry-sdk==1.23.0', + install_requires=['APScheduler==3.10.1', + 'cron-descriptor==1.3.0', + 'Flask==2.3.2', + 'flask-cors==3.0.10', + 'opentelemetry-distro==0.38b0', + 'opentelemetry-exporter-jaeger==1.17.0', + 'opentelemetry-exporter-otlp-proto-http==1.17.0', + 'opentelemetry-exporter-zipkin==1.17.0', + 'opentelemetry-instrumentation==0.38b0', + 'opentelemetry-sdk==1.17.0', 'opentelemetry-propagator-aws-xray==1.0.1', - 'opentelemetry-propagator-b3==1.23.0', - 'opentelemetry-util-http==0.44b0', - 'paste==3.7.1', - 'psycopg2==2.9.9', - 'pyjson5==1.6.6', - 'requests==2.31.0', + 'opentelemetry-propagator-b3==1.17.0', + 'opentelemetry-util-http==0.38b0', + 'paste==3.5.3', + 'psycopg2==2.9.6', + 'pyjson5==1.6.2', + 'requests==2.30.0', 'statsd==4.0.1', 'tcconfig==0.28.0', - 'waitress==3.0.0', + 'waitress==2.1.2', ], data_files=[], entry_points={ diff --git a/deployments/docker-compose/docker-compose-aws-lambda.yaml b/deployments/docker-compose/docker-compose-aws-lambda.yaml index 863b3ad..7ebae2b 100644 --- a/deployments/docker-compose/docker-compose-aws-lambda.yaml +++ b/deployments/docker-compose/docker-compose-aws-lambda.yaml @@ -19,11 +19,10 @@ services: - 8082:8082 command: ["opentelemetry-instrument", "python3", "src/bin/the_coffee_bar.py", "--host=the-coffee-bar", "--port=8082", "--coffeemachine-host=the-coffee-machine", - "--coffeemachine-port=8083", "--cashdesk-host=the-cashdesk", "--cashdesk-port=8084", + "--coffeemachine-port=8083", "--cashdesk-host=the-cashdesk", "--cashdesk-port=8084"] "--cakes-url=URL_TO_LAMBDA_FUNC"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_SERVICE_NAME=aws-lambda-the-coffee-bar @@ -38,8 +37,7 @@ services: "--host=the-coffee-machine", "--port=8083", "--machine-svc-host=machine-svc", "--machine-svc-port=9090"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_SERVICE_NAME=aws-lambda-the-coffee-machine @@ -54,8 +52,7 @@ services: "--host=the-cashdesk", "--port=8084", "--calculator-host=calculator-svc", "--calculator-port=8090", "--connection-string=postgresql://account:account@postgres:5432/account"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_SERVICE_NAME=aws-lambda-the-cashdesk @@ -67,8 +64,7 @@ services: command: ["opentelemetry-instrument", "python3", "src/bin/the_coffee_lover.py", "--host=the-coffee-bar", "--port=8082", "--ratio=5"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_SERVICE_NAME=aws-lambda-the-coffee-lover diff --git a/deployments/docker-compose/docker-compose-interval.yaml b/deployments/docker-compose/docker-compose-interval.yaml index a4778c8..4bc1b3e 100644 --- a/deployments/docker-compose/docker-compose-interval.yaml +++ b/deployments/docker-compose/docker-compose-interval.yaml @@ -31,7 +31,7 @@ services: # expose: # - 9222 the-coffee-bar: - image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 + image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 container_name: the-coffee-bar hostname: the-coffee-bar ports: @@ -43,8 +43,7 @@ services: "--coffeemachine-port=8083", "--cashdesk-host=the-cashdesk", "--cashdesk-port=8084"] # ,"--cakes-url=LAMBDA_URL_HERE"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-bar @@ -78,7 +77,7 @@ services: - REACT_APP_PROPAGATION_CORS_URLS=[/^http:\/\/localhost:8082\/.*/,/^http:\/\/the-coffee-bar:8082\/.*/,] - REACT_APP_ENVIRONMENT_NAME=default the-coffee-machine: - image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 + image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 container_name: the-coffee-machine hostname: the-coffee-machine ports: @@ -87,13 +86,12 @@ services: "--host=the-coffee-machine", "--port=8083", "--machine-svc-host=machine-svc", "--machine-svc-port=9090", "--spike-cron=*/2 * * * *", "--spike-duration=60", "--cpu-spike-processes=1", "--interval-based-trigger=true", "--spike-interval-days=0", "--spike-interval-hours=1"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-machine the-cashdesk: - image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 + image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 container_name: the-cashdesk hostname: the-cashdesk ports: @@ -102,20 +100,18 @@ services: "--host=the-cashdesk", "--port=8084", "--calculator-host=calculator-svc", "--calculator-port=8090", "--connection-string=postgresql://account:account@postgres:5432/account"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-cashdesk # the-coffee-lover: -# image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 +# image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 # container_name: the-coffee-lover # hostname: the-coffee-lover # command: ["opentelemetry-instrument", "python3", "src/bin/the_coffee_lover.py", # "--host=the-coffee-bar", "--port=8082", "--ratio=30"] # environment: - # - OTEL_TRACES_EXPORTER=otlp - # - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf +# - OTEL_TRACES_EXPORTER=otlp_proto_http # - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:55681/v1/traces # - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-lover machine-svc: diff --git a/deployments/docker-compose/docker-compose-local-build.yaml b/deployments/docker-compose/docker-compose-local-build.yaml index 0862797..e20a50a 100644 --- a/deployments/docker-compose/docker-compose-local-build.yaml +++ b/deployments/docker-compose/docker-compose-local-build.yaml @@ -43,8 +43,7 @@ services: "--port=8082", "--ratio=30"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-lover @@ -95,8 +94,7 @@ services: "--cashdesk-port=8084"] # ,"--cakes-url=LAMBDA_URL_HERE"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-bar @@ -117,8 +115,7 @@ services: "--spike-duration=60", "--cpu-spike-processes=1"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-machine @@ -136,8 +133,7 @@ services: "--calculator-port=8090", "--connection-string=postgresql://account:account@postgres:5432/account"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-cashdesk diff --git a/deployments/docker-compose/docker-compose.yaml b/deployments/docker-compose/docker-compose.yaml index f0d48a1..0f50429 100644 --- a/deployments/docker-compose/docker-compose.yaml +++ b/deployments/docker-compose/docker-compose.yaml @@ -31,7 +31,7 @@ services: # expose: # - 9222 the-coffee-bar: - image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 pythonAppsv0.3.2-ot1.23.0-0.44b0 + image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 container_name: the-coffee-bar hostname: the-coffee-bar ports: @@ -43,8 +43,7 @@ services: "--coffeemachine-port=8083", "--cashdesk-host=the-cashdesk", "--cashdesk-port=8084"] # ,"--cakes-url=LAMBDA_URL_HERE"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-bar @@ -75,7 +74,7 @@ services: - REACT_APP_DROP_SINGLE_TRACES=false - REACT_APP_ENVIRONMENT_NAME=default the-coffee-machine: - image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 + image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 container_name: the-coffee-machine hostname: the-coffee-machine ports: @@ -84,13 +83,12 @@ services: "--host=the-coffee-machine", "--port=8083", "--machine-svc-host=machine-svc", "--machine-svc-port=9090", "--spike-cron=*/2 * * * *", "--spike-duration=60", "--cpu-spike-processes=1"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-coffee-machine the-cashdesk: - image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 + image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 container_name: the-cashdesk hostname: the-cashdesk ports: @@ -99,13 +97,12 @@ services: "--host=the-cashdesk", "--port=8084", "--calculator-host=calculator-svc", "--calculator-port=8090", "--connection-string=postgresql://account:account@postgres:5432/account"] environment: - - OTEL_TRACES_EXPORTER=otlp - - OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf + - OTEL_TRACES_EXPORTER=otlp_proto_http - OTEL_METRICS_EXPORTER=none - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES=application=tcb-local,service.name=the-cashdesk # the-coffee-lover: -# image: public.ecr.aws/sumologic/the-coffee-bar:public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.2-ot1.23.0-0.44b0 +# image: public.ecr.aws/sumologic/the-coffee-bar:pythonAppsv0.3.1-ot1.17.0-0.38b0 # container_name: the-coffee-lover # hostname: the-coffee-lover # command: ["opentelemetry-instrument", "python3", "src/bin/the_coffee_lover.py", diff --git a/deployments/helm/sumologic-the-coffee-bar/values.yaml b/deployments/helm/sumologic-the-coffee-bar/values.yaml index 022df0b..03f64a9 100644 --- a/deployments/helm/sumologic-the-coffee-bar/values.yaml +++ b/deployments/helm/sumologic-the-coffee-bar/values.yaml @@ -37,7 +37,7 @@ image: tag: frontend-v0.1.4 python: repository: public.ecr.aws/sumologic/the-coffee-bar - tag: pythonAppsv0.3.2-ot1.23.0-0.44b0 + tag: pythonAppsv0.3.1-ot1.17.0-0.38b0 ruby: repository: public.ecr.aws/sumologic/the-coffee-bar tag: rubyAppsv0.2.1-ot1.2.0-0.35.0-0.24.0