Moving Logging from Common.Logging to Microsoft.Extensions.Logging

For older versions of .net a custom ILogger has been created in Nethereum.JsonRpc.Client which anyone can implement for simple logging. All tests use now only netcoreapp3.1 instead of netcoerapp2.0
Nethereum · Sep 8, 2022 · 8efdef8 · 8efdef8
1 parent f5f4792
commit 8efdef8
Show file tree

Hide file tree

Showing 61 changed files with 390 additions and 238 deletions.
diff --git a/FxOutput/Nethereum.LiteFx/Nethereum.LiteFx.csproj b/FxOutput/Nethereum.LiteFx/Nethereum.LiteFx.csproj
@@ -17,7 +17,10 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
-
+
+<ItemGroup Condition=" '$(TargetFramework)' != 'net35' AND '$(TargetFramework)' != 'netstandard1.1' AND '$(TargetFramework)' != 'net451' AND '$(TargetFramework)' != 'netcoreapp2.1' ">
+	<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+</ItemGroup>
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);LITE;BYTECODELITE</DefineConstants>
   </PropertyGroup>

diff --git a/...etests/Nethereum.Parity.Reactive.ConsoleTest/Nethereum.Parity.Reactive.ConsoleTest.csproj b/...etests/Nethereum.Parity.Reactive.ConsoleTest/Nethereum.Parity.Reactive.ConsoleTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ests/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj b/...ests/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/consoletests/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj b/consoletests/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/consoletests/Nethereum.WebSocketsStreamingTest/Nethereum.WebSocketsStreamingTest.csproj b/consoletests/Nethereum.WebSocketsStreamingTest/Nethereum.WebSocketsStreamingTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nethereum.Besu/Web3Besu.cs b/src/Nethereum.Besu/Web3Besu.cs
@@ -1,5 +1,7 @@
 using System.Net.Http.Headers;
-using Common.Logging;
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET461_OR_GREATER || NET5_0_OR_GREATER
+using Microsoft.Extensions.Logging;
+#endif
 using Nethereum.JsonRpc.Client;
 using Nethereum.RPC.Accounts;
 
@@ -11,7 +13,7 @@ public Web3Besu(IClient client) : base(client)
         {
         }
 
-        public Web3Besu(string url = @"http://localhost:8545/", ILog log = null,
+        public Web3Besu(string url = @"http://localhost:8545/", ILogger log = null,
             AuthenticationHeaderValue authenticationHeader = null) : base(url, log, authenticationHeader)
         {
         }
@@ -20,7 +22,7 @@ public Web3Besu(IAccount account, IClient client) : base(account, client)
         {
         }
 
-        public Web3Besu(IAccount account, string url = @"http://localhost:8545/", ILog log = null,
+        public Web3Besu(IAccount account, string url = @"http://localhost:8545/", ILogger log = null,
             AuthenticationHeaderValue authenticationHeader = null) : base(account, url, log, authenticationHeader)
         {
         }

diff --git a/src/Nethereum.BlockchainProcessing/BlockchainCrawlingProcessor.cs b/src/Nethereum.BlockchainProcessing/BlockchainCrawlingProcessor.cs
@@ -1,4 +1,8 @@
-using Common.Logging;
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET461_OR_GREATER || NET5_0_OR_GREATER
+using Microsoft.Extensions.Logging;
+#else
+using Nethereum.JsonRpc.Client;
+#endif
 using Nethereum.BlockchainProcessing.BlockProcessing;
 using Nethereum.BlockchainProcessing.ProgressRepositories;
 using Nethereum.RPC.Eth.Blocks;
@@ -8,7 +12,7 @@ namespace Nethereum.BlockchainProcessing
     public class BlockchainCrawlingProcessor : BlockchainProcessor
     {
         public BlockCrawlOrchestrator Orchestrator => (BlockCrawlOrchestrator)BlockchainProcessingOrchestrator;
-        public BlockchainCrawlingProcessor(BlockCrawlOrchestrator blockchainProcessingOrchestrator, IBlockProgressRepository blockProgressRepository, ILastConfirmedBlockNumberService lastConfirmedBlockNumberService, ILog log = null):base(blockchainProcessingOrchestrator, blockProgressRepository, lastConfirmedBlockNumberService, log)
+        public BlockchainCrawlingProcessor(BlockCrawlOrchestrator blockchainProcessingOrchestrator, IBlockProgressRepository blockProgressRepository, ILastConfirmedBlockNumberService lastConfirmedBlockNumberService, ILogger log = null):base(blockchainProcessingOrchestrator, blockProgressRepository, lastConfirmedBlockNumberService, log)
         {
 
         }

diff --git a/src/Nethereum.BlockchainProcessing/BlockchainProcessor.cs b/src/Nethereum.BlockchainProcessing/BlockchainProcessor.cs
@@ -1,7 +1,11 @@
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
-using Common.Logging;
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET461_OR_GREATER || NET5_0_OR_GREATER
+using Microsoft.Extensions.Logging;
+#else
+using Nethereum.JsonRpc.Client;
+#endif
 using Nethereum.BlockchainProcessing.Orchestrator;
 using Nethereum.BlockchainProcessing.ProgressRepositories;
 using Nethereum.RPC.Eth.Blocks;
@@ -13,9 +17,9 @@ public class BlockchainProcessor
         protected IBlockchainProcessingOrchestrator BlockchainProcessingOrchestrator { get; set; }
         private IBlockProgressRepository _blockProgressRepository;
         private ILastConfirmedBlockNumberService _lastConfirmedBlockNumberService;
-        private ILog _log;
+        private ILogger _log;
 
-        public BlockchainProcessor(IBlockchainProcessingOrchestrator blockchainProcessingOrchestrator, IBlockProgressRepository blockProgressRepository, ILastConfirmedBlockNumberService lastConfirmedBlockNumberService,  ILog log = null)
+        public BlockchainProcessor(IBlockchainProcessingOrchestrator blockchainProcessingOrchestrator, IBlockProgressRepository blockProgressRepository, ILastConfirmedBlockNumberService lastConfirmedBlockNumberService,  ILogger log = null)
         {
             BlockchainProcessingOrchestrator = blockchainProcessingOrchestrator;
             _blockProgressRepository = blockProgressRepository;
@@ -117,11 +121,11 @@ private async Task UpdateLastBlockProcessedAsync(BigInteger? lastBlock)
             if (lastBlock != null)
             {
                 await _blockProgressRepository.UpsertProgressAsync(lastBlock.Value).ConfigureAwait(false);
-                _log?.Info($"Last Block Processed: {lastBlock}");
+                _log?.LogInformation($"Last Block Processed: {lastBlock}");
             }
             else
             {
-                _log?.Info($"No Block Processed");
+                _log?.LogInformation($"No Block Processed");
             }
         }
     }

diff --git a/src/Nethereum.BlockchainProcessing/Services/BlockchainBlockProcessingService.cs b/src/Nethereum.BlockchainProcessing/Services/BlockchainBlockProcessingService.cs
@@ -1,5 +1,9 @@
 using System;
-using Common.Logging;
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET461_OR_GREATER || NET5_0_OR_GREATER
+using Microsoft.Extensions.Logging;
+#else
+using Nethereum.JsonRpc.Client;
+#endif
 using Nethereum.BlockchainProcessing.BlockProcessing;
 using Nethereum.BlockchainProcessing.BlockStorage;
 using Nethereum.BlockchainProcessing.BlockStorage.Repositories;
@@ -23,7 +27,7 @@ public BlockchainBlockProcessingService(IEthApiContractService ethApiContractSer
         public BlockchainCrawlingProcessor CreateBlockProcessor(
             Action<BlockProcessingSteps> stepsConfiguration, 
             uint minimumBlockConfirmations, 
-            ILog log = null) => CreateBlockProcessor(
+            ILogger log = null) => CreateBlockProcessor(
                 new InMemoryBlockchainProgressRepository(),
                 stepsConfiguration, 
                 minimumBlockConfirmations, 
@@ -33,7 +37,7 @@ public BlockchainBlockProcessingService(IEthApiContractService ethApiContractSer
             IBlockProgressRepository blockProgressRepository,
             Action<BlockProcessingSteps> stepsConfiguration,
             uint minimumBlockConfirmations,
-            ILog log = null)
+            ILogger log = null)
         {
             var processingSteps = new BlockProcessingSteps();
             var orchestrator = new BlockCrawlOrchestrator(_ethApiContractService, processingSteps );
@@ -47,8 +51,8 @@ public BlockchainBlockProcessingService(IEthApiContractService ethApiContractSer
         public BlockchainCrawlingProcessor CreateBlockStorageProcessor(
             IBlockchainStoreRepositoryFactory blockchainStorageFactory, 
             uint minimumBlockConfirmations, 
-            Action<BlockProcessingSteps> configureSteps = null, 
-            ILog log = null) => CreateBlockStorageProcessor(
+            Action<BlockProcessingSteps> configureSteps = null,
+            ILogger log = null) => CreateBlockStorageProcessor(
                 blockchainStorageFactory, 
                 null, 
                 minimumBlockConfirmations, 
@@ -61,7 +65,7 @@ public BlockchainBlockProcessingService(IEthApiContractService ethApiContractSer
             IBlockProgressRepository blockProgressRepository,
             uint minimumBlockConfirmations,
             Action<BlockProcessingSteps> configureSteps = null,
-            ILog log = null)
+            ILogger log = null)
         {
             var processingSteps = new BlockStorageProcessingSteps(blockchainStorageFactory);
             var orchestrator = new BlockCrawlOrchestrator(_ethApiContractService, processingSteps);

diff --git a/src/Nethereum.BlockchainProcessing/Services/BlockchainLogProcessingService.cs b/src/Nethereum.BlockchainProcessing/Services/BlockchainLogProcessingService.cs
@@ -3,7 +3,11 @@
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
-using Common.Logging;
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET461_OR_GREATER || NET5_0_OR_GREATER
+using Microsoft.Extensions.Logging;
+#else
+using Nethereum.JsonRpc.Client;
+#endif
 using Nethereum.BlockchainProcessing.LogProcessing;
 using Nethereum.BlockchainProcessing.Processor;
 using Nethereum.BlockchainProcessing.ProgressRepositories;
@@ -146,7 +150,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<EventLog<TEventDTO>, bool> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class, new() =>
+            ILogger log = null) where TEventDTO : class, new() =>
             CreateProcessor(new[] {new EventLogProcessorHandler<TEventDTO>(action, criteria)}, minimumBlockConfirmations,
                 new FilterInputBuilder<TEventDTO>().Build(), blockProgressRepository, log);
 
@@ -157,7 +161,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<EventLog<TEventDTO>, bool> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class, new() =>
+            ILogger log = null) where TEventDTO : class, new() =>
             CreateProcessor(new[]
             {
                 new EventLogProcessorHandler<TEventDTO>(action, criteria)
@@ -175,7 +179,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<EventLog<TEventDTO>, bool> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class, new() =>
+            ILogger log = null) where TEventDTO : class, new() =>
             CreateProcessor(new[] {new EventLogProcessorHandler<TEventDTO>(action, criteria)}, minimumBlockConfirmations,
                 new FilterInputBuilder<TEventDTO>().Build(contractAddresses), blockProgressRepository, log);
 
@@ -184,7 +188,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<EventLog<TEventDTO>, Task<bool>> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class, new() =>
+            ILogger log = null) where TEventDTO : class, new() =>
             CreateProcessor(new[] {new EventLogProcessorHandler<TEventDTO>(action, criteria)}, minimumBlockConfirmations,
                 new FilterInputBuilder<TEventDTO>().Build(), blockProgressRepository, log);
 
@@ -195,7 +199,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<EventLog<TEventDTO>, Task<bool>> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class, new() =>
+            ILogger log = null) where TEventDTO : class, new() =>
             CreateProcessor(new[] {new EventLogProcessorHandler<TEventDTO>(action, criteria)}, minimumBlockConfirmations,
                 new FilterInputBuilder<TEventDTO>().Build(new[] {contractAddress}), blockProgressRepository, log);
 
@@ -205,7 +209,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<EventLog<TEventDTO>, Task<bool>> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class, new() =>
+            ILogger log = null) where TEventDTO : class, new() =>
             CreateProcessor(new[] {new EventLogProcessorHandler<TEventDTO>(action, criteria)}, minimumBlockConfirmations,
                 new FilterInputBuilder<TEventDTO>().Build(contractAddresses), blockProgressRepository, log);
 
@@ -214,7 +218,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             string[] contractAddresses,
             uint minimumBlockConfirmations,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) where TEventDTO : class =>
+            ILogger log = null) where TEventDTO : class =>
             CreateProcessor(new[] {logProcessor}, minimumBlockConfirmations, new FilterInputBuilder<TEventDTO>().Build(contractAddresses),
                 blockProgressRepository, log);
 
@@ -225,7 +229,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<FilterLog, bool> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations,
+            ILogger log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations,
             new NewFilterInput {Address = new[] {contractAddress}}, blockProgressRepository, log);
 
         public BlockchainProcessor CreateProcessorForContracts(
@@ -235,7 +239,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             Func<FilterLog, bool> criteria = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations,
+            ILogger log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations,
             new NewFilterInput {Address = contractAddresses}, blockProgressRepository, log);
 
 
@@ -247,7 +251,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             Func<FilterLog, bool> criteria = null,
             NewFilterInput filter = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations, filter,
+            ILogger log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations, filter,
             blockProgressRepository, log);
 
         //async action and criteria
@@ -258,7 +262,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             Func<FilterLog, Task<bool>> criteria = null,
             NewFilterInput filter = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations, filter,
+            ILogger log = null) => CreateProcessor(new[] {new ProcessorHandler<FilterLog>(action, criteria)}, minimumBlockConfirmations, filter,
             blockProgressRepository, log);
 
         //single processor
@@ -268,7 +272,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             NewFilterInput filter = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null) => CreateProcessor(new[] {logProcessor}, minimumBlockConfirmations, filter, blockProgressRepository, log);
+            ILogger log = null) => CreateProcessor(new[] {logProcessor}, minimumBlockConfirmations, filter, blockProgressRepository, log);
 
         //multi processor
         public BlockchainProcessor CreateProcessor(
@@ -277,7 +281,7 @@ Task StoreLogAsync(EventLog<TEventDTO> eventLog)
             uint minimumBlockConfirmations,
             NewFilterInput filter = null,
             IBlockProgressRepository blockProgressRepository = null,
-            ILog log = null, int defaultNumberOfBlocksPerRequest = 100, int retryWeight = 0)
+            ILogger log = null, int defaultNumberOfBlocksPerRequest = 100, int retryWeight = 0)
         {
             var orchestrator = new LogOrchestrator(_ethApiContractService, logProcessors, filter, defaultNumberOfBlocksPerRequest, retryWeight);