From bde44c9899a21f90e12f4503bfb00142d55b48fe Mon Sep 17 00:00:00 2001 From: rfavreau Date: Mon, 1 Apr 2024 17:27:23 +0200 Subject: [PATCH] Update Azure Function context --- .../Elastic.Apm.Azure.Functions/AzureFunctionsContext.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/azure/Elastic.Apm.Azure.Functions/AzureFunctionsContext.cs b/src/azure/Elastic.Apm.Azure.Functions/AzureFunctionsContext.cs index 2ed9629f0..7fa71a424 100644 --- a/src/azure/Elastic.Apm.Azure.Functions/AzureFunctionsContext.cs +++ b/src/azure/Elastic.Apm.Azure.Functions/AzureFunctionsContext.cs @@ -18,7 +18,7 @@ internal AzureFunctionsContext(string loggerScopeName) { Logger = Agent.Instance.Logger.Scoped(loggerScopeName); MetaData = AzureFunctionsMetadataProvider.GetAzureFunctionsMetaData(Logger); - UpdateServiceInformation(Agent.Instance.Service); + UpdateServiceInformation(Agent.Instance.Service, Agent.Instance.Configuration.OverwriteDiscoverDefaultServiceName); FaasIdPrefix = $"/subscriptions/{MetaData.SubscriptionId}/resourceGroups/{MetaData.WebsiteResourceGroup}/providers/Microsoft.Web/sites/{MetaData.WebsiteSiteName}/functions/"; Logger.Trace()?.Log("FaasIdPrefix: {FaasIdPrefix}", FaasIdPrefix); @@ -32,7 +32,7 @@ internal AzureFunctionsContext(string loggerScopeName) internal static bool IsColdStart() => Interlocked.Exchange(ref ColdStart, 0) == 1; - private void UpdateServiceInformation(Service? service) + private void UpdateServiceInformation(Service? service, bool overwriteDiscoverDefaultServiceName) { if (service == null) { @@ -40,7 +40,7 @@ private void UpdateServiceInformation(Service? service) return; } - if (service.Name == AbstractConfigurationReader.AdaptServiceName(AbstractConfigurationReader.DiscoverDefaultServiceName())) + if (overwriteDiscoverDefaultServiceName && service.Name == AbstractConfigurationReader.AdaptServiceName(AbstractConfigurationReader.DiscoverDefaultServiceName())) { // Only override the service name if it was set to default. service.Name = MetaData.WebsiteSiteName;