signoz working for celery and api

app/celery/celery.py

@@ -2,13 +2,6 @@
 
 from flask import current_app
 
-from app.aws.xray_celery_handlers import (
-    xray_after_task_publish,
-    xray_before_task_publish,
-    xray_task_failure,
-    xray_task_postrun,
-    xray_task_prerun,
-)
 from celery import Celery, Task, signals
 from celery.signals import worker_process_shutdown
 
@@ -49,13 +42,6 @@ def init_app(self, app):
             task_cls=make_task(app),
         )
 
-        # Register the xray handlers
-        signals.after_task_publish.connect(xray_after_task_publish)
-        signals.before_task_publish.connect(xray_before_task_publish)
-        signals.task_failure.connect(xray_task_failure)
-        signals.task_postrun.connect(xray_task_postrun)
-        signals.task_prerun.connect(xray_task_prerun)
-
         # See https://docs.celeryproject.org/en/stable/userguide/configuration.html
         self.conf.update(
             {

app/config.py

@@ -228,9 +228,6 @@ class Config(object):
     DEBUG = False
     NOTIFY_LOG_PATH = os.getenv("NOTIFY_LOG_PATH")
 
-    # Xray SDK
-    AWS_XRAY_ENABLED = env.bool("AWS_XRAY_SDK_ENABLED", False)  # X-Ray switch leveraged by the SDK
-
     # Cronitor
     CRONITOR_ENABLED = False
     CRONITOR_KEYS = json.loads(os.getenv("CRONITOR_KEYS", "{}"))

application.py

@@ -5,18 +5,11 @@
 
 # import newrelic.agent  # See https://bit.ly/2xBVKBH
 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
 
 from app import create_app
-from app.aws.xray.context import NotifyContext
-
-# Patch all supported libraries for X-Ray
-# Used to trace requests and responses through the stack
-patch_all()
 
 load_dotenv()
 
@@ -25,9 +18,6 @@
 
 app = create_app(application)
 
-xray_recorder.configure(service="Notify-API", context=NotifyContext())
-XRayMiddleware(app, xray_recorder)
-
 apig_wsgi_handler = make_lambda_handler(
     app, binary_support=True, non_binary_content_type_prefixes=["application/yaml", "application/json"]
 )

gunicorn_config.py

@@ -9,9 +9,35 @@
 environment = os.environ.get("NOTIFY_ENVIRONMENT")
 newrelic.agent.initialize(environment=environment)  # noqa: E402
 
 workers = 4
-worker_class = "gevent"
-worker_connections = 256
+
+# Detect OpenTelemetry and use sync workers when present to avoid conflicts
+# OpenTelemetry auto-instrumentation + gevent monkey patching can cause SSL recursion issues
+def _detect_opentelemetry():
+    """Check if OpenTelemetry is present and configured for auto-instrumentation."""
+    try:
+        # Check for OTEL environment variables that indicate auto-instrumentation
+        otel_vars = [
+            "OTEL_PYTHON_CONFIGURATOR",
+            "OTEL_PYTHON_DISTRO",
+            "OTEL_SERVICE_NAME",
+            "OTEL_RESOURCE_ATTRIBUTES"
+        ]
+        return any(os.environ.get(var) for var in otel_vars)
+    except Exception:
+        return False
+
+# Use sync workers when OpenTelemetry is detected, gevent otherwise
+if _detect_opentelemetry():
+    worker_class = "sync"
+    # Increase worker count for sync workers as they handle one request at a time
+    workers = int(os.environ.get("GUNICORN_WORKERS", "8"))
+    print("OpenTelemetry detected - using sync workers for compatibility")
+else:
+    worker_class = "gevent"
+    worker_connections = 256
+    workers = int(os.environ.get("GUNICORN_WORKERS", "4"))
+    print("Using gevent workers")
 bind = "0.0.0.0:{}".format(os.getenv("PORT"))
 accesslog = "-"
 # Guincorn sets the server type on our app. We don't want to show it in the header in the response.

mypy.ini

@@ -84,10 +84,4 @@ ignore_missing_imports = True
 ignore_missing_imports = True
 
 [mypy-simple_salesforce.*]
-ignore_missing_imports = True
-
-[mypy-aws_xray_sdk.*]
-ignore_missing_imports = True
-
-[mypy-celery_aws_xray_sdk_extension.*]
 ignore_missing_imports = True