Merge pull request #4042 from planetarium/prepare/5.5.2

Decrease HashNodeCache size & ActivitySource as singleton

Author: sky1045

CHANGES.md

@@ -6,6 +6,11 @@ Version 5.5.2
 
 To be released.
 
+### Optimize memory usage
+
+ -  Decrease `HashNodeCache` size
+ -  `ActivitySource` as singleton
+
 
 Version 5.5.1
 -------------

src/Libplanet.Action/State/AccountState.cs

@@ -15,13 +15,14 @@ namespace Libplanet.Action.State
     /// </summary>
     public class AccountState : IAccountState
     {
+        private static readonly ActivitySource ActivitySource =
+            new ("Libplanet.Action.State");
+
         private readonly ITrie _trie;
-        private readonly ActivitySource _activitySource;
 
         public AccountState(ITrie trie)
         {
             _trie = trie;
-            _activitySource = new ActivitySource("Libplanet.Action.State");
         }
 
         /// <inheritdoc cref="IAccountState.Trie"/>
@@ -30,7 +31,7 @@ public AccountState(ITrie trie)
         /// <inheritdoc cref="IAccountState.GetState"/>
         public IValue? GetState(Address address)
         {
-            using Activity? a = _activitySource
+            using Activity? a = ActivitySource
                 .StartActivity(ActivityKind.Internal)?
                 .AddTag("Address", address.ToString());
             return Trie.Get(ToStateKey(address));

src/Libplanet.Action/State/WorldBaseState.cs

@@ -17,8 +17,10 @@ namespace Libplanet.Action.State
     /// </summary>
     public class WorldBaseState : IWorldState
     {
+        private static readonly ActivitySource ActivitySource =
+            new ("Libplanet.Action.WorldBaseState");
+
         private readonly IStateStore _stateStore;
-        private readonly ActivitySource _activitySource;
 
         public WorldBaseState(ITrie trie, IStateStore stateStore)
         {
@@ -27,7 +29,6 @@ public WorldBaseState(ITrie trie, IStateStore stateStore)
             Version = trie.GetMetadata() is { } value
                 ? value.Version
                 : 0;
-            _activitySource = new ActivitySource("Libplanet.Action.WorldBaseState");
         }
 
         /// <inheritdoc cref="IWorldState.Trie"/>
@@ -42,7 +43,7 @@ public WorldBaseState(ITrie trie, IStateStore stateStore)
         /// <inheritdoc cref="IWorldState.GetAccountState"/>
         public IAccountState GetAccountState(Address address)
         {
-            using Activity? a = _activitySource
+            using Activity? a = ActivitySource
                 .StartActivity(ActivityKind.Internal)?
                 .AddTag("Address", address.ToString());
             if (Legacy)

src/Libplanet.Net/Transports/NetMQTransport.cs

@@ -27,6 +27,9 @@ namespace Libplanet.Net.Transports
     /// </summary>
     public class NetMQTransport : ITransport
     {
+        private static readonly ActivitySource ActivitySource =
+            new ("Libplanet.Net.Transports.NetMQTransport");
+
         private readonly PrivateKey _privateKey;
         private readonly ILogger _logger;
         private readonly AppProtocolVersionOptions _appProtocolVersionOptions;
@@ -36,7 +39,6 @@ public class NetMQTransport : ITransport
         private readonly Channel<MessageRequest> _requests;
         private readonly Task _runtimeProcessor;
         private readonly AsyncManualResetEvent _runningEvent;
-        private readonly ActivitySource _activitySource;
 
         private NetMQQueue<(AsyncManualResetEvent, Message)>? _replyQueue;
 
@@ -94,7 +96,6 @@ private NetMQTransport(
             _requests = Channel.CreateUnbounded<MessageRequest>();
             _runtimeCancellationTokenSource = new CancellationTokenSource();
             _turnCancellationTokenSource = new CancellationTokenSource();
-            _activitySource = new ActivitySource("Libplanet.Net.Transports.NetMQTransport");
             _requestCount = 0;
             CancellationToken runtimeCt = _runtimeCancellationTokenSource.Token;
             _runtimeProcessor = Task.Factory.StartNew(
@@ -323,7 +324,7 @@ CancellationToken cancellationToken
                 throw new ObjectDisposedException(nameof(NetMQTransport));
             }
 
-            using Activity? a = _activitySource
+            using Activity? a = ActivitySource
                 .StartActivity(ActivityKind.Producer)?
                 .AddTag("Message", content.Type)
                 .AddTag("Peer", peer.PeerString);
@@ -504,7 +505,7 @@ public void BroadcastMessage(IEnumerable<BoundPeer> peers, MessageContent conten
             Task.Run(
                 async () =>
                 {
-                    using Activity? a = _activitySource
+                    using Activity? a = ActivitySource
                         .StartActivity(ActivityKind.Producer)?
                         .AddTag("Message", content.Type)
                         .AddTag("Peers", boundPeers.Select(x => x.PeerString));

src/Libplanet.Store/HashNodeCache.cs

@@ -14,14 +14,15 @@ namespace Libplanet.Store
     public class HashNodeCache
     {
         // FIXME: Tuned to 9c mainnet.  Should be refactored to accept cache size as an argument.
-        private const int _cacheSize = 524_288;
+        private const int _cacheSize = 100_000;
 
         private ICache<HashDigest<SHA256>, IValue> _cache;
 
         internal HashNodeCache()
         {
             _cache = new ConcurrentLruBuilder<HashDigest<SHA256>, IValue>()
                 .WithMetrics()
+                .WithConcurrencyLevel(Environment.ProcessorCount)
                 .WithExpireAfterAccess(TimeSpan.FromMinutes(10))
                 .WithCapacity(_cacheSize)
                 .Build();

src/Libplanet/Blockchain/BlockChainStates.cs

@@ -15,21 +15,22 @@ namespace Libplanet.Blockchain
     /// </summary>
     public class BlockChainStates : IBlockChainStates
     {
+        private static readonly ActivitySource ActivitySource =
+            new ("Libplanet.Blockchain.BlockChainStates");
+
         private readonly IStore _store;
         private readonly IStateStore _stateStore;
-        private readonly ActivitySource _activitySource;
 
         public BlockChainStates(IStore store, IStateStore stateStore)
         {
             _store = store;
             _stateStore = stateStore;
-            _activitySource = new ActivitySource("Libplanet.Blockchain.BlockChainStates");
         }
 
         /// <inheritdoc cref="IBlockChainStates.GetWorldState(BlockHash)"/>
         public IWorldState GetWorldState(BlockHash offset)
         {
-            using Activity? a = _activitySource
+            using Activity? a = ActivitySource
                 .StartActivity(ActivityKind.Internal)?
                 .AddTag("BlockHash", offset.ToString());
             return new WorldBaseState(GetTrie(offset), _stateStore);
@@ -65,7 +66,7 @@ public IWorldState GetWorldState(HashDigest<SHA256>? stateRootHash)
         /// </remarks>
         private ITrie GetTrie(BlockHash offset)
         {
-            using Activity? a = _activitySource
+            using Activity? a = ActivitySource
                 .StartActivity(ActivityKind.Internal)?
                 .AddTag("BlockHash", offset.ToString());
             if (_store.GetStateRootHash(offset) is { } stateRootHash)