-
Notifications
You must be signed in to change notification settings - Fork 505
azurebackup: Fix 5 telemetry-triaged bugs + telemetry tag emission + unit tests #2621
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
shrja-ms
merged 3 commits into
microsoft:main
from
shrja-ms:user/azurebackup-telemetry-bugfixes-v2
May 13, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
...ackup/tests/Azure.Mcp.Tools.AzureBackup.UnitTests/Models/AzureBackupTelemetryTagsTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT License. | ||
|
|
||
| using System.Diagnostics; | ||
| using Azure.Mcp.Tools.AzureBackup.Models; | ||
| using Xunit; | ||
|
|
||
| namespace Azure.Mcp.Tools.AzureBackup.UnitTests.Models; | ||
|
|
||
| public class AzureBackupTelemetryTagsTests | ||
| { | ||
| [Theory] | ||
| [InlineData(null, "auto")] | ||
| [InlineData("", "auto")] | ||
| [InlineData(" ", "auto")] | ||
| [InlineData("RSV", "rsv")] | ||
| [InlineData("DPP", "dpp")] | ||
| [InlineData("Rsv", "rsv")] | ||
| public void NormalizeVaultType_ReturnsExpectedValue(string? input, string expected) | ||
| { | ||
| Assert.Equal(expected, AzureBackupTelemetryTags.NormalizeVaultType(input)); | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData(null, "unspecified")] | ||
| [InlineData("", "unspecified")] | ||
| [InlineData(" ", "unspecified")] | ||
| [InlineData("VM", "vm")] | ||
| [InlineData("SqlDatabase", "sqldatabase")] | ||
| [InlineData("AzureFileShare", "azurefileshare")] | ||
| public void NormalizeWorkloadType_ReturnsExpectedValue(string? input, string expected) | ||
| { | ||
| Assert.Equal(expected, AzureBackupTelemetryTags.NormalizeWorkloadType(input)); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void AddVaultTags_NullActivity_DoesNotThrow() | ||
| { | ||
| AzureBackupTelemetryTags.AddVaultTags(null, "rsv"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void AddVaultTags_NullVaultType_SetsAutoTag() | ||
| { | ||
| 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.AddVaultTags(activity, null); | ||
|
|
||
| var tag = activity.GetTagItem(AzureBackupTelemetryTags.VaultType); | ||
| Assert.Equal("auto", tag); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void AddVaultTags_WithVaultType_SetsNormalizedTag() | ||
| { | ||
| 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.AddVaultTags(activity, "RSV"); | ||
|
|
||
| var tag = activity.GetTagItem(AzureBackupTelemetryTags.VaultType); | ||
| Assert.Equal("rsv", tag); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void AddVaultAndWorkloadTags_SetsAllTags() | ||
| { | ||
| 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.AddVaultAndWorkloadTags(activity, null, null); | ||
|
|
||
| Assert.Equal("auto", activity.GetTagItem(AzureBackupTelemetryTags.VaultType)); | ||
| Assert.Equal("unspecified", activity.GetTagItem(AzureBackupTelemetryTags.WorkloadType)); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TagConstants_HaveCorrectPrefix() | ||
| { | ||
| Assert.Equal("azurebackup/VaultType", AzureBackupTelemetryTags.VaultType); | ||
| Assert.Equal("azurebackup/WorkloadType", AzureBackupTelemetryTags.WorkloadType); | ||
| Assert.Equal("azurebackup/DatasourceType", AzureBackupTelemetryTags.DatasourceType); | ||
| Assert.Equal("azurebackup/OperationScope", AzureBackupTelemetryTags.OperationScope); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.