fix: Add Azure Function app name prefix to faas.name attribute in A…

…zure Function transactions. (#2973)

src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs

@@ -271,11 +271,11 @@ private IEnumerable<string> GetApplicationNames()
                 return appName.Split(StringSeparators.Comma);
             }
 
-            if (AzureFunctionModeDetected && AzureFunctionModeEnabled && !string.IsNullOrEmpty(AzureFunctionServiceName))
+            if (AzureFunctionModeDetected && AzureFunctionModeEnabled && !string.IsNullOrEmpty(AzureFunctionAppName))
             {
                 Log.Info("Application name from Azure Function site name.");
                 _applicationNamesSource = "Azure Function";
-                return new List<string> { AzureFunctionServiceName };
+                return new List<string> { AzureFunctionAppName };
             }
 
             appName = _environment.GetEnvironmentVariable("RoleName");
@@ -2185,7 +2185,7 @@ public string AzureFunctionResourceId
                     return string.Empty;
                 }
 
-                return $"/subscriptions/{subscriptionId}/resourceGroups/{websiteResourceGroup}/providers/Microsoft.Web/sites/{(string.IsNullOrEmpty(AzureFunctionServiceName) ? "unknown" : AzureFunctionServiceName)}";
+                return $"/subscriptions/{subscriptionId}/resourceGroups/{websiteResourceGroup}/providers/Microsoft.Web/sites/{(string.IsNullOrEmpty(AzureFunctionAppName) ? "unknown" : AzureFunctionAppName)}";
             }
         }
 
@@ -2245,7 +2245,7 @@ public string AzureFunctionSubscriptionId
             }
         }
 
-        public string AzureFunctionServiceName => _environment.GetEnvironmentVariable("WEBSITE_SITE_NAME");
+        public string AzureFunctionAppName => _environment.GetEnvironmentVariable("WEBSITE_SITE_NAME");
         #endregion
 
         #endregion

src/Agent/NewRelic/Agent/Core/Configuration/ReportedConfiguration.cs

@@ -713,7 +713,7 @@ public ReportedConfiguration(IConfiguration configuration)
         public string AzureFunctionSubscriptionId => _configuration.AzureFunctionSubscriptionId;
 
         [JsonIgnore]
-        public string AzureFunctionServiceName => _configuration.AzureFunctionServiceName;
+        public string AzureFunctionAppName => _configuration.AzureFunctionAppName;
 
         public string AzureFunctionResourceIdWithFunctionName(string functionName) => _configuration.AzureFunctionResourceIdWithFunctionName(functionName);
 

src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Configuration/IConfiguration.cs

@@ -229,7 +229,7 @@ public interface IConfiguration
         string AzureFunctionResourceGroupName { get; }
         string AzureFunctionRegion { get; }
         string AzureFunctionSubscriptionId { get; }
-        string AzureFunctionServiceName { get; }
+        string AzureFunctionAppName { get; }
         string AzureFunctionResourceIdWithFunctionName(string functionName);
 
         bool UtilizationDetectAzureFunction { get; }

src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AzureFunction/InvokeFunctionAsyncWrapper.cs

@@ -76,7 +76,7 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
         }
 
         transaction.AddFaasAttribute("cloud.resource_id", agent.Configuration.AzureFunctionResourceIdWithFunctionName(functionDetails.FunctionName));
-        transaction.AddFaasAttribute("faas.name", functionDetails.FunctionName);
+        transaction.AddFaasAttribute("faas.name", $"{agent.Configuration.AzureFunctionAppName}/{functionDetails.FunctionName}");
         transaction.AddFaasAttribute("faas.trigger", functionDetails.Trigger);
         transaction.AddFaasAttribute("faas.invocation_id", functionDetails.InvocationId);
 

tests/Agent/IntegrationTests/IntegrationTests/AzureFunction/AzureFunctionHttpTriggerTests.cs

@@ -149,7 +149,7 @@ public void Test_SimpleInvocationMode()
             Assert.True(firstTransaction.IntrinsicAttributes.TryGetValue("cloud.resource_id", out var cloudResourceIdValue));
             Assert.Equal("/subscriptions/subscription_id/resourceGroups/my_resource_group/providers/Microsoft.Web/sites/IntegrationTestAppName/functions/HttpTriggerFunctionUsingSimpleInvocation", cloudResourceIdValue);
             Assert.True(firstTransaction.IntrinsicAttributes.TryGetValue("faas.name", out var faasNameValue));
-            Assert.Equal("HttpTriggerFunctionUsingSimpleInvocation", faasNameValue);
+            Assert.Equal("IntegrationTestAppName/HttpTriggerFunctionUsingSimpleInvocation", faasNameValue);
             Assert.True(firstTransaction.IntrinsicAttributes.TryGetValue("faas.trigger", out var faasTriggerValue));
             Assert.Equal("http", faasTriggerValue);
 
@@ -284,7 +284,7 @@ public void Test_PipelineMode()
             Assert.True(firstTransaction.IntrinsicAttributes.TryGetValue("cloud.resource_id", out var cloudResourceIdValue));
             Assert.Equal("/subscriptions/subscription_id/resourceGroups/my_resource_group/providers/Microsoft.Web/sites/IntegrationTestAppName/functions/HttpTriggerFunctionUsingAspNetCorePipeline", cloudResourceIdValue);
             Assert.True(firstTransaction.IntrinsicAttributes.TryGetValue("faas.name", out var faasNameValue));
-            Assert.Equal("HttpTriggerFunctionUsingAspNetCorePipeline", faasNameValue);
+            Assert.Equal("IntegrationTestAppName/HttpTriggerFunctionUsingAspNetCorePipeline", faasNameValue);
             Assert.True(firstTransaction.IntrinsicAttributes.TryGetValue("faas.trigger", out var faasTriggerValue));
             Assert.Equal("http", faasTriggerValue);
 

tests/Agent/IntegrationTests/IntegrationTests/AzureFunction/AzureFunctionQueueTriggerTests.cs

@@ -58,7 +58,7 @@ public void Test()
         {
             { "faas.coldStart", true},
             //new("faas.invocation_id", "test_invocation_id"), This one is a random guid, not something we can specifically look for
-            { "faas.name", "QueueTriggerFunction" },
+            { "faas.name", "IntegrationTestAppName/QueueTriggerFunction" },
             { "faas.trigger", "datasource" },
             { "cloud.resource_id", "/subscriptions/subscription_id/resourceGroups/my_resource_group/providers/Microsoft.Web/sites/IntegrationTestAppName/functions/QueueTriggerFunction" }
         };
@@ -92,7 +92,7 @@ public void Test()
             Assert.True(transaction.IntrinsicAttributes.TryGetValue("cloud.resource_id", out var cloudResourceIdValue));
             Assert.Equal("/subscriptions/subscription_id/resourceGroups/my_resource_group/providers/Microsoft.Web/sites/IntegrationTestAppName/functions/QueueTriggerFunction", cloudResourceIdValue);
             Assert.True(transaction.IntrinsicAttributes.TryGetValue("faas.name", out var faasNameValue));
-            Assert.Equal("QueueTriggerFunction", faasNameValue);
+            Assert.Equal("IntegrationTestAppName/QueueTriggerFunction", faasNameValue);
             Assert.True(transaction.IntrinsicAttributes.TryGetValue("faas.trigger", out var faasTriggerValue));
             Assert.Equal("datasource", faasTriggerValue);
         }

tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs

@@ -4436,7 +4436,7 @@ public void AzureFunctionServiceName_ShouldReturnServiceName_WhenEnvironmentVari
             Mock.Arrange(() => _environment.GetEnvironmentVariable("WEBSITE_SITE_NAME")).Returns("some-service-name");
 
             // Act
-            var result = _defaultConfig.AzureFunctionServiceName;
+            var result = _defaultConfig.AzureFunctionAppName;
 
             // Assert
             Assert.That(result, Is.EqualTo("some-service-name"));

tests/Agent/UnitTests/Core.UnitTest/DataTransport/ExhaustiveTestConfiguration.cs

@@ -492,7 +492,7 @@ public IReadOnlyDictionary<string, string> GetAppSettings()
         public string AzureFunctionResourceGroupName => "AzureFunctionResourceGroupName";
         public string AzureFunctionRegion => "AzureFunctionRegion";
         public string AzureFunctionSubscriptionId => "AzureFunctionSubscriptionId";
-        public string AzureFunctionServiceName => "AzureFunctionServiceName";
+        public string AzureFunctionAppName => "AzureFunctionServiceName";
         public string AzureFunctionResourceIdWithFunctionName(string functionName) => $"AzureFunctionResourceId/{functionName}";
 
         public string LoggingLevel => "info";