Skip to content

Commit dc18b2e

Browse files
bugs improvement
1 parent 4881426 commit dc18b2e

File tree

5 files changed

+33
-24
lines changed

5 files changed

+33
-24
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.3.16</Version>
7+
<Version>2.3.19</Version>
88
<Authors>Andrey Serdyuk</Authors>
99
<Company>TaskHub</Company>
1010
<Title>TaskHub.Shared - Reusable Primitives for .NET Microservices</Title>

TaskHub.Observability.OpenTelemetry/Bootstrap/OpenTelemetryBootstrap.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public static void AddAppOpenTelemetry(this IServiceCollection services, Action<
2222
t.AddAttributes([new("deployment.environment", options.Environment)]);
2323
}).WithTracing(t =>
2424
{
25+
t.AddSource("CommandsBus", "NominatimClient", "NominatimService");
26+
t.AddSource([.. options.Sources]);
27+
2528
if (options.Sampling.IsEnabled)
2629
{
2730
switch (options.Sampling.Type)
@@ -48,10 +51,6 @@ public static void AddAppOpenTelemetry(this IServiceCollection services, Action<
4851
t.SetSampler(new AlwaysOffSampler());
4952
}
5053

51-
t.SetSampler(new TraceIdRatioBasedSampler(0.1f));
52-
t.AddSource("CommandsBus", "NominatimClient", "NominatimService");
53-
t.AddSource([.. options.Sources]);
54-
5554
if (options.IsHttpTracesEnabled) t.AddHttpClientInstrumentation(o =>
5655
{
5756
o.RecordException = options.RecordException;

TaskHub.Shared.Bootstraper.Full/FullHostBuilder.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ protected override void AppStart()
4949
{
5050
Builder.Configuration.GetSection("OpenTelemetry").Bind(o);
5151

52-
var appInfo = Builder.Configuration.GetSection("ServiceInfo").Get<ServiceInfo>() ?? new();
53-
o.ServiceName = appInfo.Name;
54-
o.ServiceVersion = appInfo.Version;
52+
o.ServiceName = Builder.Services.ServiceInfo.Name;
53+
o.ServiceVersion = Builder.Services.ServiceInfo.Version;
5554
});
5655
Builder.Services.AddAppRedis(Builder.Configuration.GetSection("Redis").Bind);
5756
Builder.Services.AddAppSwagger(Builder.Configuration.GetSection("Swagger").Bind);

TaskHub.Shared.Networking.Implementation/Bootstrap/AppHttpClient.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public static void AddAppNetworkingSettings(this IServiceCollection services, Ac
1616
{
1717
var settings = new NetworkOptions();
1818
action(settings);
19-
services.AddHttpClient();
20-
services.AddSingleton(settings.Defaults);
2119
foreach (var (name, node) in settings.Services)
2220
{
2321
services.AddAppHttpClient(name, settings.Defaults, new OptionsResolver(settings.Defaults, node).Resolve());
Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,40 @@
11
using Microsoft.Extensions.DependencyInjection;
2+
using System.Diagnostics.CodeAnalysis;
23
using System.Reflection;
34
using TaskHub.Shared.Refactoring.Models;
45

56
namespace TaskHub.Shared.Refactoring.Bootstrap;
67

8+
[SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
9+
[SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>")]
710
public static class ServiceInfoBootsrap
811
{
9-
public static void AddServiceInfo(this IServiceCollection services)
12+
13+
private static ServiceInfo serviceInfo { get; set; } = null!;
14+
extension(IServiceCollection services)
1015
{
11-
var asm = Assembly.GetEntryAssembly()!;
12-
var asmName = asm.GetName();
13-
services.AddSingleton(new ServiceInfo
16+
17+
public ServiceInfo ServiceInfo => serviceInfo;
18+
19+
public void AddServiceInfo()
1420
{
15-
Name = asmName.Name ?? AppDomain.CurrentDomain.FriendlyName,
16-
Version = asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? asmName.Version?.ToString() ?? "unknown",
17-
VersionDotNet = Environment.Version.ToString()
18-
});
19-
}
21+
var asm = Assembly.GetEntryAssembly()!;
22+
var asmName = asm.GetName();
23+
serviceInfo = new ServiceInfo
24+
{
25+
Name = asmName.Name ?? AppDomain.CurrentDomain.FriendlyName,
26+
Version = asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? asmName.Version?.ToString() ?? "unknown",
27+
VersionDotNet = Environment.Version.ToString()
28+
};
2029

21-
public static void AppAppServiceInfo(this IServiceCollection services, Action<ServiceInfo> action)
22-
{
23-
var settings = new ServiceInfo();
24-
action(settings);
25-
services.AddSingleton(settings);
30+
services.AddSingleton(serviceInfo);
31+
}
32+
33+
public void AppAppServiceInfo(Action<ServiceInfo> action)
34+
{
35+
serviceInfo = new ServiceInfo();
36+
action(serviceInfo);
37+
services.AddSingleton(serviceInfo);
38+
}
2639
}
2740
}

0 commit comments

Comments
 (0)