More reviewer suggested edits

Author: lrafeei

newrelic/api/transaction.py

@@ -566,8 +566,6 @@ def __exit__(self, exc, value, tb):
             for ml_model, version in self._ml_models:
                 self.record_custom_metric(f"Supportability/Python/ML/{ml_model}/{version}", 1)
 
-        if os.environ.get("FUNCTIONS_WORKER_RUNTIME", None):
-            self.record_custom_metric("Supportability/Python/AzureFunctionMode/Enabled", 1)
 
         if self._settings.distributed_tracing.enabled:
             # Sampled and priority need to be computed at the end of the

newrelic/core/application.py

@@ -597,6 +597,11 @@ def connect_to_data_collector(self, activate_agent):
             if self._agent_control.health_check_enabled:
                 internal_metric("Supportability/AgentControl/Health/enabled", 1)
 
+            # Azure Function mode metric
+            # Note: This environment variable will be set by the Azure Functions runtime
+            if os.environ.get("FUNCTIONS_WORKER_RUNTIME", None):
+                internal_metric("Supportability/Python/AzureFunctionMode/enabled", 1)
+
         self._stats_engine.merge_custom_metrics(internal_metrics.metrics())
 
         # Update the active session in this object. This will the

newrelic/core/config.py

@@ -904,7 +904,6 @@ def default_otlp_host(host):
     "NEW_RELIC_INSTRUMENTATION_KOMBU_CONSUMER_ENABLED", default=False
 )
 
-
 _settings.event_harvest_config.harvest_limits.analytic_event_data = _environ_as_int(
     "NEW_RELIC_ANALYTICS_EVENTS_MAX_SAMPLES_STORED", DEFAULT_RESERVOIR_SIZE
 )

tests/agent_unittests/test_agent_protocol.py

@@ -78,7 +78,7 @@ def clear_sent_values():
 
 @pytest.fixture(autouse=True)
 def override_utilization(monkeypatch):
-    global AWS, AZURE, ECS, GCP, PCF, BOOT_ID, DOCKER, KUBERNETES, AZUREFUNCTION
+    global AWS, AZURE, ECS, GCP, PCF, DOCKER, KUBERNETES, AZUREFUNCTION
     AWS = {"id": "foo", "type": "bar", "zone": "baz"}
     AZURE = {"location": "foo", "name": "bar", "vmId": "baz", "vmSize": "boo"}
     ECS = {"ecsDockerId": "foobar"}