Skip to content

Commit 3f01279

Browse files
andrey-serdyukandrey-serdyuk
committed
Improved structured
1 parent 7a98fe1 commit 3f01279

File tree

69 files changed

+628
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+628
-375
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<IsPackable>true</IsPackable>
7-
<Version>2.2.43</Version>
7+
<Version>2.2.62</Version>
88
<Authors>Andrey Serdyuk</Authors>
99
<Company>TaskHub</Company>
1010
<Title>TaskHub.Shared - Reusable Primitives for .NET Microservices</Title>

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ TaskHub.Shared contains the fundamental components and patterns used across all
4141
- **TaskHub.Observability.Metrics.Implementation** — Default metrics implementation built on top of `IMeterFactory` and OpenTelemetry metrics.
4242

4343

44-
- **TaskHub.Observability.Traces.Abstractions** — Tracing contracts and ActivitySource abstractions for instrumenting command and HTTP pipelines.
45-
- **TaskHub.Observability.Traces.Implementation** — Default tracing implementation built on top of ActivitySource.
44+
- **TaskHub.Observability.Traces** — Tracing and implementation built on top of ActivitySource.
4645

4746

4847
- **TaskHub.Observability.OpenTelemetry** — Preconfigured OpenTelemetry setup (resource, exporters, processors) for metrics, traces, and logs (Tempo, Prometheus, Loki).

‎Shared.slnx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<Project Path="TaskHub.Shared.Persistence.Abstractions/TaskHub.Shared.Persistence.Abstractions.csproj" />
1111
<Project Path="TaskHub.Shared.Primitives/TaskHub.Shared.Primitives.csproj" />
1212
<Project Path="TaskHub.Shared.Response/TaskHub.Shared.Response.csproj" />
13+
<Project Path="TaskHub.Shared.Services.Abstractions/TaskHub.Shared.Services.Abstractions.csproj" Id="cbdd1627-836b-4ce6-be62-5a69e567158d" />
1314
</Folder>
1415
<Folder Name="/Authorization/">
1516
<Project Path="TaskHub.Shared.Authorization.Abstractions/TaskHub.Shared.Authorization.Abstractions.csproj" Id="f264dfba-c7d1-4ae9-b715-a4ae655a2b94" />
@@ -34,8 +35,7 @@
3435
</Folder>
3536
<Folder Name="/Observability/" />
3637
<Folder Name="/Observability/Logger/">
37-
<Project Path="TaskHub.Observability.Logger.Serilog/TaskHub.Observability.Logger.Serilog.csproj" Id="74dac548-da4e-4be6-841c-da55189b8c09" />
38-
<Project Path="TaskHub.Observability.Logging.Abstractions/TaskHub.Observability.Logger.Abstractions.csproj" Id="61b746c8-e570-4be1-ab96-61bdc328c079" />
38+
<Project Path="TaskHub.Observability.Logger/TaskHub.Observability.Logger.csproj" Id="74dac548-da4e-4be6-841c-da55189b8c09" />
3939
</Folder>
4040
<Folder Name="/Observability/Metrics/">
4141
<Project Path="TaskHub.Observability.Metrics.Abstractions/TaskHub.Observability.Metrics.Abstractions.csproj" />
@@ -45,12 +45,14 @@
4545
<Project Path="TaskHub.Observability.OpenTelemetry/TaskHub.Observability.OpenTelemetry.csproj" />
4646
</Folder>
4747
<Folder Name="/Observability/Traces/">
48-
<Project Path="TaskHub.Observability.Traces.Abstractions/TaskHub.Observability.Traces.Abstractions.csproj" Id="cb48c92f-bb0c-432d-a8e2-03599ef12ae4" />
49-
<Project Path="TaskHub.Observability.Traces.Implementation/TaskHub.Observability.Traces.Implementation.csproj" />
48+
<Project Path="TaskHub.Observability.Traces/TaskHub.Observability.Traces.csproj" Id="cb48c92f-bb0c-432d-a8e2-03599ef12ae4" />
49+
</Folder>
50+
<Folder Name="/Refactoring/">
51+
<Project Path="TaskHub.Shared.Refactoring/TaskHub.Shared.Refactoring.csproj" Id="6fe83e8e-6b67-48d4-a433-e52e282477ac" />
5052
</Folder>
5153
<Folder Name="/Tools/">
52-
<Project Path="TaskHub.Shared.Bootstraper/TaskHub.Shared.Bootstraper.csproj" Id="7babb715-b9be-447f-90b4-b1b3451df9bf" />
53-
<Project Path="TaskHub.Shared.ConfigurationTools/TaskHub.Shared.ConfigurationTools.csproj" Id="0f21840b-73df-465d-a20e-45983df6e24e" />
54+
<Project Path="TaskHub.Shared.Bootstraper.Basic/TaskHub.Shared.Bootstraper.Basic.csproj" />
55+
<Project Path="TaskHub.Shared.Bootstraper.Full/TaskHub.Shared.Bootstraper.Full.csproj" />
5456
<Project Path="TaskHub.Shared.RateLimiter/TaskHub.Shared.RateLimiter.csproj" Id="6e4d4c7b-0df0-460e-8653-8123bc540fc6" />
5557
<Project Path="TaskHub.Shared.Redis/TaskHub.Shared.Redis.csproj" Id="5fc5938a-a4d2-4fee-99cc-5d9cf54e0645" />
5658
<Project Path="TaskHub.Shared.Swagger/TaskHub.Shared.Swagger.csproj" Id="b945e948-fe0b-4724-8f55-cbd0be83e924" />

‎TaskHub.Observability.Logger.Serilog/SerilogBoostrap.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎TaskHub.Observability.Logger.Serilog/SerilogOptions.cs‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

TaskHub.Observability.Logging.Abstractions/ILogService.cs renamed to TaskHub.Observability.Logger/ILogService.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
namespace TaskHub.Observability.Logger.Abstractions;
1+
using TaskHub.Shared.Services.Abstractions;
22

3-
public interface ILogService
3+
namespace TaskHub.Observability.Logger;
4+
5+
public interface ILogService : IService
46
{
57
void Debug(string message, object? data = null);
68
void Info(string message, object? data = null);

TaskHub.Observability.Logger.Serilog/LogService.cs renamed to TaskHub.Observability.Logger/LogService.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using Serilog;
22
using Serilog.Events;
3-
using TaskHub.Observability.Logger.Abstractions;
43

5-
namespace TaskHub.Observability.Logger.Serilog;
4+
namespace TaskHub.Observability.Logger;
65

7-
public sealed class LogService() : ILogService
6+
public sealed class LogService : ILogService
87
{
98
private readonly ILogger _log = Log.ForContext<LogService>();
109

‎TaskHub.Observability.Logger/SerilogBoostrap.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using Microsoft.Extensions.Hosting;
2+
using Serilog;
3+
4+
namespace TaskHub.Observability.Logger;
5+
6+
public static class SerilogBoostrap
7+
{
8+
public static IHostBuilder AddAppSerilog(this IHostBuilder host) =>
9+
host.UseSerilog((ctx, lc) => lc.ReadFrom.Configuration(ctx.Configuration));
10+
}

TaskHub.Observability.Logger.Serilog/TaskHub.Observability.Logger.Serilog.csproj renamed to TaskHub.Observability.Logger/TaskHub.Observability.Logger.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
11+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
1112
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.1" />
1213
</ItemGroup>
1314

1415
<ItemGroup>
15-
<ProjectReference Include="..\TaskHub.Observability.Logging.Abstractions\TaskHub.Observability.Logger.Abstractions.csproj" />
16+
<ProjectReference Include="..\TaskHub.Shared.Services.Abstractions\TaskHub.Shared.Services.Abstractions.csproj" />
1617
</ItemGroup>
1718

1819
</Project>

‎TaskHub.Observability.Logging.Abstractions/TaskHub.Observability.Logger.Abstractions.csproj‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)