Skip to content

Commit f81fd5a

Browse files
ActivityFactory init added.
1 parent c5348d5 commit f81fd5a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
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.1.30</Version>
7+
<Version>2.1.31</Version>
88
<Authors>Andrey Serdyuk</Authors>
99
<Company>TaskHub</Company>
1010
<PackageTags>#TaskHub</PackageTags>

TaskHub.Shared.Bootstraper/FullHostBuilder.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using TaskHub.Shared.Commands.Bus;
99
using TaskHub.Shared.Infrastructure.EfCore.Bootstrap;
1010
using TaskHub.Shared.OpenTelemetry;
11+
using TaskHub.Shared.Primitives.Observability;
1112
using TaskHub.Shared.Swagger;
1213

1314
namespace TaskHub.Shared.Bootstraper;
@@ -36,6 +37,7 @@ public async Task StartWith<TContext>(Action<HostOptions> action) where TContext
3637
var host = new BasicHostBuilder(args);
3738
host.Init(builder =>
3839
{
40+
ActivityFactory.Init(builder.Configuration["ServiceName"] ?? "--placeholder--");
3941
builder.Services.AddScoped<ICommandsBus, CommandsBus>();
4042
builder.Services.AddAppDbContext<TContext>(builder.Configuration, o => o.ConnectionString = options.ConnectionString);
4143
builder.AddAppAuthentication();

TaskHub.Shared.Bootstraper/Settings/AddOpenTelemetry.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ public static class AddOpenTelemetry
1010
public static void AddAppOpenTelemetry(this WebApplicationBuilder builder) => builder.Services.AddAppOpenTelemetry(options =>
1111
{
1212
var section = builder.Configuration.GetSection("OpenTelemetry");
13-
options.SourceName = section.GetString("SourceName");
14-
options.ServiceName = section.GetString("ServiceName");
13+
options.ServiceName = builder.Configuration["ServiceName"] ?? string.Empty;
1514
options.ServiceVersion = section.GetString("ServiceVersion");
1615
options.Endpoint = section.GetString("Endpoint");
1716
options.DbName = section.GetString("DbName");

TaskHub.Shared.OpenTelemetry/OpenTelemetryBootstrap.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void AddAppOpenTelemetry(this IServiceCollection services, Action<
2222
})
2323
.WithTracing(t => t
2424
.SetSampler(new AlwaysOnSampler())
25-
.AddSource(options.SourceName)
25+
.AddSource(options.ServiceName)
2626
.AddConsoleExporter()
2727
.AddProcessor(new PyroscopeSpanProcessor())
2828
.AddAspNetCoreInstrumentation(cntx =>
@@ -42,7 +42,7 @@ public static void AddAppOpenTelemetry(this IServiceCollection services, Action<
4242
cntx.Protocol = OtlpExportProtocol.Grpc;
4343
}))
4444
.WithMetrics(t => t
45-
.AddMeter(options.SourceName)
45+
.AddMeter(options.ServiceName)
4646
.AddAspNetCoreInstrumentation()
4747
.AddHttpClientInstrumentation()
4848
.AddRuntimeInstrumentation()

TaskHub.Shared.OpenTelemetry/OpenTelemetryOptions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public class OpenTelemetryOptions
66
public string DbName { get; set; } = string.Empty;
77
public string ServiceName { get; set; } = string.Empty;
88
public string ServiceVersion { get; set; } = string.Empty;
9-
public string SourceName { get; set; } = string.Empty;
109
public string Environment { get; set; } = string.Empty;
1110
public bool RecordException { get; set; } = false;
1211
public bool SetDbStatementForText { get; set; } = false;

TaskHub.Shared.Primitives/Observability/ActivityFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace TaskHub.Shared.Primitives.Observability;
44

5-
public class ActivitySourceFactory
5+
public class ActivityFactory
66
{
77
public static ActivitySource ActivitySource { get; private set; } = new("--placeholder--");
88
public static void Init(string sourceName) => ActivitySource = new(sourceName);

0 commit comments

Comments
 (0)