Use WEBSITE_RESOURCE_GROUP as primary info source

Author: TimPansino

newrelic/common/utilization.py

@@ -231,36 +231,19 @@ class AzureFunctionUtilization(CommonUtilization):
     HEADERS = {"Metadata": "true"}  # noqa: RUF012
     VENDOR_NAME = "azurefunction"
 
-    RESOURCE_GROUP_NAME_RE = re.compile(r"\+([a-zA-Z0-9\-]+)-[a-zA-Z0-9]+(?:-Linux)")
-    RESOURCE_GROUP_NAME_PARTIAL_RE = re.compile(r"\+([a-zA-Z0-9\-]+)(?:-Linux)?-[a-zA-Z0-9]+")
-    SUBSCRIPTION_ID_RE = re.compile(r"(?:(?!\+).)*")
-
     @classmethod
     def fetch(cls):
         cloud_region = os.environ.get("REGION_NAME")
         website_owner_name = os.environ.get("WEBSITE_OWNER_NAME")
         azure_function_app_name = os.environ.get("WEBSITE_SITE_NAME")
-
-        if all((cloud_region, website_owner_name, azure_function_app_name)):
-            resource_group_name_re = (
-                cls.RESOURCE_GROUP_NAME_RE
-                if website_owner_name.endswith("-Linux")
-                else cls.RESOURCE_GROUP_NAME_PARTIAL_RE
-            )
-            match = resource_group_name_re.search(website_owner_name)
-            if match:
-                resource_group_name = match.group(1)
-            else:
-                _logger.debug(
-                    "Unable to determine Azure Functions resource group name from WEBSITE_OWNER_NAME. %r",
-                    website_owner_name,
-                )
-                return None
-
-            match = cls.SUBSCRIPTION_ID_RE.search(website_owner_name)
-            if match:
-                subscription_id = match.group(0)
-            else:
+        resource_group_name = os.environ.get("WEBSITE_RESOURCE_GROUP")
+
+        if all((cloud_region, website_owner_name, azure_function_app_name, resource_group_name)):
+            subscription_id = ""
+            if "+" in website_owner_name:
+                subscription_id = website_owner_name.split("+")[0]
+            # Catch missing subscription_id or missing +
+            if not subscription_id:
                 _logger.debug(
                     "Unable to determine Azure Functions subscription id from WEBSITE_OWNER_NAME. %r",
                     website_owner_name,

newrelic/hooks/framework_azurefunctions.py

@@ -13,18 +13,13 @@
 # limitations under the License.
 
 import os
-import re
 import urllib.parse as urlparse
 
 from newrelic.api.application import application_instance
 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.signature import bind_args
-from newrelic.common.utilization import AzureFunctionUtilization
-
-RESOURCE_GROUP_NAME_PARTIAL_RE = AzureFunctionUtilization.RESOURCE_GROUP_NAME_PARTIAL_RE
-RESOURCE_GROUP_NAME_RE = AzureFunctionUtilization.RESOURCE_GROUP_NAME_RE
 
 
 def original_agent_instance():
@@ -38,18 +33,12 @@ def intrinsics_populator(application, context):
     trigger_type = "http"
 
     website_owner_name = os.environ.get("WEBSITE_OWNER_NAME", None)
-    if not website_owner_name:
-        subscription_id = "Unknown"
-    else:
-        subscription_id = re.search(r"(?:(?!\+).)*", website_owner_name) and re.search(
-            r"(?:(?!\+).)*", website_owner_name
-        ).group(0)
-    if website_owner_name and website_owner_name.endswith("-Linux"):
-        resource_group_name = RESOURCE_GROUP_NAME_RE.search(website_owner_name).group(1)
-    elif website_owner_name:
-        resource_group_name = RESOURCE_GROUP_NAME_PARTIAL_RE.search(website_owner_name).group(1)
-    else:
-        resource_group_name = os.environ.get("WEBSITE_RESOURCE_GROUP", "Unknown")
+
+    subscription_id = "Unknown"
+    if website_owner_name and "+" in website_owner_name:
+        subscription_id = website_owner_name.split("+")[0] or "Unknown"
+
+    resource_group_name = os.environ.get("WEBSITE_RESOURCE_GROUP", "Unknown")
     azure_function_app_name = os.environ.get("WEBSITE_SITE_NAME", getattr(application, "name", "Azure Function App"))
 
     cloud_resource_id = f"/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}/providers/Microsoft.Web/sites/{azure_function_app_name}/functions/{getattr(context, 'function_name', 'Unknown')}"

tests/framework_azurefunctions/test_utilization.py

@@ -17,6 +17,7 @@
 
 def test_utilization(monkeypatch):
     monkeypatch.setenv("REGION_NAME", "EastUS2")
+    monkeypatch.setenv("WEBSITE_RESOURCE_GROUP", "testing-rg")
     monkeypatch.setenv("WEBSITE_OWNER_NAME", "b999997b-cb91-49e0-b922-c9188372bdba+testing-rg-EastUS2webspace-Linux")
     monkeypatch.setenv("WEBSITE_SITE_NAME", "test-func-linux")