From 29e99b0239bba8a2be9722a4c9ba6e8a964ab930 Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Wed, 24 Sep 2025 15:01:40 -0400 Subject: [PATCH 1/2] test --- application.py | 11 ++---- gunicorn_config.py | 7 ++++ mypy.ini | 3 -- package.json | 2 +- poetry.lock | 96 +--------------------------------------------- pyproject.toml | 1 - 6 files changed, 13 insertions(+), 107 deletions(-) diff --git a/application.py b/application.py index 39512e18b4..2d8da8e963 100644 --- a/application.py +++ b/application.py @@ -1,8 +1,6 @@ import os from apig_wsgi import make_lambda_handler -from aws_xray_sdk.core import patch_all, xray_recorder -from aws_xray_sdk.ext.flask.middleware import XRayMiddleware from dotenv import load_dotenv from flask import Flask from werkzeug.middleware.proxy_fix import ProxyFix @@ -10,14 +8,13 @@ from app import create_app load_dotenv() -# Patch all supported libraries for X-Ray -# Used to trace requests and responses through the stack -patch_all() + +# OpenTelemetry auto-instrumentation will handle all tracing +# No manual patching or middleware needed application = Flask("app") application.wsgi_app = ProxyFix(application.wsgi_app) # type: ignore -xray_recorder.configure(service="Notify-Admin") -XRayMiddleware(application, xray_recorder) + create_app(application) apig_wsgi_handler = make_lambda_handler(application, binary_support=True) diff --git a/gunicorn_config.py b/gunicorn_config.py index cf6e5e7112..06fa7d3909 100644 --- a/gunicorn_config.py +++ b/gunicorn_config.py @@ -54,6 +54,13 @@ def on_starting(server): server.log.info("Starting Notifications Admin") + server.log.info(f"Using worker class: {worker_class}") + + # Log telemetry configuration + otel_vars = ["OTEL_SERVICE_NAME", "OTEL_RESOURCE_ATTRIBUTES", "OTEL_EXPORTER_OTLP_ENDPOINT"] + otel_detected = any(os.environ.get(var) for var in otel_vars) + server.log.info(f"OpenTelemetry detected: {otel_detected}") + server.log.info("Using OpenTelemetry for all tracing (AWS X-Ray removed)") def worker_abort(worker): diff --git a/mypy.ini b/mypy.ini index 05a2cf8485..2b77b2c53c 100644 --- a/mypy.ini +++ b/mypy.ini @@ -59,7 +59,4 @@ ignore_missing_imports = True ignore_missing_imports = True [mypy-newrelic.*] -ignore_missing_imports = True - -[mypy-aws_xray_sdk.*] ignore_missing_imports = True \ No newline at end of file diff --git a/package.json b/package.json index e55792f888..def326c925 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "description": "Admin front end for Notification", "engines": { - "node": "16" + "node": ">=16" }, "scripts": { "test": "jest --config tests/javascripts/jest.config.js tests/javascripts", diff --git a/poetry.lock b/poetry.lock index a54ac3c7d1..70c4fe500a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -11,21 +11,6 @@ files = [ {file = "apig_wsgi-2.18.0.tar.gz", hash = "sha256:7e46eb15b32f644caeb8065ad494beae4f3114dc10009384db9191f2b16eceec"}, ] -[[package]] -name = "aws-xray-sdk" -version = "2.14.0" -description = "The AWS X-Ray SDK for Python (the SDK) enables Python developers to record and emit information from within their applications to the AWS X-Ray service." -optional = false -python-versions = ">=3.7" -files = [ - {file = "aws_xray_sdk-2.14.0-py2.py3-none-any.whl", hash = "sha256:cfbe6feea3d26613a2a869d14c9246a844285c97087ad8f296f901633554ad94"}, - {file = "aws_xray_sdk-2.14.0.tar.gz", hash = "sha256:aab843c331af9ab9ba5cefb3a303832a19db186140894a523edafc024cc0493c"}, -] - -[package.dependencies] -botocore = ">=1.11.3" -wrapt = "*" - [[package]] name = "awscli" version = "1.33.35" @@ -2592,85 +2577,6 @@ MarkupSafe = ">=2.1.1" [package.extras] watchdog = ["watchdog (>=2.3)"] -[[package]] -name = "wrapt" -version = "1.16.0" -description = "Module for decorators, wrappers and monkey patching." -optional = false -python-versions = ">=3.6" -files = [ - {file = "wrapt-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4"}, - {file = "wrapt-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e4fdb9275308292e880dcbeb12546df7f3e0f96c6b41197e0cf37d2826359020"}, - {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb2dee3874a500de01c93d5c71415fcaef1d858370d405824783e7a8ef5db440"}, - {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a88e6010048489cda82b1326889ec075a8c856c2e6a256072b28eaee3ccf487"}, - {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac83a914ebaf589b69f7d0a1277602ff494e21f4c2f743313414378f8f50a4cf"}, - {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:73aa7d98215d39b8455f103de64391cb79dfcad601701a3aa0dddacf74911d72"}, - {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:807cc8543a477ab7422f1120a217054f958a66ef7314f76dd9e77d3f02cdccd0"}, - {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bf5703fdeb350e36885f2875d853ce13172ae281c56e509f4e6eca049bdfb136"}, - {file = "wrapt-1.16.0-cp310-cp310-win32.whl", hash = "sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d"}, - {file = "wrapt-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:decbfa2f618fa8ed81c95ee18a387ff973143c656ef800c9f24fb7e9c16054e2"}, - {file = "wrapt-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a5db485fe2de4403f13fafdc231b0dbae5eca4359232d2efc79025527375b09"}, - {file = "wrapt-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:75ea7d0ee2a15733684badb16de6794894ed9c55aa5e9903260922f0482e687d"}, - {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a452f9ca3e3267cd4d0fcf2edd0d035b1934ac2bd7e0e57ac91ad6b95c0c6389"}, - {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43aa59eadec7890d9958748db829df269f0368521ba6dc68cc172d5d03ed8060"}, - {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72554a23c78a8e7aa02abbd699d129eead8b147a23c56e08d08dfc29cfdddca1"}, - {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d2efee35b4b0a347e0d99d28e884dfd82797852d62fcd7ebdeee26f3ceb72cf3"}, - {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6dcfcffe73710be01d90cae08c3e548d90932d37b39ef83969ae135d36ef3956"}, - {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:eb6e651000a19c96f452c85132811d25e9264d836951022d6e81df2fff38337d"}, - {file = "wrapt-1.16.0-cp311-cp311-win32.whl", hash = "sha256:66027d667efe95cc4fa945af59f92c5a02c6f5bb6012bff9e60542c74c75c362"}, - {file = "wrapt-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:aefbc4cb0a54f91af643660a0a150ce2c090d3652cf4052a5397fb2de549cd89"}, - {file = "wrapt-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b"}, - {file = "wrapt-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36"}, - {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73"}, - {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809"}, - {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b"}, - {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81"}, - {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9"}, - {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c"}, - {file = "wrapt-1.16.0-cp312-cp312-win32.whl", hash = "sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc"}, - {file = "wrapt-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8"}, - {file = "wrapt-1.16.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d462f28826f4657968ae51d2181a074dfe03c200d6131690b7d65d55b0f360f8"}, - {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a33a747400b94b6d6b8a165e4480264a64a78c8a4c734b62136062e9a248dd39"}, - {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3646eefa23daeba62643a58aac816945cadc0afaf21800a1421eeba5f6cfb9c"}, - {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ebf019be5c09d400cf7b024aa52b1f3aeebeff51550d007e92c3c1c4afc2a40"}, - {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:0d2691979e93d06a95a26257adb7bfd0c93818e89b1406f5a28f36e0d8c1e1fc"}, - {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:1acd723ee2a8826f3d53910255643e33673e1d11db84ce5880675954183ec47e"}, - {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:bc57efac2da352a51cc4658878a68d2b1b67dbe9d33c36cb826ca449d80a8465"}, - {file = "wrapt-1.16.0-cp36-cp36m-win32.whl", hash = "sha256:da4813f751142436b075ed7aa012a8778aa43a99f7b36afe9b742d3ed8bdc95e"}, - {file = "wrapt-1.16.0-cp36-cp36m-win_amd64.whl", hash = "sha256:6f6eac2360f2d543cc875a0e5efd413b6cbd483cb3ad7ebf888884a6e0d2e966"}, - {file = "wrapt-1.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a0ea261ce52b5952bf669684a251a66df239ec6d441ccb59ec7afa882265d593"}, - {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bd2d7ff69a2cac767fbf7a2b206add2e9a210e57947dd7ce03e25d03d2de292"}, - {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9159485323798c8dc530a224bd3ffcf76659319ccc7bbd52e01e73bd0241a0c5"}, - {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a86373cf37cd7764f2201b76496aba58a52e76dedfaa698ef9e9688bfd9e41cf"}, - {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:73870c364c11f03ed072dda68ff7aea6d2a3a5c3fe250d917a429c7432e15228"}, - {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b935ae30c6e7400022b50f8d359c03ed233d45b725cfdd299462f41ee5ffba6f"}, - {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:db98ad84a55eb09b3c32a96c576476777e87c520a34e2519d3e59c44710c002c"}, - {file = "wrapt-1.16.0-cp37-cp37m-win32.whl", hash = "sha256:9153ed35fc5e4fa3b2fe97bddaa7cbec0ed22412b85bcdaf54aeba92ea37428c"}, - {file = "wrapt-1.16.0-cp37-cp37m-win_amd64.whl", hash = "sha256:66dfbaa7cfa3eb707bbfcd46dab2bc6207b005cbc9caa2199bcbc81d95071a00"}, - {file = "wrapt-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1dd50a2696ff89f57bd8847647a1c363b687d3d796dc30d4dd4a9d1689a706f0"}, - {file = "wrapt-1.16.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:44a2754372e32ab315734c6c73b24351d06e77ffff6ae27d2ecf14cf3d229202"}, - {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e9723528b9f787dc59168369e42ae1c3b0d3fadb2f1a71de14531d321ee05b0"}, - {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dbed418ba5c3dce92619656802cc5355cb679e58d0d89b50f116e4a9d5a9603e"}, - {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:941988b89b4fd6b41c3f0bfb20e92bd23746579736b7343283297c4c8cbae68f"}, - {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6a42cd0cfa8ffc1915aef79cb4284f6383d8a3e9dcca70c445dcfdd639d51267"}, - {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ca9b6085e4f866bd584fb135a041bfc32cab916e69f714a7d1d397f8c4891ca"}, - {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d5e49454f19ef621089e204f862388d29e6e8d8b162efce05208913dde5b9ad6"}, - {file = "wrapt-1.16.0-cp38-cp38-win32.whl", hash = "sha256:c31f72b1b6624c9d863fc095da460802f43a7c6868c5dda140f51da24fd47d7b"}, - {file = "wrapt-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:490b0ee15c1a55be9c1bd8609b8cecd60e325f0575fc98f50058eae366e01f41"}, - {file = "wrapt-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9b201ae332c3637a42f02d1045e1d0cccfdc41f1f2f801dafbaa7e9b4797bfc2"}, - {file = "wrapt-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2076fad65c6736184e77d7d4729b63a6d1ae0b70da4868adeec40989858eb3fb"}, - {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5cd603b575ebceca7da5a3a251e69561bec509e0b46e4993e1cac402b7247b8"}, - {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b47cfad9e9bbbed2339081f4e346c93ecd7ab504299403320bf85f7f85c7d46c"}, - {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a"}, - {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5f15814a33e42b04e3de432e573aa557f9f0f56458745c2074952f564c50e664"}, - {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db2e408d983b0e61e238cf579c09ef7020560441906ca990fe8412153e3b291f"}, - {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:edfad1d29c73f9b863ebe7082ae9321374ccb10879eeabc84ba3b69f2579d537"}, - {file = "wrapt-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed867c42c268f876097248e05b6117a65bcd1e63b779e916fe2e33cd6fd0d3c3"}, - {file = "wrapt-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:eb1b046be06b0fce7249f1d025cd359b4b80fc1c3e24ad9eca33e0dcdb2e4a35"}, - {file = "wrapt-1.16.0-py3-none-any.whl", hash = "sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1"}, - {file = "wrapt-1.16.0.tar.gz", hash = "sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d"}, -] - [[package]] name = "wtforms" version = "3.1.2" @@ -2782,4 +2688,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "~3.12.7" -content-hash = "18976250be08265857e3c0a7a77d8f1bc760f38608a612e1b41354e0d75dbfdd" +content-hash = "f372a9fb7e071c431f5e957808f2c85b134922896c1316dbc3b3f0d0271e040d" diff --git a/pyproject.toml b/pyproject.toml index 5782bd3235..1bfffe09e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ build-backend = "poetry.core.masonry.api" [tool.poetry.dependencies] python = "~3.12.7" apig-wsgi = "2.18.0" -aws-xray-sdk = "^2.14.0" # PaaS awscli-cwlogs = "^1.4.6" From 39dc0598d3b7ec4b44946207d0d94608162c0a8b Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Wed, 24 Sep 2025 15:25:48 -0400 Subject: [PATCH 2/2] formatting --- gunicorn_config.py | 67 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/gunicorn_config.py b/gunicorn_config.py index 06fa7d3909..7caa37aa50 100644 --- a/gunicorn_config.py +++ b/gunicorn_config.py @@ -3,6 +3,23 @@ import time import traceback +# Check if OpenTelemetry auto-instrumentation is active +# If so, use sync workers to avoid monkey patching conflicts +otel_env_vars = [ + "OTEL_SERVICE_NAME", + "OTEL_RESOURCE_ATTRIBUTES", + "OTEL_EXPORTER_OTLP_ENDPOINT", + "OTEL_TRACES_EXPORTER", + "OTEL_METRICS_EXPORTER", +] + +otel_detected = any(os.environ.get(var) for var in otel_env_vars) + +# Also check if opentelemetry is in the Python path (auto-instrumentation) +pythonpath = os.environ.get("PYTHONPATH", "") +if "otel-auto-instrumentation" in pythonpath or "opentelemetry" in pythonpath: + otel_detected = True + import gunicorn # type: ignore import newrelic.agent # See https://bit.ly/2xBVKBH @@ -12,8 +29,15 @@ # Guincorn sets the server type on our app. We don't want to show it in the header in the response. gunicorn.SERVER = "Undisclosed" -workers = 5 -worker_class = "gevent" +# Use sync workers when OpenTelemetry is detected to avoid SSL monkey patching conflicts +worker_class = "sync" if otel_detected else "gevent" + +# Adjust worker count based on worker class +# Sync workers need more processes to handle the same load as gevent +if otel_detected: + workers = 8 # More workers for sync mode +else: + workers = 5 # Standard worker count for gevent bind = "0.0.0.0:{}".format(os.getenv("PORT")) accesslog = "-" @@ -48,6 +72,12 @@ graceful_timeout = 85 timeout = 90 +# Additional configuration for sync workers when using OpenTelemetry +if otel_detected: + # Sync workers might need slightly longer timeout for instrumented requests + timeout = 95 + graceful_timeout = 90 + # Start timer for total running time start_time = time.time() @@ -56,11 +86,22 @@ def on_starting(server): server.log.info("Starting Notifications Admin") server.log.info(f"Using worker class: {worker_class}") - # Log telemetry configuration - otel_vars = ["OTEL_SERVICE_NAME", "OTEL_RESOURCE_ATTRIBUTES", "OTEL_EXPORTER_OTLP_ENDPOINT"] - otel_detected = any(os.environ.get(var) for var in otel_vars) + # Log telemetry configuration using the same detection logic server.log.info(f"OpenTelemetry detected: {otel_detected}") - server.log.info("Using OpenTelemetry for all tracing (AWS X-Ray removed)") + + if otel_detected: + server.log.info("✅ OpenTelemetry auto-instrumentation active - using sync workers to avoid SSL conflicts") + # Log which env vars triggered detection + active_vars = [var for var in otel_env_vars if os.environ.get(var)] + if active_vars: + server.log.info(f"OTEL environment variables: {active_vars}") + pythonpath = os.environ.get("PYTHONPATH", "") + if "otel-auto-instrumentation" in pythonpath: + server.log.info("OTEL auto-instrumentation detected in PYTHONPATH") + else: + server.log.info("No OpenTelemetry detected - using gevent workers for better performance") + + server.log.info("AWS X-Ray removed - OpenTelemetry handles all tracing") def worker_abort(worker): @@ -77,3 +118,17 @@ def on_exit(server): def worker_int(worker): worker.log.info("worker: received SIGINT {}".format(worker.pid)) + + +def post_worker_init(worker): + """Initialize worker process - useful for OpenTelemetry sync workers""" + if otel_detected: + worker.log.info(f"Initializing sync worker {worker.pid} for OpenTelemetry instrumentation") + # Ensure clean SSL context in sync workers + import ssl + + # Reset any cached SSL contexts to prevent recursion issues + if hasattr(ssl, "_create_default_https_context"): + ssl._create_default_https_context = ssl.create_default_context + else: + worker.log.info(f"Initializing gevent worker {worker.pid}")