Fix warnings

osstotalsoft · Dec 11, 2024 · 2b55b52 · 2b55b52
1 parent e1d09b0
commit 2b55b52
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 38 deletions.
diff --git a/src/Messaging/NBB.Messaging.OpenTelemetry/Publisher/OpenTelemetryPublisherDecorator.cs b/src/Messaging/NBB.Messaging.OpenTelemetry/Publisher/OpenTelemetryPublisherDecorator.cs
@@ -63,7 +63,7 @@ await _inner.PublishAsync(message, options with { EnvelopeCustomizer = NewCustom
             catch (Exception exception)
             {
                 activity?.SetStatus(ActivityStatusCode.Error, exception.Message);
-                activity?.RecordException(exception);
+                activity?.AddException(exception);
                 throw;
             }
         }

diff --git a/src/Messaging/NBB.Messaging.OpenTelemetry/Subscriber/OpenTelemetrySubscriberDecorator.cs b/src/Messaging/NBB.Messaging.OpenTelemetry/Subscriber/OpenTelemetrySubscriberDecorator.cs
@@ -57,7 +57,7 @@ async Task NewHandler(MessagingEnvelope<TMessage> incommingEnvelope)
                 catch (Exception exception)
                 {
                     activity?.SetStatus(ActivityStatusCode.Error, exception.Message);
-                    activity?.RecordException(exception);
+                    activity?.AddException(exception);
                     throw;
                 }
             }

diff --git a/...s/Serilog/NBB.Tools.Serilog.OpenTelemetryTracingSink/Internal/OpenTelemetryTracingSink.cs b/...s/Serilog/NBB.Tools.Serilog.OpenTelemetryTracingSink/Internal/OpenTelemetryTracingSink.cs
@@ -52,12 +52,12 @@ public void Emit(LogEvent logEvent)
 
                 if (logEvent.Exception != null)
                 {
-                    activity.RecordException(logEvent.Exception);
+                    activity.AddException(logEvent.Exception);
                 }
             }
             catch (Exception logException)
             {
-                activity.RecordException(logException);
+                activity.AddException(logException);
             }
         }
     }

diff --git a/test/UnitTests/Core/NBB.Core.Pipeline.Tests/PipelineTests.cs b/test/UnitTests/Core/NBB.Core.Pipeline.Tests/PipelineTests.cs
@@ -16,7 +16,7 @@ namespace NBB.Core.Pipeline.Tests
     public class PipelineTests
     {
         [Fact]
-        public async void Should_execute_nesting_in_order_class_middleware()
+        public async Task Should_execute_nesting_in_order_class_middleware()
         {
             //Arrange
             var mockedServiceProvider = Mock.Of<IServiceProvider>();
@@ -35,7 +35,7 @@ public async void Should_execute_nesting_in_order_class_middleware()
         }
 
         [Fact]
-        public async void Should_execute_nesting_in_order_inline()
+        public async Task Should_execute_nesting_in_order_inline()
         {
             //Arrange
             var mockedServiceProvider = Mock.Of<IServiceProvider>();
@@ -67,7 +67,7 @@ public async void Should_execute_nesting_in_order_inline()
 
 
         [Fact]
-        public async void Should_support_constructor_injection_in_middleware()
+        public async Task Should_support_constructor_injection_in_middleware()
         {
             //Arrange
             var mockedServiceProvider = Mock.Of<IServiceProvider>(sp =>
@@ -87,7 +87,7 @@ public async void Should_support_constructor_injection_in_middleware()
         }
 
         [Fact]
-        public async void Should_pass_execution_parameters_to_middleware()
+        public async Task Should_pass_execution_parameters_to_middleware()
         {
             //Arrange
             var mockedServiceProvider = Mock.Of<IServiceProvider>();
@@ -125,7 +125,7 @@ public async void Should_pass_execution_parameters_to_middleware()
         }
 
         [Fact]
-        public async void Should_not_swallow_exception_async()
+        public async Task Should_not_swallow_exception_async()
         {
             //Arrange
             var mockedServiceProvider = Mock.Of<IServiceProvider>();
@@ -185,7 +185,7 @@ public void Should_not_burry_exception_sync()
         }
 
         [Fact]
-        public async void Should_build_pipeline_in_container_scope()
+        public async Task Should_build_pipeline_in_container_scope()
         {
             //Arrange
             var services = new ServiceCollection();

diff --git a/...tTests/Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/CorrelationMiddlewareTests.cs b/...tTests/Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/CorrelationMiddlewareTests.cs
@@ -14,7 +14,7 @@ public class CorrelationMiddlewareTests
     {
         // IntegrationTest (integrates with CorrelationManager)
         [Fact]
-        public async void Should_setNewCorrelationId()
+        public async Task Should_setNewCorrelationId()
         {
             //Arrange
             var correlationMiddleWare = new CorrelationMiddleware();
@@ -34,7 +34,7 @@ public async void Should_setNewCorrelationId()
 
         // IntegrationTest (integrates with CorrelationManager)
         [Fact]
-        public async void Should_takeCorrelationIdFromMessage()
+        public async Task Should_takeCorrelationIdFromMessage()
         {
             //Arrange
             var correlationMiddleWare = new CorrelationMiddleware();
@@ -53,7 +53,7 @@ public async void Should_takeCorrelationIdFromMessage()
         }
 
         [Fact]
-        public async void Should_callNextPipelineMiddleware()
+        public async Task Should_callNextPipelineMiddleware()
         {
             //Arrange
             var correlationMiddleWare = new CorrelationMiddleware();
@@ -71,4 +71,4 @@ public async void Should_callNextPipelineMiddleware()
             isNextMiddlewareCalled.Should().BeTrue();
         }
     }
-}
+}
diff --git a/.../Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/DefaultResiliencyMiddlewareTests.cs b/.../Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/DefaultResiliencyMiddlewareTests.cs
@@ -14,7 +14,7 @@ namespace NBB.Messaging.Host.Tests.MessagingPipeline
     public class DefaultResiliencyMiddlewareTests
     {
         [Fact]
-        public async void Should_callNextPipelineMiddleware()
+        public async Task Should_callNextPipelineMiddleware()
         {
             //Arrange
             var resiliencyMiddleware = new DefaultResiliencyMiddleware(

diff --git a/.../Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/ExceptionHandlingMiddlewareTests.cs b/.../Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/ExceptionHandlingMiddlewareTests.cs
@@ -14,7 +14,7 @@ namespace NBB.Messaging.Host.Tests.MessagingPipeline
     public class ExceptionHandlingMiddlewareTests
     {
         [Fact]
-        public async void Should_logSuccessMessage()
+        public async Task Should_logSuccessMessage()
         {
             //Arrange
             var mockedLogger = Mock.Of<ILogger<ExceptionHandlingMiddleware>>();
@@ -34,7 +34,7 @@ public async void Should_logSuccessMessage()
         }
 
         [Fact]
-        public async void Should_logErrorMessageWhenExceptionIsThrown()
+        public async Task Should_logErrorMessageWhenExceptionIsThrown()
         {
             //Arrange
             var mockedLogger = Mock.Of<ILogger<ExceptionHandlingMiddleware>>();
@@ -61,7 +61,7 @@ public async void Should_logErrorMessageWhenExceptionIsThrown()
         }
 
         [Fact]
-        public async void Should_callNextPipelineMiddleware()
+        public async Task Should_callNextPipelineMiddleware()
         {
             //Arrange
 

diff --git a/.../UnitTests/Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/MediatRMiddlewareTests.cs b/.../UnitTests/Messaging/NBB.Messaging.Host.Tests/MessagingPipeline/MediatRMiddlewareTests.cs
@@ -14,7 +14,7 @@ namespace NBB.Messaging.Host.Tests.MessagingPipeline
     public class MediatRMiddlewareTests
     {
         [Fact]
-        public async void Should_publishEventsToMediatR()
+        public async Task Should_publishEventsToMediatR()
         {
             //Arrange
             var mockedMediator = Mock.Of<IMediator>();
@@ -34,7 +34,7 @@ public async void Should_publishEventsToMediatR()
         }
 
         [Fact]
-        public async void Should_sendCommandsToMediatR()
+        public async Task Should_sendCommandsToMediatR()
         {
             //Arrange
             var mockedMediator = Mock.Of<IMediator>();
@@ -54,7 +54,7 @@ public async void Should_sendCommandsToMediatR()
         }
 
         [Fact]
-        public async void Should_throwExceptionForUnhandledMessageType()
+        public async Task Should_throwExceptionForUnhandledMessageType()
         {
             //Arrange
             var mediatRMiddleware = new MediatRMiddleware(Mock.Of<IMediator>());
@@ -75,7 +75,7 @@ public async void Should_throwExceptionForUnhandledMessageType()
         }
 
         [Fact]
-        public async void Should_callNextPipelineMiddleware()
+        public async Task Should_callNextPipelineMiddleware()
         {
             //Arrange
             var mediatRMiddleware = new MediatRMiddleware(Mock.Of<IMediator>());

diff --git a/...aging/NBB.Messaging.Host.Tests/MessagingPipeline/SchemaMessageValidatorMiddlewareTests.cs b/...aging/NBB.Messaging.Host.Tests/MessagingPipeline/SchemaMessageValidatorMiddlewareTests.cs
@@ -12,7 +12,7 @@ namespace NBB.Messaging.Host.Tests.MessagingPipeline
     public class SchemaMessageValidatorMiddlewareTests
     {
         [Fact]
-        public async void Should_throwExceptionWhenAHeaderFieldIsNotProvided()
+        public async Task Should_throwExceptionWhenAHeaderFieldIsNotProvided()
         {
             //Arrange
             var schemaMessageValidationMiddleware = new SchemaMessageValidatorMiddleware();
@@ -34,7 +34,7 @@ public async void Should_throwExceptionWhenAHeaderFieldIsNotProvided()
         }
 
         [Fact]
-        public async void Should_callNextPipelineMiddlewareWhenAllHeaderFieldsAreProvided()
+        public async Task Should_callNextPipelineMiddlewareWhenAllHeaderFieldsAreProvided()
         {
             //Arrange
             bool isNextMiddlewareCalled = false;

diff --git a/...UnitTests/Messaging/NBB.Messaging.MultiTenancy.Tests/MessageBusPublisherDecoratorTests.cs b/...UnitTests/Messaging/NBB.Messaging.MultiTenancy.Tests/MessageBusPublisherDecoratorTests.cs
@@ -19,7 +19,7 @@ namespace NBB.Messaging.MultiTenancy.Tests
     public class MessageBusPublisherDecoratorTests
     {
         [Fact]
-        public async void ShouldCallInnerPublisher()
+        public async Task ShouldCallInnerPublisher()
         {
             // Arrange
             var publisherMock = new Mock<IMessageBusPublisher>();
@@ -39,7 +39,7 @@ public async void ShouldCallInnerPublisher()
         }
 
         [Fact]
-        public async void ShouldSetTenantIdInEnvelopeHeader()
+        public async Task ShouldSetTenantIdInEnvelopeHeader()
         {
             // Arrange
             var tenantId = Guid.NewGuid();

diff --git a/....MultiTenancy.Identification.Messaging.Tests/TenantIdHeaderMessagingTokenResolverTests.cs b/....MultiTenancy.Identification.Messaging.Tests/TenantIdHeaderMessagingTokenResolverTests.cs
@@ -2,6 +2,7 @@
 // This source code is licensed under the MIT license.
 
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using FluentAssertions;
 using NBB.Messaging.Abstractions;
 using Xunit;
@@ -24,7 +25,7 @@ public TenantIdHeaderMessagingTokenResolverTests()
         }
 
         [Fact]
-        public void Should_Resolve_Token_FromHeader()
+        public async Task Should_Resolve_Token_FromHeader()
         {
             // Arrange
             const string key = "test token key";
@@ -33,21 +34,21 @@ public void Should_Resolve_Token_FromHeader()
             var sut = new TenantIdHeaderMessagingTokenResolver(_mockMessagingContextAccessor, key);
 
             // Act
-            var result = sut.GetTenantToken().Result;
+            var result = await sut.GetTenantToken();
 
             // Assert
             result.Should().Be(value);
         }
 
         [Fact]
-        public void Should_Return_Null_For_Bad_Keys()
+        public async Task Should_Return_Null_For_Bad_Keys()
         {
             // Arrange
             const string key = "bad token key";
             var sut = new TenantIdHeaderMessagingTokenResolver(_mockMessagingContextAccessor, key);
 
             // Act
-            var result= sut.GetTenantToken().Result;
+            var result = await sut.GetTenantToken();
 
             // Assert
             result.Should().BeNull();

diff --git a/...MultiTenancy/NBB.MultiTenancy.Identification.Tests/Identifiers/IdTenantIdentifierTests.cs b/...MultiTenancy/NBB.MultiTenancy.Identification.Tests/Identifiers/IdTenantIdentifierTests.cs
@@ -4,21 +4,22 @@
 using FluentAssertions;
 using NBB.MultiTenancy.Identification.Identifiers;
 using System;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace NBB.MultiTenancy.Identification.Tests.Identifiers
 {
     public class IdTenantIdentifierTests
     {
         [Fact]
-        public void Should_Return_Given_Guid()
+        public async Task Should_Return_Given_Guid()
         {
             // Arrange
             var sut = new IdTenantIdentifier();
             var testGuid = Guid.NewGuid();
 
             // Act
-            var tenantId = sut.GetTenantIdAsync(testGuid.ToString()).Result;
+            var tenantId = await sut.GetTenantIdAsync(testGuid.ToString());
 
             // Assert
             tenantId.Should().Be(testGuid);

diff --git a/...itTests/MultiTenancy/NBB.MultiTenancy.Identification.Tests/Services/TenantServiceTests.cs b/...itTests/MultiTenancy/NBB.MultiTenancy.Identification.Tests/Services/TenantServiceTests.cs
@@ -47,7 +47,7 @@ public void Should_Throw_TenantNotFoundException_If_All_Resolvers_Return_Null()
         }
 
         [Fact]
-        public void Should_Pass_Token_And_Stop()
+        public async Task Should_Pass_Token_And_Stop()
         {
             // Arrange
             const string tenantToken = "mock token";
@@ -60,14 +60,14 @@ public void Should_Pass_Token_And_Stop()
             var sut = new DefaultTenantIdentificationService(new List<TenantIdentificationStrategy>() { firstPair, secondPair, thirdPair });
 
             // Act
-            _ = sut.GetTenantIdAsync().Result;
+            _ = await sut.GetTenantIdAsync();
 
             // Assert
             _identifier.Verify(i => i.GetTenantIdAsync(It.Is<string>(s => string.Equals(s, tenantToken))), Times.Once());
         }
 
         [Fact]
-        public void Try_Method_Should_Return_Null_If_All_Resolvers_Return_Null()
+        public async Task Try_Method_Should_Return_Null_If_All_Resolvers_Return_Null()
         {
             // Arrange
             _firstResolver.Setup(r => r.GetTenantToken()).Returns(Task.FromResult<string>(null));
@@ -77,14 +77,14 @@ public void Try_Method_Should_Return_Null_If_All_Resolvers_Return_Null()
             var sut = new DefaultTenantIdentificationService(new List<TenantIdentificationStrategy>() { identifierPair });
 
             // Act
-            var result = sut.TryGetTenantIdAsync().Result;
+            var result = await sut.TryGetTenantIdAsync();
 
             // Assert
             result.Should().BeNull();
         }
 
         [Fact]
-        public void Try_Method_Should_Pass_Token_And_Stop()
+        public async Task Try_Method_Should_Pass_Token_And_Stop()
         {
             // Arrange
             const string tenantToken = "mock token";
@@ -97,7 +97,7 @@ public void Try_Method_Should_Pass_Token_And_Stop()
             var sut = new DefaultTenantIdentificationService(new List<TenantIdentificationStrategy>() { firstPair, secondPair, thirdPair });
 
             // Act
-            _ = sut.TryGetTenantIdAsync().Result;
+            _ = await sut.TryGetTenantIdAsync();
 
             // Assert
             _identifier.Verify(i => i.GetTenantIdAsync(It.Is<string>(s => string.Equals(s, tenantToken))), Times.Once());