pr-fix: reduce request, dependency and exception changes

arcus-azure · Aug 1, 2024 · d0e94e4 · d0e94e4
1 parent 3127067
commit d0e94e4
Show file tree

Hide file tree

Showing 19 changed files with 160 additions and 134 deletions.
diff --git a/...vability.Tests.Integration/Serilog/Sinks/ApplicationInsights/AzureFunctionsDockerTests.cs b/...vability.Tests.Integration/Serilog/Sinks/ApplicationInsights/AzureFunctionsDockerTests.cs
@@ -28,7 +28,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal("200", result.ResultCode);
-                    Assert.Equal("Timer", result.Source);
+                    Assert.Equal("Timer", result.Request.Source);
                     Assert.Equal("Triggered", result.Operation.Name);
                 });
             });

diff --git a/...ility.Tests.Integration/Serilog/Sinks/ApplicationInsights/AzureKeyVaultDependencyTests.cs b/...ility.Tests.Integration/Serilog/Sinks/ApplicationInsights/AzureKeyVaultDependencyTests.cs
@@ -40,11 +40,11 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsDependencyResult[] results = await client.GetDependenciesAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(dependencyId, result.Id);
-                    Assert.Equal(vaultUri, result.Target);
-                    Assert.Equal(secretName, result.Data);
-                    Assert.Equal(dependencyName, result.Name);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(dependencyId, result.Dependency.Id);
+                    Assert.Equal(vaultUri, result.Dependency.Target);
+                    Assert.Equal(secretName, result.Dependency.Data);
+                    Assert.Equal(dependencyName, result.Dependency.Name);
                 });
             });
         }

diff --git a/...ability.Tests.Integration/Serilog/Sinks/ApplicationInsights/AzureSearchDependencyTests.cs b/...ability.Tests.Integration/Serilog/Sinks/ApplicationInsights/AzureSearchDependencyTests.cs
@@ -41,11 +41,11 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsDependencyResult[] results = await client.GetDependenciesAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(dependencyId, result.Id);
-                    Assert.Equal(searchServiceName, result.Target);
-                    Assert.Equal(operationName, result.Data);
-                    Assert.Equal(dependencyName, result.Name);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(dependencyId, result.Dependency.Id);
+                    Assert.Equal(searchServiceName, result.Dependency.Target);
+                    Assert.Equal(operationName, result.Dependency.Data);
+                    Assert.Equal(dependencyName, result.Dependency.Name);
                 });
             });
         }

diff --git a/...ability.Tests.Integration/Serilog/Sinks/ApplicationInsights/BlobStorageDependencyTests.cs b/...ability.Tests.Integration/Serilog/Sinks/ApplicationInsights/BlobStorageDependencyTests.cs
@@ -42,12 +42,12 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsDependencyResult[] results = await client.GetDependenciesAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(accountName, result.Target);
-                    Assert.Equal(containerName, result.Data);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(accountName, result.Dependency.Target);
+                    Assert.Equal(containerName, result.Dependency.Data);
                     Assert.Equal(componentName, result.RoleName);
-                    Assert.Equal(dependencyName, result.Name);
-                    Assert.Equal(dependencyId, result.Id);
+                    Assert.Equal(dependencyName, result.Dependency.Name);
+                    Assert.Equal(dependencyId, result.Dependency.Id);
                 });
             });
         }

diff --git a/...rvability.Tests.Integration/Serilog/Sinks/ApplicationInsights/CosmosSqlDependencyTests.cs b/...rvability.Tests.Integration/Serilog/Sinks/ApplicationInsights/CosmosSqlDependencyTests.cs
@@ -44,11 +44,11 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 Assert.NotEmpty(results);
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(accountName, result.Target);
-                    Assert.Equal(dependencyName, result.Data);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(accountName, result.Dependency.Target);
+                    Assert.Equal(dependencyName, result.Dependency.Data);
                     Assert.Equal(componentName, result.RoleName);
-                    Assert.Equal(dependencyName, result.Name);
+                    Assert.Equal(dependencyName, result.Dependency.Name);
                 });
             });
         }

diff --git a/...bservability.Tests.Integration/Serilog/Sinks/ApplicationInsights/CustomDependencyTests.cs b/...bservability.Tests.Integration/Serilog/Sinks/ApplicationInsights/CustomDependencyTests.cs
@@ -36,9 +36,9 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsDependencyResult[] results = await client.GetDependenciesAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(dependencyData, result.Data);
-                    Assert.Equal(dependencyId, result.Id);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(dependencyData, result.Dependency.Data);
+                    Assert.Equal(dependencyId, result.Dependency.Id);
                 });
             });
         }
@@ -68,10 +68,10 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsDependencyResult[] results = await client.GetDependenciesAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(dependencyData, result.Data);
-                    Assert.Equal(dependencyName, result.Name);
-                    Assert.Equal(dependencyId, result.Id);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(dependencyData, result.Dependency.Data);
+                    Assert.Equal(dependencyName, result.Dependency.Name);
+                    Assert.Equal(dependencyId, result.Dependency.Id);
                     Assert.Equal(isSuccessful, result.Success);
                     Assert.All(telemetryContext, item => Assert.Equal(item.Value.ToString(), Assert.Contains(item.Key, result.CustomDimensions)));
                 });

diff --git a/...s.Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/CustomRequestTests.cs b/...s.Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/CustomRequestTests.cs
@@ -39,9 +39,9 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsRequestResult[] requests = await client.GetRequestsAsync();
                 AssertX.Any(requests, result =>
                 {
-                    Assert.Equal(operationName, result.Name);
-                    Assert.Contains(customRequestSource, result.Source);
-                    Assert.True(string.IsNullOrWhiteSpace(result.Url), "request URL should be blank");
+                    Assert.Equal(operationName, result.Request.Name);
+                    Assert.Contains(customRequestSource, result.Request.Source);
+                    Assert.True(string.IsNullOrWhiteSpace(result.Request.Url), "request URL should be blank");
                     Assert.Equal(operationName, result.Operation.Name);
                     Assert.Equal(isSuccessful, result.Success);
                     Assert.Equal(componentName, result.RoleName);

diff --git a/...rvability.Tests.Integration/Serilog/Sinks/ApplicationInsights/EventHubsDependencyTests.cs b/...rvability.Tests.Integration/Serilog/Sinks/ApplicationInsights/EventHubsDependencyTests.cs
@@ -42,12 +42,12 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsDependencyResult[] results = await client.GetDependenciesAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(dependencyType, result.Type);
-                    Assert.Equal(eventHubName, result.Target);
-                    Assert.Equal(namespaceName, result.Data);
+                    Assert.Equal(dependencyType, result.Dependency.Type);
+                    Assert.Equal(eventHubName, result.Dependency.Target);
+                    Assert.Equal(namespaceName, result.Dependency.Data);
                     Assert.Equal(componentName, result.RoleName);
-                    Assert.Equal(dependencyName, result.Name);
-                    Assert.Equal(dependencyId, result.Id);
+                    Assert.Equal(dependencyName, result.Dependency.Name);
+                    Assert.Equal(dependencyId, result.Dependency.Id);
                 });
             });
         }

diff --git a/...bservability.Tests.Integration/Serilog/Sinks/ApplicationInsights/EventHubsRequestTests.cs b/...bservability.Tests.Integration/Serilog/Sinks/ApplicationInsights/EventHubsRequestTests.cs
@@ -42,10 +42,10 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsRequestResult[] requests = await client.GetRequestsAsync();
                 AssertX.Any(requests, result =>
                 {
-                    Assert.Equal(operationName, result.Name);
-                    Assert.Contains(eventHubsName, result.Source);
-                    Assert.Contains(eventHubsNamespace, result.Source);
-                    Assert.True(string.IsNullOrWhiteSpace(result.Url), "request URL should be blank");
+                    Assert.Equal(operationName, result.Request.Name);
+                    Assert.Contains(eventHubsName, result.Request.Source);
+                    Assert.Contains(eventHubsNamespace, result.Request.Source);
+                    Assert.True(string.IsNullOrWhiteSpace(result.Request.Url), "request URL should be blank");
                     Assert.Equal(operationName, result.Operation.Name);
                     Assert.Equal(isSuccessful, result.Success);
                     Assert.Equal(componentName, result.RoleName);

diff --git a/...Arcus.Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/ExceptionTests.cs b/...Arcus.Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/ExceptionTests.cs
@@ -34,7 +34,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.DoesNotContain($"Exception-{nameof(TestException.SpyProperty)}", result.CustomDimensions.Keys);
                 });
             });
@@ -58,7 +58,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.Equal(expectedProperty, Assert.Contains($"Exception-{nameof(TestException.SpyProperty)}", result.CustomDimensions));
                 });
             });
@@ -87,7 +87,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 {
                     string propertyName = string.Format(propertyFormat, nameof(TestException.SpyProperty));
 
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.Equal(expectedProperty, Assert.Contains(propertyName, result.CustomDimensions));
                 });
             });
@@ -111,7 +111,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.Equal(componentName, result.RoleName);
                 });
             });
@@ -141,7 +141,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.Equal(transactionId, result.Operation.Id);
                     Assert.Equal(operationId, result.Operation.ParentId);
                 });
@@ -168,7 +168,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.True(result.CustomDimensions.TryGetValue(key, out string actual), "Should contain custom dimension property");
                     Assert.Equal(expected, actual);
                 });
@@ -195,7 +195,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.True(result.CustomDimensions.TryGetValue(key, out string actual), "Should contain custom dimension property");
                     Assert.Equal(expected, actual);
                 });
@@ -222,7 +222,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 EventsExceptionResult[] results = await client.GetExceptionsAsync();
                 AssertX.Any(results, result =>
                 {
-                    Assert.Equal(exception.Message, result.Message);
+                    Assert.Equal(exception.Message, result.Exception.OuterMessage);
                     Assert.True(result.CustomDimensions.TryGetValue(key, out string actual), "Should contain custom dimension property");
                     Assert.Equal(expected, actual);
                 });

diff --git a/...lity.Tests.Integration/Serilog/Sinks/ApplicationInsights/Fixture/ITelemetryQueryClient.cs b/...lity.Tests.Integration/Serilog/Sinks/ApplicationInsights/Fixture/ITelemetryQueryClient.cs
@@ -133,10 +133,7 @@ public EventsRequestResult(
             OperationResult operation,
             IDictionary<string, string> customDimensions)
         {
-            Request = new RequestResult(id);
-            Name = name;
-            Source = source;
-            Url = url;
+            Request = new RequestResult(id, name, source, url);
             Success = success;
             ResultCode = resultCode;
             RoleName = roleName;
@@ -145,9 +142,6 @@ public EventsRequestResult(
         }
 
         public RequestResult Request { get; }
-        public string Name { get; }
-        public string Source { get; }
-        public string Url { get; }
         public bool Success { get; }
         public string ResultCode { get; }
         public string RoleName { get; }
@@ -159,11 +153,18 @@ public class RequestResult
             /// <summary>
             /// Initializes a new instance of the <see cref="RequestResult" /> class.
             /// </summary>
-            public RequestResult(string id)
+            public RequestResult(string id, string name, string source, string url)
             {
                 Id = id;
+                Name = name;
+                Source = source;
+                Url = url;
             }
             public string Id { get; }
+            public string Name { get; }
+            public string Source { get; }
+            public string Url { get; }
+
         }
     }
 
@@ -181,28 +182,41 @@ public EventsDependencyResult(
             OperationResult operation,
             IDictionary<string, string> customDimensions)
         {
-            Id = id;
-            Type = type;
-            Target = target;
-            Data = data;
+            Dependency = new DependencyResult(id, name, type, target, data);
             Success = success;
             ResultCode = resultCode;
-            Name = name;
             RoleName = roleName;
             Operation = operation;
             CustomDimensions = customDimensions;
         }
 
-        public string Type { get; }
-        public string Id { get; }
-        public string Target { get; }
-        public string Data { get; }
+        public DependencyResult Dependency { get; }
         public bool Success { get; }
         public int ResultCode { get; }
-        public string Name { get; }
         public string RoleName { get; }
         public OperationResult Operation { get; }
         public IDictionary<string, string> CustomDimensions { get; }
+
+        public class DependencyResult
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="DependencyResult" /> class.
+            /// </summary>
+            public DependencyResult(string id, string name, string type, string target, string data)
+            {
+                Id = id;
+                Name = name;
+                Type = type;
+                Target = target;
+                Data = data;
+            }
+
+            public string Id { get; }
+            public string Name { get; }
+            public string Type { get; }
+            public string Target { get; }
+            public string Data { get; }
+        }
     }
 
     public class EventsExceptionResult
@@ -212,16 +226,28 @@ public class EventsExceptionResult
         /// </summary>
         public EventsExceptionResult(string message, OperationResult operation, string roleName, IDictionary<string, string> customDimensions)
         {
-            Message = message;
+            Exception = new ExceptionResult(message);
             Operation = operation;
             RoleName = roleName;
             CustomDimensions = customDimensions;
         }
 
-        public string Message { get; }
+        public ExceptionResult Exception { get; }
         public OperationResult Operation { get; }
         public string RoleName { get; }
         public IDictionary<string, string> CustomDimensions { get; }
 
+        public class ExceptionResult
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="ExceptionResult" /> class.
+            /// </summary>
+            public ExceptionResult(string message)
+            {
+                OuterMessage = message;
+            }
+
+            public string OuterMessage { get; }
+        }
     }
 }