Merge pull request planetarium#2535 from moreal/main-to-dev-180

Backmerge 180 release

NineChronicles.Headless.Executable/Configuration.cs

@@ -91,10 +91,6 @@ public class Configuration
 
         public int? MaxTransactionPerBlock { get; set; }
 
-        public string SentryDsn { get; set; } = "";
-
-        public double SentryTraceSampleRate { get; set; } = 0.01;
-
         public AccessControlServiceOptions? AccessControlService { get; set; }
 
         public int ArenaParticipantsSyncInterval { get; set; } = 1000;
@@ -147,8 +143,6 @@ public void Overwrite(
             double? consensusTargetBlockIntervalMilliseconds,
             int? consensusProposeSecondBase,
             int? maxTransactionPerBlock,
-            string? sentryDsn,
-            double? sentryTraceSampleRate,
             int? arenaParticipantsSyncInterval,
             bool? remoteKeyValueService
         )
@@ -201,8 +195,6 @@ public void Overwrite(
             ConsensusTargetBlockIntervalMilliseconds = consensusTargetBlockIntervalMilliseconds ?? ConsensusTargetBlockIntervalMilliseconds;
             ConsensusProposeSecondBase = consensusProposeSecondBase ?? ConsensusProposeSecondBase;
             MaxTransactionPerBlock = maxTransactionPerBlock ?? MaxTransactionPerBlock;
-            SentryDsn = sentryDsn ?? SentryDsn;
-            SentryTraceSampleRate = sentryTraceSampleRate ?? SentryTraceSampleRate;
             ArenaParticipantsSyncInterval = arenaParticipantsSyncInterval ?? ArenaParticipantsSyncInterval;
             RemoteKeyValueService = remoteKeyValueService ?? RemoteKeyValueService;
         }

NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj

@@ -6,7 +6,6 @@
     <VersionPrefix>1.0.0</VersionPrefix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>..\NineChronicles.Headless.Common.ruleset</CodeAnalysisRuleSet>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
     <Nullable>enable</Nullable>
     <Configurations>Debug;Release;DevEx</Configurations>
     <Platforms>AnyCPU</Platforms>
@@ -30,10 +29,6 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
     <PackageReference Include="Pyroscope" Version="0.8.14" />
     <PackageReference Include="Pyroscope.OpenTelemetry" Version="0.2.0" />
-    <PackageReference Include="Sentry.Serilog" Version="3.23.0" />
-    <PackageReference Include="Sentry" Version="3.23.0" />
-    <PackageReference Include="Sentry.AspNetCore.Grpc" Version="3.22.0" />
-    <PackageReference Include="Sentry.DiagnosticSource" Version="3.22.0" />
     <PackageReference Include="Serilog.Expressions" Version="1.1.1" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />

NineChronicles.Headless.Executable/Program.cs

@@ -12,7 +12,6 @@
 using NineChronicles.Headless.Executable.IO;
 using NineChronicles.Headless.Properties;
 using Org.BouncyCastle.Security;
-using Sentry;
 using Serilog;
 using Serilog.Formatting.Compact;
 using System;
@@ -25,14 +24,14 @@
 using System.Net;
 using System.Net.Http;
 using System.Reflection;
+using System.Runtime;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Lib9c.DevExtensions.Action.Loader;
 using Libplanet.Action;
 using Libplanet.Action.Loader;
-// import necessary for sentry exception filters
 using Libplanet.Types.Blocks;
 using Libplanet.Headless;
 using Libplanet.Headless.Hosting;
@@ -216,10 +215,6 @@ public async Task Run(
             [Option("config", new[] { 'C' },
                 Description = "Absolute path of \"appsettings.json\" file to provide headless configurations.")]
             string? configPath = "appsettings.json",
-            [Option(Description = "Sentry DSN")]
-            string? sentryDsn = "",
-            [Option(Description = "Trace sample rate for sentry")]
-            double? sentryTraceSampleRate = null,
             [Option(Description = "arena participants list sync interval time")]
             int? arenaParticipantsSyncInterval = null,
             [Option(Description = "arena participants list sync enable")]
@@ -229,10 +224,6 @@ public async Task Run(
             [Ignore] CancellationToken? cancellationToken = null
         )
         {
-#if SENTRY || ! DEBUG
-            try
-            {
-#endif
             var configurationBuilder = new ConfigurationBuilder();
             if (Uri.IsWellFormedUriString(configPath, UriKind.Absolute))
             {
@@ -312,40 +303,9 @@ public async Task Run(
                 txLifeTime, messageTimeout, tipTimeout, demandBuffer, skipPreload,
                 minimumBroadcastTarget, bucketSize, chainTipStaleBehaviorType, txQuotaPerSigner, maximumPollPeers,
                 consensusPort, consensusPrivateKeyString, consensusSeedStrings, consensusTargetBlockIntervalMilliseconds, consensusProposeSecondBase,
-                maxTransactionPerBlock, sentryDsn, sentryTraceSampleRate, arenaParticipantsSyncInterval, remoteKeyValueService
+                maxTransactionPerBlock, arenaParticipantsSyncInterval, remoteKeyValueService
             );
 
-#if SENTRY || ! DEBUG
-            loggerConf = loggerConf
-                .WriteTo.Sentry(o =>
-                {
-                    o.InitializeSdk = false;
-                });
-
-            using var _ = SentrySdk.Init(o =>
-            {
-                o.SendDefaultPii = true;
-                o.Dsn = headlessConfig.SentryDsn;
-                // TODO: We need to specify `o.Release` after deciding the version scheme.
-                // https://docs.sentry.io/workflow/releases/?platform=csharp
-                //o.Debug = true;
-                o.Release = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-                    ?.InformationalVersion ?? "Unknown";
-                o.SampleRate = 0.01f;
-                o.TracesSampleRate = headlessConfig.SentryTraceSampleRate;
-                o.AddExceptionFilterForType<TimeoutException>();
-                o.AddExceptionFilterForType<IOException>();
-                o.AddExceptionFilterForType<CommunicationFailException>();
-                o.AddExceptionFilterForType<InvalidBlockIndexException>();
-            });
-
-            // Set global tag
-            SentrySdk.ConfigureScope(scope =>
-            {
-                scope.SetTag("host", headlessConfig.Host ?? "no-host");
-            });
-#endif
-
             // Clean-up previous temporary log files.
             if (Directory.Exists("_logs"))
             {
@@ -354,6 +314,8 @@ public async Task Run(
 
             Log.Logger = loggerConf.CreateLogger();
 
+            Log.Information("The {0} garbage collector is running.", GCSettings.IsServerGC ? "server" : "workstation");
+
             if (!headlessConfig.NoMiner && headlessConfig.MinerPrivateKeyString is null)
             {
                 throw new CommandExitedException(
@@ -480,7 +442,6 @@ IActionLoader MakeSingleActionLoader()
                 hostBuilder.ConfigureServices(services =>
                 {
                     services.AddSingleton(_ => standaloneContext);
-                    services.AddSingleton<ConcurrentDictionary<string, ITransaction>>();
                     services.AddOpenTelemetry()
                         .ConfigureResource(resource => resource.AddService(
                                 serviceName: Assembly.GetEntryAssembly()?.GetName().Name ?? "NineChronicles.Headless",
@@ -543,7 +504,6 @@ IActionLoader MakeSingleActionLoader()
                         IPAddress.Loopback.ToString(),
                         rpcProperties.RpcListenPort,
                         context,
-                        new ConcurrentDictionary<string, Sentry.ITransaction>(),
                         arenaMemoryCache
                     );
 
@@ -574,7 +534,6 @@ IActionLoader MakeSingleActionLoader()
                         IPAddress.Loopback.ToString(),
                         0,
                         context,
-                        new ConcurrentDictionary<string, Sentry.ITransaction>(),
                         arenaMemoryCache
                     );
                     hostBuilder.UseNineChroniclesNode(
@@ -625,23 +584,6 @@ IActionLoader MakeSingleActionLoader()
             {
                 Log.Error(e, "Unexpected exception occurred during Run. {e}", e);
             }
-
-#if SENTRY || ! DEBUG
-            }
-            catch (CommandExitedException)
-            {
-                throw;
-            }
-            catch (Exception exceptionToCapture)
-            {
-                SentrySdk.CaptureException(exceptionToCapture);
-                throw;
-            }
-#endif
-        }
-
-        static void ConfigureSentryOptions(SentryOptions o)
-        {
         }
     }
 }

NineChronicles.Headless.Tests/GraphQLStartupTest.cs

@@ -27,7 +27,6 @@ public GraphQLStartupTest()
                 "",
                 0,
                 new RpcContext(),
-                new ConcurrentDictionary<string, Sentry.ITransaction>(),
                 new StateMemoryCache()
             );
             _startup = new GraphQLService.GraphQLStartup(_configuration, standaloneContext, publisher);

NineChronicles.Headless.Tests/GraphTypes/ActionQueryTest.cs

@@ -1539,5 +1539,56 @@ public async Task RetrieveAvatarAssets()
 
             Assert.Equal(avatarAddress, action.AvatarAddress);
         }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(true, false)]
+        [InlineData(false, true)]
+        [InlineData(false, false)]
+        public async Task IssueToken(bool favExist, bool itemExist)
+        {
+            var avatarAddress = new PrivateKey().Address;
+            var fungibleAssetValues = favExist
+                ? "[{ticker: \"CRYSTAL\", decimalPlaces: 18, quantity: 100}]"
+                : "[]";
+            var items = itemExist
+                ? "[{itemId: 500000, count: 100, tradable: true}, {itemId: 500000, count: 100, tradable: false}]"
+                : "[]";
+            var query = $@"{{
+                issueToken(
+                    avatarAddress: ""{avatarAddress}"",
+                    fungibleAssetValues: {fungibleAssetValues},
+                    items: {items}
+                )
+            }}";
+
+            var queryResult = await ExecuteQueryAsync<ActionQuery>(query, standaloneContext: _standaloneContext);
+            var data = (Dictionary<string, object>)((ExecutionNode)queryResult.Data!).ToValue()!;
+            var plainValue = _codec.Decode(ByteUtil.ParseHex((string)data["issueToken"]));
+            Assert.IsType<Dictionary>(plainValue);
+            var actionBase = DeserializeNCAction(plainValue);
+            var action = Assert.IsType<IssueToken>(actionBase);
+
+            Assert.Equal(avatarAddress, action.AvatarAddress);
+            Assert.Equal(favExist, action.FungibleAssetValues.Any());
+            Assert.Equal(itemExist, action.Items.Any());
+
+            if (favExist)
+            {
+                var fav = action.FungibleAssetValues.First();
+                Assert.Equal(Currencies.Crystal * 100, fav);
+            }
+
+            if (itemExist)
+            {
+                for (int i = 0; i < action.Items.Count; i++)
+                {
+                    var (itemId, count, tradable) = action.Items[i];
+                    Assert.Equal(500000, itemId);
+                    Assert.Equal(100, count);
+                    Assert.Equal(i == 0, tradable);
+                }
+            }
+        }
     }
 }

NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs

@@ -113,7 +113,6 @@ public GraphQLTestBase(ITestOutputHelper output)
                 "",
                 0,
                 new RpcContext(),
-                new ConcurrentDictionary<string, Sentry.ITransaction>(),
                 new StateMemoryCache()
             );
             services.AddSingleton(publisher);

NineChronicles.Headless/ActionEvaluationPublisher.cs

@@ -56,7 +56,6 @@ public class ActionEvaluationPublisher : BackgroundService
         private MemoryCache _memoryCache;
 
         private RpcContext _context;
-        private ConcurrentDictionary<string, Sentry.ITransaction> _sentryTraces;
 
         public ActionEvaluationPublisher(
             BlockRenderer blockRenderer,
@@ -67,7 +66,6 @@ public ActionEvaluationPublisher(
             string host,
             int port,
             RpcContext context,
-            ConcurrentDictionary<string, Sentry.ITransaction> sentryTraces,
             StateMemoryCache cache)
         {
             _blockRenderer = blockRenderer;
@@ -78,7 +76,6 @@ public ActionEvaluationPublisher(
             _host = host;
             _port = port;
             _context = context;
-            _sentryTraces = sentryTraces;
             var memoryCacheOptions = new MemoryCacheOptions();
             var options = Options.Create(memoryCacheOptions);
             _cache = new MemoryCache(options);
@@ -137,7 +134,7 @@ public async Task AddClient(Address clientAddress)
             };
 
             GrpcChannel channel = GrpcChannel.ForAddress($"http://{_host}:{_port}", options);
-            Client client = await Client.CreateAsync(channel, _blockChainStates, clientAddress, _context, _sentryTraces);
+            Client client = await Client.CreateAsync(channel, _blockChainStates, clientAddress, _context);
             if (_clients.TryAdd(clientAddress, client))
             {
                 if (clientAddress == default)
@@ -401,37 +398,32 @@ private sealed class Client : IAsyncDisposable
 
             public ImmutableHashSet<Address> TargetAddresses { get; set; }
 
-            public readonly ConcurrentDictionary<string, Sentry.ITransaction> SentryTraces;
-
             private Client(
                 IActionEvaluationHub hub,
                 IBlockChainStates blockChainStates,
                 Address clientAddress,
-                RpcContext context,
-                ConcurrentDictionary<string, Sentry.ITransaction> sentryTraces)
+                RpcContext context)
             {
                 _hub = hub;
                 _blockChainStates = blockChainStates;
                 _clientAddress = clientAddress;
                 _context = context;
                 TargetAddresses = ImmutableHashSet<Address>.Empty;
-                SentryTraces = sentryTraces;
             }
 
             public static async Task<Client> CreateAsync(
                 GrpcChannel channel,
                 IBlockChainStates blockChainStates,
                 Address clientAddress,
-                RpcContext context,
-                ConcurrentDictionary<string, Sentry.ITransaction> sentryTraces)
+                RpcContext context)
             {
                 IActionEvaluationHub hub = await StreamingHubClient.ConnectAsync<IActionEvaluationHub, IActionEvaluationHubReceiver>(
                     channel,
                     null!
                 );
                 await hub.JoinAsync(clientAddress.ToHex());
 
-                return new Client(hub, blockChainStates, clientAddress, context, sentryTraces);
+                return new Client(hub, blockChainStates, clientAddress, context);
             }
 
             public void Subscribe(
@@ -530,13 +522,6 @@ await _hub.BroadcastRenderBlockAsync(
                                 // FIXME add logger as property
                                 Log.Error(e, "[{ClientAddress}] Skip broadcasting render due to the unexpected exception", _clientAddress);
                             }
-
-                            if (ev.TxId is TxId txId && SentryTraces.TryRemove(txId.ToString() ?? "", out var sentryTrace))
-                            {
-                                var span = sentryTrace.GetLastActiveSpan();
-                                span?.Finish();
-                                sentryTrace.Finish();
-                            }
                         }
                     );