From 920e492bfde6ba7bb8b6054896f5ab236974a254 Mon Sep 17 00:00:00 2001
From: Qinyouzeng <102203523+Qinyouzeng@users.noreply.github.com>
Date: Mon, 2 Sep 2024 09:10:01 +0800
Subject: [PATCH] fix: fix errors (#356)

---
 .../OpenTelemetryAlertExtensions.cs           | 57 -------------------
 .../Masa.Alert.Service.Admin.csproj           |  4 ++
 src/Services/Masa.Alert.Service/Program.cs    | 21 +++----
 src/Services/Masa.Alert.Service/_Imports.cs   |  2 +-
 4 files changed, 13 insertions(+), 71 deletions(-)
 delete mode 100644 src/Services/Masa.Alert.Service/Extensions/OpenTelemetryAlertExtensions.cs

diff --git a/src/Services/Masa.Alert.Service/Extensions/OpenTelemetryAlertExtensions.cs b/src/Services/Masa.Alert.Service/Extensions/OpenTelemetryAlertExtensions.cs
deleted file mode 100644
index 60f9989..0000000
--- a/src/Services/Masa.Alert.Service/Extensions/OpenTelemetryAlertExtensions.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) MASA Stack All rights reserved.
-// Licensed under the Apache License. See LICENSE.txt in the project root for license information.
-
-using OpenTelemetry.Logs;
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Resources;
-using OpenTelemetry.Trace;
-
-namespace Microsoft.Extensions.DependencyInjection;
-
-public static class OpenTelemetryAlertExtensions
-{
-    public static IServiceCollection AddAlertObservable(this IServiceCollection services,
-       ILoggingBuilder loggingBuilder,
-       Func<MasaObservableOptions> optionsConfigure,
-       Func<string>? otlpUrlConfigure = null)
-    {
-        var options = optionsConfigure();
-        var otlpUrl = otlpUrlConfigure?.Invoke() ?? string.Empty;
-
-        ArgumentNullException.ThrowIfNull(options);
-
-        Uri? uri = null;
-        if (!string.IsNullOrEmpty(otlpUrl) && !Uri.TryCreate(otlpUrl, UriKind.Absolute, out uri))
-            throw new UriFormatException($"{nameof(otlpUrl)}:{otlpUrl} is invalid url");
-
-        var resources = ResourceBuilder.CreateDefault().AddMasaService(options);
-        loggingBuilder.AddMasaOpenTelemetry(builder =>
-        {
-            builder.SetResourceBuilder(resources);
-            builder.AddOtlpExporter(otlp => otlp.Endpoint = uri);
-        });
-
-        services.AddMasaMetrics(builder =>
-        {
-            builder.SetResourceBuilder(resources);
-            builder.AddOtlpExporter(options =>
-            {
-                options.Endpoint = uri;
-            });
-        });
-
-        services.AddMasaTracing(
-            builder =>
-            {
-                builder.SetResourceBuilder(resources);
-                builder.AddOtlpExporter(options => options.Endpoint = uri);
-                builder.AddSource(CheckAlarmRuleJob.ActivitySource.Name);
-            },
-            builder =>
-            {
-                builder.AspNetCoreInstrumentationOptions.AppendDefaultFilter(builder, false);
-            });
-
-        return services;
-    }
-}
\ No newline at end of file
diff --git a/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj b/src/Services/Masa.Alert.Service/Masa.Alert.Service.Admin.csproj
index 2496a0d..50d36cb 100644
--- 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
index 581af44..5007b9f 100644
--- 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
index 8866734..93e1b55 100644
--- 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;