contrib/serverless/azure: fix client_class and metrics sets invocation

Fix extension handling of client_class that was ignored and typo in
metrics_sets arg that was mistyped.

While at it fix also a broken tests and add testing in the matrix.

Author: xrmx

.ci/.matrix_framework.yml

@@ -56,3 +56,4 @@ FRAMEWORK:
   - aiobotocore-newest
   - kafka-python-newest
   - grpc-newest
+  - azurefunctions-newest

.ci/.matrix_framework_full.yml

@@ -92,3 +92,4 @@ FRAMEWORK:
   - kafka-python-newest
   - grpc-newest
   #- grpc-1.24 # This appears to have problems with python>3.6?
+  - azurefunctions-newest

elasticapm/contrib/serverless/azure.py

@@ -96,7 +96,7 @@ def configure(cls, client_class=AzureFunctionsClient, **kwargs) -> None:
         if not client:
             kwargs["metrics_interval"] = "0ms"
             kwargs["breakdown_metrics"] = "false"
-            if "metric_sets" not in kwargs and "ELASTIC_APM_METRICS_SETS" not in os.environ:
+            if "metrics_sets" not in kwargs and "ELASTIC_APM_METRICS_SETS" not in os.environ:
                 # Allow users to override metrics sets
                 kwargs["metrics_sets"] = []
             kwargs["central_config"] = "false"
@@ -114,7 +114,7 @@ def configure(cls, client_class=AzureFunctionsClient, **kwargs) -> None:
                 and "AZURE_FUNCTIONS_ENVIRONMENT" in os.environ
             ):
                 kwargs["environment"] = os.environ["AZURE_FUNCTIONS_ENVIRONMENT"]
-            client = AzureFunctionsClient(**kwargs)
+            client = client_class(**kwargs)
         cls.client = client
 
     @classmethod

tests/contrib/serverless/azurefunctions/azure_functions_tests.py

@@ -37,6 +37,7 @@
 import azure.functions as func
 import mock
 
+import elasticapm
 from elasticapm.conf import constants
 from elasticapm.contrib.serverless.azure import AzureFunctionsClient, ElasticAPMExtension, get_faas_data
 from tests.fixtures import TempStoreClient
@@ -95,6 +96,7 @@ def test_extension_configure():
             ElasticAPMExtension.configure(client_class=AzureFunctionsTestClient)
         client = ElasticAPMExtension.client
         assert client.config.metrics_interval == datetime.timedelta(0)
+        assert client.config.breakdown_metrics is False
         assert client.config.central_config is False
         assert client.config.cloud_provider == "none"
         assert client.config.framework_name == "Azure Functions"
@@ -106,6 +108,27 @@ def test_extension_configure():
             ElasticAPMExtension.client = None
 
 
+def test_extension_configure_with_kwargs():
+    try:
+        ElasticAPMExtension.configure(
+            client_class=AzureFunctionsTestClient, metrics_sets=["foo"], service_name="foo", environment="bar"
+        )
+        client = ElasticAPMExtension.client
+
+        assert client.config.metrics_interval == datetime.timedelta(0)
+        assert client.config.breakdown_metrics is False
+        assert client.config.central_config is False
+        assert client.config.cloud_provider == "none"
+        assert client.config.framework_name == "Azure Functions"
+        assert client.config.service_name == "foo"
+        assert client.config.environment == "bar"
+        assert client.config.metrics_sets == ["foo"]
+    finally:
+        if ElasticAPMExtension.client:
+            ElasticAPMExtension.client.close()
+            ElasticAPMExtension.client = None
+
+
 @pytest.mark.parametrize(
     "elasticapm_client", [{"client_class": AzureFunctionsTestClient}], indirect=["elasticapm_client"]
 )
@@ -122,8 +145,7 @@ def test_pre_post_invocation_app_level_request(elasticapm_client):
             body=b"",
         )
         response = func.HttpResponse("", status_code=200, headers={}, mimetype="text/html")
-        context = mock.Mock(function_name="foo")
-        context.function_name = "foo_function"
+        context = mock.Mock(function_name="foo_function", invocation_id="fooid")
         ElasticAPMExtension.pre_invocation_app_level(None, context, {"request": request})
         ElasticAPMExtension.post_invocation_app_level(None, context, func_ret=response)
         transaction = elasticapm_client.events[constants.TRANSACTION][0]

tests/requirements/reqs-azurefunctions-newest.txt

@@ -0,0 +1,2 @@
+azure-functions
+-r reqs-base.txt