Remove new relic from API (#2828)

* Format

* remove environment

* remove import

---------

Co-authored-by: Ben Larabie <ben.larabie@blarabie-jtfk.home>

Author: ben851

.github/workflows/lambda_staging.yml

@@ -45,22 +45,7 @@ jobs:
       - name: Build container
         run: |
           set -euo pipefail
-          PARAM_NAME="ENVIRONMENT_VARIABLES"
-          RAW=$(aws ssm get-parameter \
-            --name "$PARAM_NAME" \
-            --with-decryption \
-            --query 'Parameter.Value' \
-            --output text || true)
-          # Fallback to false if not present
-          NEW_RELIC_ENABLED=$(printf '%s' "$RAW" | grep -E '^NEW_RELIC_ENABLED=' | head -n1 | cut -d '=' -f2- || true)
-          if [ -z "${NEW_RELIC_ENABLED}" ]; then NEW_RELIC_ENABLED=false; fi
           DOCKERFILE="ci/Dockerfile.lambda"
-          if [ "${NEW_RELIC_ENABLED}" = "true" ] || [ "${NEW_RELIC_ENABLED}" = "TRUE" ]; then
-            DOCKERFILE="ci/Dockerfile.newrelic.lambda"
-            echo "NEW_RELIC_ENABLED=$NEW_RELIC_ENABLED -> using ${DOCKERFILE}" >&2
-          else
-            echo "NEW_RELIC_ENABLED=$NEW_RELIC_ENABLED -> using plain ${DOCKERFILE}" >&2
-          fi
           docker buildx build \
             --provenance=false \
             --build-arg GIT_SHA=${GITHUB_SHA::7} \

application.py

@@ -28,18 +28,7 @@
     patch_all()
 
 is_lambda = os.environ.get("AWS_LAMBDA_RUNTIME_API") is not None
-enable_newrelic = env.bool("ENABLE_NEW_RELIC", default=False) and not ff_enable_otel
-
 print("is_lambda =", is_lambda)
-print("enable_newrelic =", enable_newrelic)
-
-if is_lambda and enable_newrelic:
-    import newrelic.agent
-
-    # Initialize New Relic early, before creating the Flask app
-    print("Lambda detected, and New Relic enabled - initializing New Relic agent")
-    environment = os.getenv("NOTIFY_ENVIRONMENT", "dev")
-    newrelic.agent.initialize("newrelic.ini", environment=environment)
 
 application = Flask("api")
 application.wsgi_app = ProxyFix(application.wsgi_app)  # type: ignore
@@ -51,12 +40,6 @@
     xray_recorder.configure(service="Notify-API", context=NotifyContext())
     XRayMiddleware(app, xray_recorder)
 
-# It's annoying that we have to do this here, but order matters
-# so we need to check if is lambda twice.
-if is_lambda and enable_newrelic:
-    # Wrap the Flask app with New Relic's WSGI wrapper
-    app = newrelic.agent.WSGIApplicationWrapper(app)
-
 apig_wsgi_handler = make_lambda_handler(
     app, binary_support=True, non_binary_content_type_prefixes=["application/yaml", "application/json"]
 )

bin/entry.sh

@@ -6,13 +6,4 @@ else
     RUNTIME_CMD="$(which python)"
 fi
 
-## IMPORTANT: NEW RELIC CONFIGURATION -- WE ALWAYS WANT TO USE APM MODE!
-# Force classic New Relic agent mode for Lambda so data flows to APM instead of the serverless extension
-unset NEW_RELIC_LAMBDA_EXTENSION_ENABLED
-unset NEW_RELIC_LAMBDA_HANDLER
-unset NEW_RELIC_EXTENSION_LOGS_ENABLED
-unset NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS
-export NEW_RELIC_SERVERLESS_MODE_ENABLED=false
-export NEW_RELIC_CONFIG_FILE=${NEW_RELIC_CONFIG_FILE:-/app/newrelic.ini}
-
 exec ${RUNTIME_CMD} -m awslambdaric $1

ci/Dockerfile.lambda

@@ -28,15 +28,6 @@ RUN python -m venv ${APP_VENV} \
     && poetry install \
     && poetry add awslambdaric wheel
 
-# Now install NewRelic manually using the setuptools from Poetry
-RUN . ${APP_VENV}/bin/activate \
-    && wget https://download.newrelic.com/python_agent/release/newrelic-11.0.1.tar.gz \
-    && tar -xzf newrelic-11.0.1.tar.gz \
-    && cd newrelic-11.0.1 \
-    && python setup.py install \
-    && cd .. \
-    && rm -rf newrelic-11.0.1 newrelic-11.0.1.tar.gz
-
 COPY . ${TASK_ROOT}/
 
 RUN . ${APP_VENV}/bin/activate \

gunicorn_config.py

@@ -10,20 +10,10 @@
 
 # Ensure these are always defined so other code can rely on them.
 os.environ.setdefault("FF_ENABLE_OTEL", os.getenv("FF_ENABLE_OTEL", "False"))
-os.environ.setdefault("ENABLE_NEW_RELIC", os.getenv("ENABLE_NEW_RELIC", "False"))
-os.environ.setdefault("NEW_RELIC_CONFIG_FILE", os.getenv("NEW_RELIC_CONFIG_FILE", "newrelic.ini"))
 
 env = Env()
 
 ff_enable_otel = env.bool("FF_ENABLE_OTEL", default=False)
-enable_newrelic = env.bool("ENABLE_NEW_RELIC", default=False) and not ff_enable_otel
-
-print("enable_newrelic =", enable_newrelic)
-
-if enable_newrelic:
-    import newrelic.agent
-
-    newrelic.agent.initialize(environment=environment)  # noqa: E402
 
 default_worker_class = "gevent_otel_worker.OTelAwareGeventWorker" if ff_enable_otel else "gevent"
 
@@ -61,9 +51,7 @@
     # will not be able to finish processing the request. This can lead to
     # 502 errors being returned to the client.
     #
-    # Also, some libraries such as NewRelic might need some time to finish
-    # initialization before the worker can start processing requests. The
-    # timeout values should consider these factors.
+    # The timeout values should consider initialization time for libraries.
     #
     # Gunicorn config:
     # https://docs.gunicorn.org/en/stable/settings.html#graceful-timeout

mypy.ini

@@ -1,7 +1,6 @@
 [mypy]
 python_version = 3.12
 exclude = ^.*/site-packages/.*$
-
 [mypy-pytest.*]
 ignore_missing_imports = True
 
@@ -68,9 +67,6 @@ ignore_missing_imports = True
 [mypy-phonenumbers.*]
 ignore_missing_imports = True
 
-[mypy-newrelic.*]
-ignore_missing_imports = True
-
 [mypy-docopt.*]
 ignore_missing_imports = True