Add version, when available, to distributed logging (Azure#23999)

Resolves Azure#12907

Author: heaths

sdk/keyvault/Azure.Security.KeyVault.Certificates/CHANGELOG.md

@@ -10,6 +10,8 @@
 
 ### Bugs Fixed
 
+- Added certificate version to distributed tracing. ([#12907](https://github.com/Azure/azure-sdk-for-net/issues/12907))
+
 ### Other Changes
 
 ## 4.3.0-beta.1 (2021-08-10)

sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs

@@ -181,6 +181,7 @@ public virtual Response<X509Certificate2> DownloadCertificate(string certificate
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(CertificateClient)}.{nameof(DownloadCertificate)}");
             scope.AddAttribute("certificate", certificateName);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -244,6 +245,7 @@ public virtual async Task<Response<X509Certificate2>> DownloadCertificateAsync(s
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(CertificateClient)}.{nameof(DownloadCertificate)}");
             scope.AddAttribute("certificate", certificateName);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -351,6 +353,7 @@ public virtual Response<KeyVaultCertificate> GetCertificateVersion(string certif
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(CertificateClient)}.{nameof(GetCertificateVersion)}");
             scope.AddAttribute("certificate", certificateName);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -380,6 +383,7 @@ public virtual async Task<Response<KeyVaultCertificate>> GetCertificateVersionAs
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(CertificateClient)}.{nameof(GetCertificateVersion)}");
             scope.AddAttribute("certificate", certificateName);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -408,6 +412,7 @@ public virtual Response<KeyVaultCertificate> UpdateCertificateProperties(Certifi
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(CertificateClient)}.{nameof(UpdateCertificateProperties)}");
             scope.AddAttribute("certificate", properties.Name);
+            scope.AddAttribute("version", properties.Version);
             scope.Start();
 
             try
@@ -436,6 +441,7 @@ public virtual async Task<Response<KeyVaultCertificate>> UpdateCertificateProper
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(CertificateClient)}.{nameof(UpdateCertificateProperties)}");
             scope.AddAttribute("certificate", properties.Name);
+            scope.AddAttribute("version", properties.Version);
             scope.Start();
 
             try

sdk/keyvault/Azure.Security.KeyVault.Keys/CHANGELOG.md

@@ -11,6 +11,8 @@
 
 ### Bugs Fixed
 
+- Added key version to distributed tracing. ([#12907](https://github.com/Azure/azure-sdk-for-net/issues/12907))
+
 ### Other Changes
 
 ## 4.3.0-beta.1 (2021-08-10)

sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClient.cs

@@ -340,6 +340,7 @@ public virtual Response<KeyVaultKey> UpdateKeyProperties(KeyProperties propertie
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(KeyClient)}.{nameof(UpdateKeyProperties)}");
             scope.AddAttribute("key", properties.Name);
+            scope.AddAttribute("version", properties.Version);
             scope.Start();
 
             try
@@ -376,6 +377,7 @@ public virtual async Task<Response<KeyVaultKey>> UpdateKeyPropertiesAsync(KeyPro
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(KeyClient)}.{nameof(UpdateKeyProperties)}");
             scope.AddAttribute("key", properties.Name);
+            scope.AddAttribute("version", properties.Version);
             scope.Start();
 
             try
@@ -409,6 +411,7 @@ public virtual Response<KeyVaultKey> GetKey(string name, string version = null,
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(KeyClient)}.{nameof(GetKey)}");
             scope.AddAttribute("key", name);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -442,6 +445,7 @@ public virtual async Task<Response<KeyVaultKey>> GetKeyAsync(string name, string
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(KeyClient)}.{nameof(GetKey)}");
             scope.AddAttribute("key", name);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -1263,6 +1267,7 @@ public virtual Response<ReleaseKeyResult> ReleaseKey(string name, string version
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(KeyClient)}.{nameof(ReleaseKey)}");
             scope.AddAttribute("key", name);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             options ??= new();
@@ -1320,6 +1325,7 @@ public virtual async Task<Response<ReleaseKeyResult>> ReleaseKeyAsync(string nam
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(KeyClient)}.{nameof(ReleaseKey)}");
             scope.AddAttribute("key", name);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             options ??= new();

sdk/keyvault/Azure.Security.KeyVault.Secrets/CHANGELOG.md

@@ -10,6 +10,8 @@
 
 ### Bugs Fixed
 
+- Added secret version to distributed tracing. ([#12907](https://github.com/Azure/azure-sdk-for-net/issues/12907))
+
 ### Other Changes
 
 ## 4.3.0-beta.1 (2021-08-10)

sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClient.cs

@@ -90,6 +90,7 @@ public virtual async Task<Response<KeyVaultSecret>> GetSecretAsync(string name,
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(SecretClient)}.{nameof(GetSecret)}");
             scope.AddAttribute("secret", name);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -122,6 +123,7 @@ public virtual Response<KeyVaultSecret> GetSecret(string name, string version =
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(SecretClient)}.{nameof(GetSecret)}");
             scope.AddAttribute("secret", name);
+            scope.AddAttribute("version", version);
             scope.Start();
 
             try
@@ -235,6 +237,7 @@ public virtual async Task<Response<SecretProperties>> UpdateSecretPropertiesAsyn
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(SecretClient)}.{nameof(UpdateSecretProperties)}");
             scope.AddAttribute("secret", properties.Name);
+            scope.AddAttribute("version", properties.Version);
             scope.Start();
 
             try
@@ -268,6 +271,7 @@ public virtual Response<SecretProperties> UpdateSecretProperties(SecretPropertie
 
             using DiagnosticScope scope = _pipeline.CreateScope($"{nameof(SecretClient)}.{nameof(UpdateSecretProperties)}");
             scope.AddAttribute("secret", properties.Name);
+            scope.AddAttribute("version", properties.Version);
             scope.Start();
 
             try