Add DevDeviceId (#810)

* Add information providers to get device id and mac address

* Remove MacAddress from server configuration

* Add DeviceId tag name

* Remove unneeded Sha helper

* Changing StartActivity to ValueTask

* Fixing break from removing in Configuration

* Add tests for MachineInformationProviderBase

* Make GetStoragePath() public

* Implement IMachineInformationProvider interface

* Fix tests to use IMachineInformationProvider.

* Register Machine Information Provider based on runtime.

* TelemetryService uses interface.

* Add InternalsVisibleTo so internal interfaces can be mocked.

* Add UnixInformationProviderTests

* Start initialize task

* Replace mock with instantiated class.

* Add MIT header.

* Remove Directory existence check

* Use special folder instead of getting a set env var.

* Add DefaultMachineInformation.

* Use DefaultMachineInformation if os does not match existing ones.

Author: conniey

.vscode/cspell.json

@@ -92,6 +92,7 @@
                 "datname",
                 "descired",
                 "devcert",
+                "deviceid",
                 "doubleslash",
                 "dyld",
                 "eastus",
@@ -105,6 +106,8 @@
                 "globaltool",
                 "glsl",
                 "Groq",
+                "HKCU",
+                "HKEY_CURRENT_USER",
                 "hotmail",
                 "Intune",
                 "kcsb",

CHANGELOG.md

@@ -9,11 +9,11 @@ The Azure MCP Server updates automatically by default whenever a new release com
 - Added support for providing the `--content-type` and `--tags` properties to the `azmcp-appconfig-kv-set` command. [[#459](https://github.com/Azure/azure-mcp/pull/459)]
 - Added `filter-path` and `recursive` capabilities to `azmcp-storage-datalake-file-system-list-paths`. [[#770](https://github.com/Azure/azure-mcp/issues/770)]
 - Added support for listing files and directories in Azure File Shares via the `azmcp-storage-share-file-list` command. This command recursively lists all items in a specified file share directory with metadata including size, last modified date, and content type. [[#793](https://github.com/Azure/azure-mcp/pull/793)]
-
 - Added support for Azure Virtual Desktop with new commands:
   - `azmcp-virtualdesktop-hostpool-list` - List all host pools in a subscription
   - `azmcp-virtualdesktop-sessionhost-list` - List all session hosts in a host pool
   - `azmcp-virtualdesktop-sessionhost-usersession-list` - List all user sessions on a specific session host
+- Added support for creating and publishing DevDeviceId in telemetry. [[#810](https://github.com/Azure/azure-mcp/pull/810/)]
 
 ### Breaking Changes
 

core/src/AzureMcp.Core/Areas/Server/Commands/Runtime/McpRuntime.cs

@@ -55,7 +55,7 @@ public McpRuntime(
     /// <returns>A result containing the output of the tool invocation.</returns>
     public async ValueTask<CallToolResult> CallToolHandler(RequestContext<CallToolRequestParams> request, CancellationToken cancellationToken)
     {
-        using var activity = _telemetry.StartActivity(ActivityName.ToolExecuted, request?.Server?.ClientInfo);
+        using var activity = await _telemetry.StartActivity(ActivityName.ToolExecuted, request?.Server?.ClientInfo);
 
         if (request?.Params == null)
         {
@@ -84,7 +84,7 @@ public async ValueTask<CallToolResult> CallToolHandler(RequestContext<CallToolRe
     /// <returns>A result containing the list of available tools.</returns>
     public async ValueTask<ListToolsResult> ListToolsHandler(RequestContext<ListToolsRequestParams> request, CancellationToken cancellationToken)
     {
-        using var activity = _telemetry.StartActivity(nameof(ListToolsHandler), request?.Server?.ClientInfo);
+        using var activity = await _telemetry.StartActivity(nameof(ListToolsHandler), request?.Server?.ClientInfo);
         return await _toolLoader.ListToolsHandler(request!, cancellationToken);
     }
 

core/src/AzureMcp.Core/Areas/Server/Commands/ToolLoading/CommandFactoryToolLoader.cs

@@ -65,7 +65,7 @@ public ValueTask<ListToolsResult> ListToolsHandler(RequestContext<ListToolsReque
     /// <returns>The result of the tool call operation.</returns>
     public async ValueTask<CallToolResult> CallToolHandler(RequestContext<CallToolRequestParams> request, CancellationToken cancellationToken)
     {
-        using var activity = _telemetry.StartActivity(ActivityName.ToolExecuted, request.Server.ClientInfo);
+        using var activity = await _telemetry.StartActivity(ActivityName.ToolExecuted, request.Server.ClientInfo);
 
         if (request.Params == null)
         {

core/src/AzureMcp.Core/AssemblyInfo.cs

@@ -6,3 +6,4 @@
 [assembly: InternalsVisibleTo("AzureMcp.Core.UnitTests")]
 [assembly: InternalsVisibleTo("AzureMcp.Core.LiveTests")]
 [assembly: InternalsVisibleTo("AzureMcp.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

core/src/AzureMcp.Core/Commands/CommandFactory.cs

@@ -150,7 +150,7 @@ private void ConfigureCommandHandler(Command command, IBaseCommand implementatio
         {
             _logger.LogTrace("Executing '{Command}'.", command.Name);
 
-            using var activity = _telemetryService.StartActivity(ActivityName.CommandExecuted);
+            using var activity = await _telemetryService.StartActivity(ActivityName.CommandExecuted);
 
             var cmdContext = new CommandContext(_serviceProvider, activity);
             var startTime = DateTime.UtcNow;

core/src/AzureMcp.Core/Configuration/AzureMcpServerConfiguration.cs

@@ -12,6 +12,4 @@ public class AzureMcpServerConfiguration
     public string Version { get; set; } = "1.0.0-beta";
 
     public bool IsTelemetryEnabled { get; set; } = true;
-
-    public string MacAddressHash { get; set; } = string.Empty;
 }

core/src/AzureMcp.Core/Extensions/OpenTelemetryExtensions.cs

@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Net.NetworkInformation;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Azure.Monitor.OpenTelemetry.Exporter;
 using AzureMcp.Core.Configuration;
-using AzureMcp.Core.Helpers;
 using AzureMcp.Core.Services.Telemetry;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.DependencyInjection;
@@ -36,22 +35,27 @@ public static void ConfigureOpenTelemetry(this IServiceCollection services)
 
                 options.IsTelemetryEnabled = string.IsNullOrEmpty(collectTelemetry)
                     || (bool.TryParse(collectTelemetry, out var shouldCollect) && shouldCollect);
-
-                if (options.IsTelemetryEnabled)
-                {
-                    var address = NetworkInterface.GetAllNetworkInterfaces()
-                        .Where(x => x.OperationalStatus == OperationalStatus.Up && x.NetworkInterfaceType != NetworkInterfaceType.Loopback)
-                        .Select(x => x.GetPhysicalAddress().ToString())
-                        .FirstOrDefault(x => !string.IsNullOrEmpty(x));
-
-                    options.MacAddressHash = address != null
-                        ? Sha256Helper.GetHashedValue(address)
-                        : "N/A";
-                }
             });
 
         services.AddSingleton<ITelemetryService, TelemetryService>();
 
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            services.AddSingleton<IMachineInformationProvider, WindowsMachineInformationProvider>();
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            services.AddSingleton<IMachineInformationProvider, MacOSXMachineInformationProvider>();
+        }
+        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            services.AddSingleton<IMachineInformationProvider, LinuxMachineInformationProvider>();
+        }
+        else
+        {
+            services.AddSingleton<IMachineInformationProvider, DefaultMachineInformationProvider>();
+        }
+
         EnableAzureMonitor(services);
     }
 

core/src/AzureMcp.Core/Helpers/Sha256Helper.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.Extensions.Logging;
+
+namespace AzureMcp.Core.Services.Telemetry;
+
+/// <summary>
+/// Default information provider not tied to any platform specification for DevDeviceId.
+/// </summary>
+internal class DefaultMachineInformationProvider(ILogger<MachineInformationProviderBase> logger)
+    : MachineInformationProviderBase(logger)
+{
+    /// <summary>
+    /// Returns null.
+    /// </summary>
+    /// <returns></returns>
+    public override Task<string?> GetOrCreateDeviceId() => Task.FromResult<string?>(null);
+}