fix: fix errors (#356)

masastack · Sep 2, 2024 · 920e492 · 920e492
1 parent 6df0f72
commit 920e492
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 71 deletions.
diff --git a/src/Services/Masa.Alert.Service/Extensions/OpenTelemetryAlertExtensions.cs b/src/Services/Masa.Alert.Service/Extensions/OpenTelemetryAlertExtensions.cs
diff --git a/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj b/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj
@@ -59,4 +59,8 @@
 	  <ProjectReference Include="..\..\Infrastructure\Masa.Alert.Infrastructure.Middleware\Masa.Alert.Infrastructure.Middleware.csproj" />
 	  <ProjectReference Include="..\..\Infrastructure\Masa.Alert.NotificationService.Provider.Mc\Masa.Alert.NotificationService.Provider.Mc.csproj" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Extensions\" />
+	</ItemGroup>
 </Project>
diff --git a/src/Services/Masa.Alert.Service/Program.cs b/src/Services/Masa.Alert.Service/Program.cs
@@ -6,20 +6,15 @@
 await builder.Services.AddMasaStackConfigAsync(MasaStackProject.Alert, MasaStackApp.Service);
 var masaStackConfig = builder.Services.GetMasaStackConfig();
 
-builder.Services.AddAlertObservable(builder.Logging, () =>
+builder.Services.AddObservable(builder.Logging, new MasaObservableOptions
 {
-    return new MasaObservableOptions
-    {
-        ServiceNameSpace = builder.Environment.EnvironmentName,
-        ServiceVersion = masaStackConfig.Version,
-        ServiceName = masaStackConfig.GetServiceId(MasaStackProject.Alert),
-        Layer = masaStackConfig.Namespace,
-        ServiceInstanceId = builder.Configuration.GetValue<string>("HOSTNAME")
-    };
-}, () =>
-{
-    return masaStackConfig.OtlpUrl;
-});
+    ServiceNameSpace = builder.Environment.EnvironmentName,
+    ServiceVersion = masaStackConfig.Version,
+    ServiceName = masaStackConfig.GetServiceId(MasaStackProject.Alert),
+    Layer = masaStackConfig.Namespace,
+    ServiceInstanceId = builder.Configuration.GetValue<string>("HOSTNAME")!
+}
+, masaStackConfig.OtlpUrl, activitySources: new string[] { CheckAlarmRuleJob.ActivitySource.Name });
 
 builder.Services.AddDaprClient();
 var identityServerUrl = masaStackConfig.GetSsoDomain();

diff --git a/src/Services/Masa.Alert.Service/_Imports.cs b/src/Services/Masa.Alert.Service/_Imports.cs
@@ -31,7 +31,7 @@
 global using Masa.BuildingBlocks.Extensions.BackgroundJobs;
 global using Masa.BuildingBlocks.RulesEngine;
 global using Masa.BuildingBlocks.StackSdks.Auth.Contracts;
-global using Masa.BuildingBlocks.StackSdks.Auth.Contracts.Consts;
+global using Masa.BuildingBlocks.StackSdks.Config.Consts;
 global using Masa.Contrib.Caching.Distributed.StackExchangeRedis;
 global using Masa.Contrib.Configuration.ConfigurationApi.Dcc;
 global using Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore;