Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.303"
"version": "8.0.x"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using AElf.Kernel.SmartContract.Parallel;
using AElf.Kernel.Token;
using AElf.Modularity;
using AElf.OpenTelemetry;
using AElf.OS;
using AElf.OS.Network.Grpc;
using AElf.OS.Node.Application;
Expand Down Expand Up @@ -52,6 +53,7 @@ namespace AElf.Blockchains.BasicBaseChain;
//web api module
typeof(WebWebAppAElfModule),
typeof(ParallelExecutionModule),
typeof(OpenTelemetryModule),

//plugin
typeof(ExecutionPluginForMethodFeeModule),
Expand Down
3 changes: 3 additions & 0 deletions src/AElf.Core/AElf.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
<PackageReference Include="Volo.Abp.Core" Version="8.0.5" />
<PackageReference Include="AElf.OpenTelemetry" Version="8.0.5" />
<PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="1.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/AElf.CrossChain.Grpc/AElf.CrossChain.Grpc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<ItemGroup>
<PackageReference Include="Grpc" Version="2.46.3" />
<PackageReference Include="Grpc.Net.Client" Version="2.46.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.52.0" />
<PackageReference Include="Grpc.Tools" Version="2.46.3" PrivateAssets="All" />
<PackageReference Include="Contrib.Grpc.Core.M1" Version="2.41.0" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/AElf.Kernel.Core/Blockchain/Domain/IChainManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Linq;
using AElf.Kernel.Blockchain.Infrastructure;
using AElf.Kernel.Infrastructure;
using AElf.OpenTelemetry.ExecutionTime;
using Microsoft.Extensions.Caching.Memory;

namespace AElf.Kernel.Blockchain.Domain;
Expand Down Expand Up @@ -44,6 +45,7 @@ Task<DiscardedBranch> GetDiscardedBranchAsync(Chain chain, Hash irreversibleBloc
Task<Chain> ResetChainToLibAsync(Chain chain);
}

[AggregateExecutionTime]
public class ChainManager : IChainManager, ISingletonDependency
{
private readonly IBlockchainStore<ChainBlockIndex> _chainBlockIndexes;
Expand Down
2 changes: 2 additions & 0 deletions src/AElf.Kernel/Miner/Application/MiningService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
using AElf.Kernel.Blockchain;
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.SmartContractExecution.Application;
using AElf.OpenTelemetry.ExecutionTime;
using Google.Protobuf.WellKnownTypes;
using Volo.Abp.EventBus.Local;

namespace AElf.Kernel.Miner.Application;

[AggregateExecutionTime]
public class MiningService : IMiningService
{
private readonly IAccountService _accountService;
Expand Down
12 changes: 12 additions & 0 deletions src/AElf.Launcher/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
using Serilog.Sinks.OpenTelemetry;
using Volo.Abp;
using Volo.Abp.Modularity.PlugIns;

Expand Down Expand Up @@ -66,6 +68,16 @@ public void ConfigureServices(IServiceCollection services)
if (_configuration["CorsOrigins"] != "*") builder.AllowCredentials();
});
});

Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(_configuration)
#if DEBUG
.WriteTo.OpenTelemetry(
endpoint: "http://localhost:4316/v1/logs",
protocol: OtlpProtocol.HttpProtobuf)
#endif
.CreateLogger();

}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
Expand Down