Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3abc109
Add Entra auth to Durable tracing
YunchuWang Aug 6, 2026
c4fd90a
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 6, 2026
5405752
Fix Entra credential reuse in Functions host
YunchuWang Aug 6, 2026
5fa4182
Harden host credential reuse validation
YunchuWang Aug 6, 2026
8b1b987
Test Durable credential selection branches
YunchuWang Aug 6, 2026
cddec93
Warn when host telemetry credential cannot be read
YunchuWang Aug 10, 2026
3d58aa6
Address review: upgrade logging package and cover the DI credential path
YunchuWang Aug 13, 2026
b170f32
Align remaining System.Drawing.Common pins with 6.0.0
YunchuWang Aug 13, 2026
47c0f5f
Raise WorkerExtensions System.Drawing.Common pin to 6.0.0
YunchuWang Aug 13, 2026
7a43548
Reuse the host telemetry channel instead of reading its credential
YunchuWang Aug 13, 2026
e5d5bc3
Fix telemetry shutdown flush lifecycle
YunchuWang Aug 13, 2026
77ff790
Update src/WebJobs.Extensions.DurableTask/Correlation/TelemetryActiva…
YunchuWang Aug 17, 2026
7de20d9
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 17, 2026
fffc980
Clarify invalid authentication warning
YunchuWang Aug 17, 2026
bcbad7a
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 18, 2026
c046003
Consolidate tracing warning logging
YunchuWang Aug 18, 2026
579419d
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 18, 2026
30718c0
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 19, 2026
1a11607
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 20, 2026
2c27ccb
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 21, 2026
516cff3
Merge branch 'dev' into yunchuwang-fix-3497-entra-tracing
YunchuWang Aug 21, 2026
fa8fc03
Align WorkerExtensions pin comments with the 6.0.0 override
YunchuWang Aug 25, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<PackageVersion Include="Microsoft.Azure.WebJobs" Version="3.0.45" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.DurableTask.Analyzers" Version="0.5.0" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Rpc" Version="3.0.39" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.41" />
Comment thread
YunchuWang marked this conversation as resolved.
Resolved
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.2" />
<PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.5" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ You will also need to specify an Application Insights resource in the environmen

Next, you'll need to copy the connection string or instrumentation key for that resource to add in the environment variables. We recommend adding the `APPLICATIONINSIGHTS_CONNECTION_STRING` environment variable, but you can also add `APPINSIGHTS_INSTRUMENTATIONKEY`. If you are running your app locally, then add this environment variable in `local.settings.json`. If you are running the app in Azure, then add it under `Configuration` as an application setting.

If the Application Insights resource has local authentication disabled, also configure `APPLICATIONINSIGHTS_AUTHENTICATION_STRING`. Use `Authorization=AAD` for the function app's system-assigned managed identity, or `Authorization=AAD;ClientId=<USER_ASSIGNED_CLIENT_ID>` for a user-assigned managed identity. The selected identity needs the `Monitoring Metrics Publisher` role on the Application Insights resource. Microsoft Entra authentication for Application Insights isn't supported by the Functions host during local development.

#### Run the sample
The sample shows how Distributed Tracing V2 improves the observability of some flagship Durable Functions patterns.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System;
using System.Security.Authentication;
using System.Threading.Tasks;
using Azure.Identity;
using DurableTask.ApplicationInsights;
using DurableTask.Core;
using DurableTask.Core.Settings;
using Microsoft.ApplicationInsights;
using Microsoft.ApplicationInsights.Channel;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.Azure.WebJobs.Logging.ApplicationInsights;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using ApplicationInsightsTokenCredentialOptions = Microsoft.Azure.WebJobs.Logging.ApplicationInsights.TokenCredentialOptions;

namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.Correlation
{
Expand Down Expand Up @@ -190,6 +194,7 @@ private TelemetryConfiguration SetupTelemetryConfiguration()

string resolvedInstrumentationKey = this.nameResolver.Resolve("APPINSIGHTS_INSTRUMENTATIONKEY");
string resolvedConnectionString = this.nameResolver.Resolve("APPLICATIONINSIGHTS_CONNECTION_STRING");
string resolvedAuthenticationString = this.nameResolver.Resolve("APPLICATIONINSIGHTS_AUTHENTICATION_STRING");

bool instrumentationKeyProvided = !string.IsNullOrEmpty(resolvedInstrumentationKey);
bool connectionStringProvided = !string.IsNullOrEmpty(resolvedConnectionString);
Expand Down Expand Up @@ -238,7 +243,51 @@ private TelemetryConfiguration SetupTelemetryConfiguration()
config.ConnectionString = resolvedConnectionString;
}

if (!string.IsNullOrWhiteSpace(resolvedAuthenticationString))
{
try
{
ApplicationInsightsTokenCredentialOptions tokenCredentialOptions =
ApplicationInsightsTokenCredentialOptions.ParseAuthenticationString(resolvedAuthenticationString);
bool userAssignedIdentity = tokenCredentialOptions.ClientId != null;
ManagedIdentityId managedIdentityId = userAssignedIdentity
? ManagedIdentityId.FromUserAssignedClientId(tokenCredentialOptions.ClientId)
: ManagedIdentityId.SystemAssigned;

config.SetAzureTokenCredential(new ManagedIdentityCredential(managedIdentityId));
this.endToEndTraceHelper.ExtensionInformationalEvent(
hubName: this.options.HubName,
functionName: string.Empty,
instanceId: string.Empty,
message:
"Microsoft Entra authentication enabled for Durable distributed tracing using the "
+ $"{(userAssignedIdentity ? "user-assigned" : "system-assigned")} managed identity.",
writeToUserLogs: true);
}
catch (AuthenticationException)
{
this.LogInvalidAuthenticationString();
}
catch (FormatException)
{
this.LogInvalidAuthenticationString();
}
catch (ArgumentException)
{
this.LogInvalidAuthenticationString();
}
}

return config;
}

private void LogInvalidAuthenticationString()
Comment thread
YunchuWang marked this conversation as resolved.
Resolved
{
this.endToEndTraceHelper.ExtensionWarningEvent(
hubName: this.options.HubName,
functionName: string.Empty,
instanceId: string.Empty,
message: "APPLICATIONINSIGHTS_AUTHENTICATION_STRING is invalid and will not be used for Durable distributed tracing.");
Comment thread
YunchuWang marked this conversation as resolved.
Resolved
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Microsoft.Azure.WebJobs" />
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Rpc" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" />
<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage" />
Expand Down
1 change: 0 additions & 1 deletion test/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="FluentAssertions" Version="4.19.4" />
<PackageVersion Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.41" />
<PackageVersion Include="Microsoft.Build" Version="17.8.43" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.43" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
Expand Down
136 changes: 134 additions & 2 deletions test/FunctionsV2/Tests/E2E/CorrelationEndToEndTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,130 @@ public async Task DistributedTracingV2_DefaultOperationNames_ArePopulated()
telemetry => Assert.Equal(telemetry.Name, telemetry.Context.Operation.Name));
}

[Theory]
[Trait("Category", PlatformSpecificHelpers.TestCategory)]
[InlineData("Authorization=AAD", "system-assigned")]
[InlineData("Authorization=AAD;ClientId=00000000-0000-0000-0000-000000000001", "user-assigned")]
[InlineData(" authoRization=AAD ;; ClIentId = 00000000-0000-0000-0000-000000000001 ", "user-assigned")]
public void TelemetryActivator_ValidAuthenticationString_EnablesEntraAuthentication(
string authenticationString,
string expectedIdentityType)
{
TraceOptions traceOptions = new TraceOptions()
{
DistributedTracingEnabled = true,
Version = DurableDistributedTracingVersion.V2,
};
DurableTaskOptions options = new DurableTaskOptions
{
Tracing = traceOptions,
};
var mockNameResolver = GetNameResolverMock(
new[]
{
("APPLICATIONINSIGHTS_CONNECTION_STRING", "InstrumentationKey=00000000-0000-0000-0000-000000000000"),
("APPLICATIONINSIGHTS_AUTHENTICATION_STRING", authenticationString),
});

using (var host = TestHelpers.GetJobHost(
this.loggerProvider,
nameof(this.TelemetryActivator_ValidAuthenticationString_EnablesEntraAuthentication),
enableExtendedSessions: false,
nameResolver: mockNameResolver.Object,
options: options))
{
string expectedMessage =
$"Microsoft Entra authentication enabled for Durable distributed tracing using the {expectedIdentityType} managed identity.";
Assert.Contains(
this.loggerProvider.GetAllLogMessages(),
log => log.FormattedMessage?.StartsWith(expectedMessage, StringComparison.Ordinal) == true);
}
}

[Theory]
[Trait("Category", PlatformSpecificHelpers.TestCategory)]
[InlineData("Authorization=AAD1")]
[InlineData("Auth123=AAD")]
[InlineData("Authorization=AAD;ClientId=123")]
public void TelemetryActivator_InvalidAuthenticationString_LogsWarning(string authenticationString)
{
TraceOptions traceOptions = new TraceOptions()
{
DistributedTracingEnabled = true,
Version = DurableDistributedTracingVersion.V2,
};
DurableTaskOptions options = new DurableTaskOptions
{
Tracing = traceOptions,
};
var mockNameResolver = GetNameResolverMock(
new[]
{
("APPLICATIONINSIGHTS_CONNECTION_STRING", "InstrumentationKey=00000000-0000-0000-0000-000000000000"),
("APPLICATIONINSIGHTS_AUTHENTICATION_STRING", authenticationString),
});

using (var host = TestHelpers.GetJobHost(
this.loggerProvider,
nameof(this.TelemetryActivator_InvalidAuthenticationString_LogsWarning),
enableExtendedSessions: false,
nameResolver: mockNameResolver.Object,
options: options))
{
const string expectedMessage =
"APPLICATIONINSIGHTS_AUTHENTICATION_STRING is invalid and will not be used for Durable distributed tracing.";
Assert.Contains(
this.loggerProvider.GetAllLogMessages(),
log => log.FormattedMessage?.StartsWith(expectedMessage, StringComparison.Ordinal) == true);
}
}

[Fact]
[Trait("Category", PlatformSpecificHelpers.TestCategory)]
public async Task DistributedTracingV2_EntraAuthentication_PreservesModuleSpans()
{
string[] orchestrationFunctionNames =
{
nameof(TestOrchestrations.SayHelloWithActivity),
};

var result = await this.ExecuteOrchestrationWithExceptionAsync(
orchestrationFunctionNames,
"DistributedTracingV2EntraAuthentication",
"world",
extendedSessions: false,
protocol: "W3CTraceContext",
version: DurableDistributedTracingVersion.V2,
authenticationString: "Authorization=AAD");
Comment thread
YunchuWang marked this conversation as resolved.
Resolved

const string expectedMessage =
"Microsoft Entra authentication enabled for Durable distributed tracing using the system-assigned managed identity.";
Assert.Contains(
this.loggerProvider.GetAllLogMessages(),
log => log.FormattedMessage?.StartsWith(expectedMessage, StringComparison.Ordinal) == true);

List<OperationTelemetry> telemetry = result.Item1;
DependencyTelemetry createOrchestration = Assert.Single(
telemetry.OfType<DependencyTelemetry>(),
item => item.Name.StartsWith($"{TraceActivityConstants.CreateOrchestration}:", StringComparison.Ordinal));
RequestTelemetry orchestration = Assert.Single(
telemetry.OfType<RequestTelemetry>(),
item => item.Name.StartsWith($"{TraceActivityConstants.Orchestration}:", StringComparison.Ordinal));
DependencyTelemetry scheduleActivity = Assert.Single(
telemetry.OfType<DependencyTelemetry>(),
item => item.Name.StartsWith($"{TraceActivityConstants.Activity}:", StringComparison.Ordinal));
RequestTelemetry activity = Assert.Single(
telemetry.OfType<RequestTelemetry>(),
item => item.Name.StartsWith($"{TraceActivityConstants.Activity}:", StringComparison.Ordinal));

Assert.Equal(createOrchestration.Id, orchestration.Context.Operation.ParentId);
Assert.Equal(orchestration.Id, scheduleActivity.Context.Operation.ParentId);
Assert.Equal(scheduleActivity.Id, activity.Context.Operation.ParentId);
Assert.All(
new OperationTelemetry[] { createOrchestration, orchestration, scheduleActivity, activity },
item => Assert.Equal(orchestration.Context.Operation.Id, item.Context.Operation.Id));
}

[Theory]
[Trait("Category", PlatformSpecificHelpers.TestCategory)]
[InlineData(false, "W3CTraceContext")]
Expand Down Expand Up @@ -208,7 +332,8 @@ internal async Task<Tuple<List<OperationTelemetry>, List<ExceptionTelemetry>>>
object input,
bool extendedSessions,
string protocol,
DurableDistributedTracingVersion version = DurableDistributedTracingVersion.V1)
DurableDistributedTracingVersion version = DurableDistributedTracingVersion.V1,
string authenticationString = null)
{
ConcurrentQueue<ITelemetry> sendItems = new ConcurrentQueue<ITelemetry>();
TraceOptions traceOptions = new TraceOptions()
Expand All @@ -224,7 +349,13 @@ internal async Task<Tuple<List<OperationTelemetry>, List<ExceptionTelemetry>>>

string siteNameEnvironmentVarName = "WEBSITE_SITE_NAME";
string siteNameEnvironmentVarValue = TestSiteName;
var mockNameResolver = GetNameResolverMock(new[] { (siteNameEnvironmentVarName, siteNameEnvironmentVarValue) });
var mockNameResolver = GetNameResolverMock(
new[]
{
(siteNameEnvironmentVarName, siteNameEnvironmentVarValue),
("APPLICATIONINSIGHTS_CONNECTION_STRING", "InstrumentationKey=00000000-0000-0000-0000-000000000000"),
("APPLICATIONINSIGHTS_AUTHENTICATION_STRING", authenticationString),
});

using (var host = TestHelpers.GetJobHost(
this.loggerProvider,
Expand Down Expand Up @@ -413,6 +544,7 @@ private IEnumerable<OperationTelemetry> FilterOperationTelemetry(IEnumerable<Ope
p.Name.Contains(TraceConstants.Orchestrator) ||
p.Name.Contains(TraceConstants.Client) ||
p.Name.Contains("Operation") ||
p.Name.StartsWith($"{TraceActivityConstants.CreateOrchestration}:", StringComparison.Ordinal) ||
p.Name.StartsWith($"{TraceActivityConstants.Orchestration}:", StringComparison.Ordinal) ||
p.Name.StartsWith($"{TraceActivityConstants.Activity}:", StringComparison.Ordinal));
}
Expand Down
Loading