azurebackup: emit AzSubscriptionGuid telemetry tag from each tool

servers/Azure.Mcp.Server/changelog-entries/1779814991354.yaml

@@ -0,0 +1,3 @@
+changes:
+  - section: "Other Changes"
+    description: "AzureBackup: emit AzSubscriptionGuid telemetry tag from each tool so per-subscription telemetry works in namespace server mode."

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Backup/BackupStatusCommand.cs

@@ -60,6 +60,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, "status-check");
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/DisasterRecovery/DisasterRecoveryEnableCrrCommand.cs

@@ -38,6 +38,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Governance/GovernanceFindUnprotectedCommand.cs

@@ -59,6 +59,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, "scan");
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Governance/GovernanceImmutabilityCommand.cs

@@ -69,6 +69,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Governance/GovernanceSoftDeleteCommand.cs

@@ -82,6 +82,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Job/JobGetCommand.cs

@@ -60,6 +60,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, string.IsNullOrEmpty(options.Job) ? "list" : "single");
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Policy/PolicyCreateCommand.cs

@@ -147,6 +147,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultAndWorkloadTags(context.Activity, options.VaultType, options.WorkloadType);
 
         var validation = Services.Policy.PolicyCreateValidator.Validate(options);

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Policy/PolicyGetCommand.cs

@@ -60,6 +60,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, string.IsNullOrEmpty(options.Policy) ? "list" : "single");
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Policy/PolicyUpdateCommand.cs

@@ -56,6 +56,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/ProtectableItem/ProtectableItemListCommand.cs

@@ -58,6 +58,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultAndWorkloadTags(context.Activity, options.VaultType ?? "rsv", options.WorkloadType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/ProtectedItem/ProtectedItemGetCommand.cs

@@ -63,6 +63,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, string.IsNullOrEmpty(options.ProtectedItem) ? "list" : "single");
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/ProtectedItem/ProtectedItemProtectCommand.cs

@@ -77,6 +77,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         context.Activity?.AddTag(AzureBackupTelemetryTags.DatasourceType, AzureBackupTelemetryTags.NormalizeWorkloadType(options.DatasourceType));
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/ProtectedItem/ProtectedItemUndeleteCommand.cs

@@ -61,6 +61,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/RecoveryPoint/RecoveryPointGetCommand.cs

@@ -60,6 +60,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, string.IsNullOrEmpty(options.RecoveryPoint) ? "list" : "single");
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Security/SecurityConfigureEncryptionCommand.cs

@@ -112,6 +112,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         _lastVaultType = options.VaultType;
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Security/SecurityConfigureMuaCommand.cs

@@ -69,6 +69,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Vault/VaultCreateCommand.cs

@@ -95,6 +95,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Vault/VaultGetCommand.cs

@@ -85,6 +85,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
         context.Activity?.AddTag(AzureBackupTelemetryTags.OperationScope, string.IsNullOrEmpty(options.Vault) ? "list" : "single");
 

tools/Azure.Mcp.Tools.AzureBackup/src/Commands/Vault/VaultUpdateCommand.cs

@@ -103,6 +103,7 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
         var options = BindOptions(parseResult);
 
+        AzureBackupTelemetryTags.AddSubscriptionTag(context.Activity, options.Subscription);
         AzureBackupTelemetryTags.AddVaultTags(context.Activity, options.VaultType);
 
         try

tools/Azure.Mcp.Tools.AzureBackup/src/Models/AzureBackupTelemetryTags.cs

@@ -14,6 +14,27 @@ public static class AzureBackupTelemetryTags
     public static readonly string DatasourceType = AddPrefix("DatasourceType");
     public static readonly string OperationScope = AddPrefix("OperationScope");
 
+    // Unprefixed tag name shared with Microsoft.Mcp.Core's AzureTagName.SubscriptionGuid.
+    // Duplicated here as a string literal because AzureTagName is internal to that assembly.
+    // Emitted directly from each AzureBackup tool to ensure per-subscription telemetry is
+    // captured even in namespace server mode, where the central McpRuntime tag emission
+    // does not see the nested `subscription` parameter.
+    public const string SubscriptionGuid = "AzSubscriptionGuid";
+
+    /// <summary>
+    /// Adds the AzSubscriptionGuid tag to the activity. Matches McpRuntime.CallToolHandler
+    /// behavior by emitting any non-null subscription value (including empty string).
+    /// </summary>
+    public static void AddSubscriptionTag(Activity? activity, string? subscription)
+    {
+        if (activity is null || subscription is null)
+        {
+            return;
+        }
+
+        activity.SetTag(SubscriptionGuid, subscription);
+    }
+
     /// <summary>
     /// Normalizes the vault type to canonical lowercase values (rsv/dpp).
     /// Returns "auto" when the input is null or empty (user didn't specify --vault-type).

tools/Azure.Mcp.Tools.AzureBackup/tests/Azure.Mcp.Tools.AzureBackup.Tests/Models/AzureBackupTelemetryTagsTests.cs

@@ -107,4 +107,58 @@ public void TagConstants_HaveCorrectPrefix()
         Assert.Equal("azurebackup/DatasourceType", AzureBackupTelemetryTags.DatasourceType);
         Assert.Equal("azurebackup/OperationScope", AzureBackupTelemetryTags.OperationScope);
     }
+
+    [Fact]
+    public void SubscriptionGuid_MatchesGlobalAzureTagName()
+    {
+        // Must stay in sync with Microsoft.Mcp.Core's internal AzureTagName.SubscriptionGuid.
+        Assert.Equal("AzSubscriptionGuid", AzureBackupTelemetryTags.SubscriptionGuid);
+    }
+
+    [Fact]
+    public void AddSubscriptionTag_NullActivity_DoesNotThrow()
+    {
+        AzureBackupTelemetryTags.AddSubscriptionTag(null, "00000000-0000-0000-0000-000000000000");
+    }
+
+    [Fact]
+    public void AddSubscriptionTag_NullSubscription_DoesNotEmitTag()
+    {
+        using var listener = new ActivityListener
+        {
+            ShouldListenTo = _ => true,
+            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
+        };
+        ActivitySource.AddActivityListener(listener);
+
+        using var source = new ActivitySource("test");
+        using var activity = source.StartActivity("test-op");
+        Assert.NotNull(activity);
+
+        AzureBackupTelemetryTags.AddSubscriptionTag(activity, null);
+
+        Assert.Null(activity.GetTagItem(AzureBackupTelemetryTags.SubscriptionGuid));
+    }
+
+    [Theory]
+    [InlineData("00000000-0000-0000-0000-000000000000")]
+    [InlineData("my-subscription-name")]
+    [InlineData("")]
+    public void AddSubscriptionTag_NonNullValue_EmitsTag(string subscription)
+    {
+        using var listener = new ActivityListener
+        {
+            ShouldListenTo = _ => true,
+            Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
+        };
+        ActivitySource.AddActivityListener(listener);
+
+        using var source = new ActivitySource("test");
+        using var activity = source.StartActivity("test-op");
+        Assert.NotNull(activity);
+
+        AzureBackupTelemetryTags.AddSubscriptionTag(activity, subscription);
+
+        Assert.Equal(subscription, activity.GetTagItem(AzureBackupTelemetryTags.SubscriptionGuid));
+    }
 }