pr-fix: place resultcode in request

arcus-azure · Aug 1, 2024 · 4ac4c1b · 4ac4c1b
1 parent b7304e2
commit 4ac4c1b
Show file tree

Hide file tree

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

diff --git a/...lity.Tests.Integration/Serilog/Sinks/ApplicationInsights/Fixture/ITelemetryQueryClient.cs b/...lity.Tests.Integration/Serilog/Sinks/ApplicationInsights/Fixture/ITelemetryQueryClient.cs
@@ -114,18 +114,16 @@ public EventsRequestResult(
             OperationResult operation,
             IDictionary<string, string> customDimensions)
         {
-            Request = new RequestResult(id, name, source, url);
+            Request = new RequestResult(id, name, source, url, resultCode);
             Cloud = new CloudResult(roleName);
             Success = success;
-            ResultCode = resultCode;
             Operation = operation;
             CustomDimensions = customDimensions;
         }
 
         public RequestResult Request { get; }
         public CloudResult Cloud { get; }
         public bool Success { get; }
-        public string ResultCode { get; }
         public OperationResult Operation { get; }
         public IDictionary<string, string> CustomDimensions { get; }
 
@@ -134,18 +132,19 @@ public class RequestResult
             /// <summary>
             /// Initializes a new instance of the <see cref="RequestResult" /> class.
             /// </summary>
-            public RequestResult(string id, string name, string source, string url)
+            public RequestResult(string id, string name, string source, string url, string resultCode)
             {
                 Id = id;
                 Name = name;
                 Source = source;
                 Url = url;
+                ResultCode = resultCode;
             }
             public string Id { get; }
             public string Name { get; }
             public string Source { get; }
             public string Url { get; }
-
+            public string ResultCode { get; }
         }
     }
 

diff --git a/...Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/HttpRequestDataTests.cs b/...Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/HttpRequestDataTests.cs
@@ -50,7 +50,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal($"{requestUri.Scheme}://{requestUri.Host}{requestUri.AbsolutePath}", result.Request.Url);
-                    Assert.Equal(((int) statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int) statusCode).ToString(), result.Request.ResultCode);
                     Assert.Equal($"{httpMethod.Method} {operationName}", result.Operation.Name);
 
                     Assert.Equal(correlation.OperationId, result.Request.Id);

diff --git a/src/Arcus.Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/RequestTests.cs b/src/Arcus.Observability.Tests.Integration/Serilog/Sinks/ApplicationInsights/RequestTests.cs
@@ -51,7 +51,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal($"{requestUri.Scheme}://{requestUri.Host}{requestUri.AbsolutePath}", result.Request.Url);
-                    Assert.Equal(((int) statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int) statusCode).ToString(), result.Request.ResultCode);
                     Assert.Equal($"{httpMethod.Method} {operationName}", result.Operation.Name);
 
                     Assert.Equal(correlation.OperationId, result.Request.Id);
@@ -86,7 +86,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal($"{requestUri.Scheme}://{requestUri.Host}{requestUri.AbsolutePath}", result.Request.Url);
-                    Assert.Equal(((int) statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int) statusCode).ToString(), result.Request.ResultCode);
                     Assert.Equal($"{httpMethod.Method} {operationName}", result.Operation.Name);
                 });
             });
@@ -121,7 +121,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal($"{requestUri.Scheme}://{requestUri.Host}{requestUri.AbsolutePath}", result.Request.Url);
-                    Assert.Equal(((int)statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int)statusCode).ToString(), result.Request.ResultCode);
                     Assert.StartsWith(httpMethod.Method, result.Operation.Name);
                 });
             });
@@ -157,7 +157,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal($"{requestUri.Scheme}://{requestUri.Host}{requestUri.AbsolutePath}", result.Request.Url);
-                    Assert.Equal(((int)statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int)statusCode).ToString(), result.Request.ResultCode);
                     Assert.Equal(requestId, result.Request.Id);
                 });
             });
@@ -192,7 +192,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal(requestUri.ToString(), result.Request.Url);
-                    Assert.Equal(((int)statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int)statusCode).ToString(), result.Request.ResultCode);
                     Assert.Equal(requestId, result.Request.Id);
                     Assert.Equal($"{httpMethod.Method} {operationName}", result.Operation.Name);
                     Assert.Equal(requestId, result.Request.Id);
@@ -226,7 +226,7 @@ await RetryAssertUntilTelemetryShouldBeAvailableAsync(async client =>
                 AssertX.Any(results, result =>
                 {
                     Assert.Equal(requestUri.ToString(), result.Request.Url);
-                    Assert.Equal(((int)statusCode).ToString(), result.ResultCode);
+                    Assert.Equal(((int)statusCode).ToString(), result.Request.ResultCode);
                     Assert.Equal($"{httpMethod.Method} {operationName}", result.Operation.Name);
                 });
             });