Refactor testing setup

Author: TimPansino

.github/scripts/install_azure_functions_worker.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -euo pipefail
+
+# Create build dir
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+BUILD_DIR="${TOX_ENV_DIR:-${SCRIPT_DIR}}/build/azure-functions-worker"
+rm -rf ${BUILD_DIR}
+mkdir -p ${BUILD_DIR}
+
+# Clone repository
+git clone https://github.com/Azure/azure-functions-python-worker.git ${BUILD_DIR}
+
+# Setup virtual environment and install dependencies
+python -m venv "${BUILD_DIR}/.venv"
+PYTHON="${BUILD_DIR}/.venv/bin/python"
+PIP="${BUILD_DIR}/.venv/bin/pip"
+PIPCOMPILE="${BUILD_DIR}/.venv/bin/pip-compile"
+INVOKE="${BUILD_DIR}/.venv/bin/invoke"
+${PIP} install pip-tools build invoke
+
+# Install proto build dependencies
+$(cd ${BUILD_DIR} && ${PIPCOMPILE} >${BUILD_DIR}/requirements.txt)
+${PIP} install -r ${BUILD_DIR}/requirements.txt
+
+# Build proto files into pb2 files
+cd ${BUILD_DIR}/tests && ${INVOKE} -c test_setup build-protos
+
+# Build and install the package into the original environment (not the build venv)
+pip install ${BUILD_DIR}
+
+# Clean up and return to the original directory
+rm -rf ${BUILD_DIR}

newrelic/common/utilization.py

@@ -29,6 +29,7 @@
 AZURE_RESOURCE_GROUP_NAME_RE = re.compile(r"\+([a-zA-Z0-9\-]+)-[a-zA-Z0-9]+(?:-Linux)")
 AZURE_RESOURCE_GROUP_NAME_PARTIAL_RE = re.compile(r"\+([a-zA-Z0-9\-]+)(?:-Linux)?-[a-zA-Z0-9]+")
 
+
 class UtilizationHttpClient(InsecureHttpClient):
     SOCKET_TIMEOUT = 0.05
 
@@ -228,9 +229,7 @@ def fetch():
             else:
                 resource_group_name = AZURE_RESOURCE_GROUP_NAME_PARTIAL_RE.search(website_owner_name).group(1)
             subscription_id = re.search(r"(?:(?!\+).)*", website_owner_name).group(0)
-            faas_app_name = "/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Web/sites/{2}".format(
-                subscription_id, resource_group_name, azure_function_app_name
-            )
+            faas_app_name = f"/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}/providers/Microsoft.Web/sites/{azure_function_app_name}"
             # Only send if all values are present
             return (faas_app_name, cloud_region)
 

newrelic/config.py

@@ -4092,7 +4092,9 @@ def _process_module_builtin_defaults():
     )
     _process_module_definition("tornado.routing", "newrelic.hooks.framework_tornado", "instrument_tornado_routing")
     _process_module_definition("tornado.web", "newrelic.hooks.framework_tornado", "instrument_tornado_web")
-    _process_module_definition("azure.functions._http", "newrelic.hooks.serverless_azure", "instrument_azure__http")
+    _process_module_definition(
+        "azure.functions._http", "newrelic.hooks.serverless_azure", "instrument_azure_function__http"
+    )
     _process_module_definition(
         "azure_functions_worker.dispatcher",
         "newrelic.hooks.serverless_azure",

newrelic/hooks/serverless_azure.py

@@ -20,8 +20,8 @@
 from newrelic.api.transaction import current_transaction
 from newrelic.api.web_transaction import WebTransaction
 from newrelic.common.object_wrapper import wrap_function_wrapper
-from newrelic.common.utilization import AZURE_RESOURCE_GROUP_NAME_RE, AZURE_RESOURCE_GROUP_NAME_PARTIAL_RE
 from newrelic.common.signature import bind_args
+from newrelic.common.utilization import AZURE_RESOURCE_GROUP_NAME_PARTIAL_RE, AZURE_RESOURCE_GROUP_NAME_RE
 
 
 def original_agent_instance():
@@ -65,7 +65,6 @@ def intrinsics_populator(application, context):
 # the application if not already registered with the collector as well
 # as determining if this invocation was a cold start or not.
 async def wrap_dispatcher__handle__invocation_request(wrapped, instance, args, kwargs):
-
     # Logic to determine if this is a cold start since we are not
     # able to access the logic in the __init__ method of the Dispatcher
     # class with Python (in the Portal, this is not done in Python)
@@ -97,7 +96,7 @@ async def wrap_dispatcher__run_async_func(wrapped, instance, args, kwargs):
 
     context = bound_args.get("context", None)
     func = bound_args.get("func", None)
-    params = bound_args.get("args", None)
+    params = bound_args.get("params", None)
 
     application = original_agent_instance()
 
@@ -108,7 +107,11 @@ async def wrap_dispatcher__run_async_func(wrapped, instance, args, kwargs):
             url_split = urlparse.urlsplit(getattr(http_request, "url", ":///?#"))
             scheme = getattr(url_split, "scheme", None)
             query = getattr(url_split, "query", None)
-            host, port = (getattr(url_split, "netloc", None), None) if (":" not in getattr(url_split, "netloc", None)) else getattr(url_split, "netloc", None).split(":")
+            host, port = (
+                (getattr(url_split, "netloc", None), None)
+                if (":" not in getattr(url_split, "netloc", None))
+                else getattr(url_split, "netloc", None).split(":")
+            )
             break
 
     # If this is an HTTP http_request object, create a web transaction.
@@ -161,7 +164,7 @@ def wrap_dispatcher__run_sync_func(wrapped, instance, args, kwargs):
     context = bound_args.get("context", None)
     func = bound_args.get("func", None)
     params = bound_args.get("params", None)
-    
+
     application = original_agent_instance()
 
     http_request = None
@@ -171,7 +174,11 @@ def wrap_dispatcher__run_sync_func(wrapped, instance, args, kwargs):
             url_split = urlparse.urlsplit(getattr(http_request, "url", ":///?#"))
             scheme = getattr(url_split, "scheme", None)
             query = getattr(url_split, "query", None)
-            host, port = (getattr(url_split, "netloc", None), None) if (":" not in getattr(url_split, "netloc", None)) else getattr(url_split, "netloc", None).split(":")
+            host, port = (
+                (getattr(url_split, "netloc", None), None)
+                if (":" not in getattr(url_split, "netloc", None))
+                else getattr(url_split, "netloc", None).split(":")
+            )
             break
 
     # If this is an HTTP Request object, we can create a web transaction
@@ -216,7 +223,6 @@ def wrap_dispatcher__run_sync_func(wrapped, instance, args, kwargs):
 
 
 def wrap_httpresponse__init__(wrapped, instance, args, kwargs):
-
     transaction = current_transaction()
     if not transaction:
         return wrapped(*args, **kwargs)
@@ -225,14 +231,14 @@ def wrap_httpresponse__init__(wrapped, instance, args, kwargs):
 
     status_code = bound_args.get("status_code", None)
     headers = bound_args.get("headers", None)
-    
+
     if status_code:
         transaction.process_response(status_code, headers)
 
     return wrapped(*args, **kwargs)
 
 
-def instrument_azure__http(module):
+def instrument_azure_function__http(module):
     if hasattr(module, "HttpResponse"):
         wrap_function_wrapper(module, "HttpResponse.__init__", wrap_httpresponse__init__)
 

tests/agent_unittests/test_agent_protocol.py

@@ -373,7 +373,7 @@ def connect_payload_asserts(
 def test_connect(
     with_aws, with_ecs, with_pcf, with_gcp, with_azure, with_azurefunction, with_docker, with_kubernetes, with_ip
 ):
-    global AWS, AZURE, AZUREFUNCTION, GCP, PCF, BOOT_ID, DOCKER, KUBERNETES, IP_ADDRESS
+    global AWS, AZURE, AZUREFUNCTION, GCP, PCF, DOCKER, KUBERNETES, IP_ADDRESS
     if not with_aws:
         AWS = Exception
     if not with_pcf:

.github/scripts/azure_functions.sh tests/serverless_azure/__init__.py.github/scripts/azure_functions.sh renamed to tests/serverless_azure/__init__.py

@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright 2010 New Relic, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,4 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-python ping_application.py &

tests/serverless_azure/conftest.py

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
 
-from testing_support.fixtures import (  # noqa: F401; pylint: disable=W0611
-    collector_agent_registration_fixture,
-    collector_available_fixture,
-)
+import pytest
+from testing_support.fixtures import collector_agent_registration_fixture, collector_available_fixture
 
 _default_settings = {
     "package_reporting.enabled": False,  # Turn off package reporting for testing as it causes slow downs.
@@ -30,3 +29,32 @@
 collector_agent_registration = collector_agent_registration_fixture(
     app_name="Python Agent Test (serverless_azure)", default_settings=_default_settings
 )
+
+
+@pytest.fixture(scope="session", autouse=True)
+def dispatcher():
+    """Fixture that starts the worker on a separate thread and returns the dispatcher instance."""
+    from .sample_app.worker import start_dispatcher_thread
+
+    # Start the dispatcher thread
+    dispatcher_ = start_dispatcher_thread()
+
+    # Return the dispatcher instance for use in tests
+    yield dispatcher_
+
+    # Stop worker gracefully
+    dispatcher_.stop()
+
+
+@pytest.fixture(scope="session", params=["sync", "async"])
+def is_async(request):
+    """Fixture that parametrizes the endpoint type between sync and async."""
+    return request.param == "async"
+
+
+@pytest.fixture(scope="session")
+def send_invocation(is_async, dispatcher):
+    """Fixture that returns the _send_event interface."""
+    from .sample_app.messages import send_invocation_event
+
+    return functools.partial(send_invocation_event, dispatcher, is_async=is_async)