fix: update trace detai prev & next, update package version

masastack · Jul 17, 2023 · 790bb2b · 790bb2b
1 parent cca1b54
commit 790bb2b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 20 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <MasaFrameworkPackageVersion>1.0.0-rc.3.4</MasaFrameworkPackageVersion>
+    <MasaFrameworkPackageVersion>1.0.0-rc.4.4</MasaFrameworkPackageVersion>
   </PropertyGroup>  
 </Project>
diff --git a/src/Contracts/Masa.Tsc.Contracts.Admin/Masa.Tsc.Contracts.Admin.csproj b/src/Contracts/Masa.Tsc.Contracts.Admin/Masa.Tsc.Contracts.Admin.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="Masa.Contrib.Configuration.ConfigurationApi.Dcc" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Auth" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Pm" Version="$(MasaFrameworkPackageVersion)" />
-		<PackageReference Include="Masa.Utils.Data.Prometheus" Version="$(MasaFrameworkPackageVersion)" />
+		<PackageReference Include="Masa.Utils.Data.Prometheus" Version="$(MasaFrameworkPackageVersion)" />		
 		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Util.Reflection" Version="1.0.3" />
 	</ItemGroup>

diff --git a/src/Services/Masa.Tsc.Service.Admin/Extensions/AddTraceLogExtenstion.cs b/src/Services/Masa.Tsc.Service.Admin/Extensions/AddTraceLogExtenstion.cs
@@ -18,7 +18,10 @@ public static IServiceCollection AddTraceLog(this IServiceCollection services, s
             var config = client.GetAsync<AppSettingConfiguration>(ConfigConst.ConfigRoot, ValueChanged).ConfigureAwait(false).GetAwaiter().GetResult();
             ConfigConst.SetConfiguration(config);
         }
-        catch { }
+        catch(Exception ex)
+        {
+            Console.WriteLine(ex);
+        }
         return services.AddElasticClientLogAndTrace(elasticsearchUrls, ConfigConst.LogIndex, ConfigConst.TraceIndex);
     }
 

diff --git a/src/Services/Masa.Tsc.Service.Admin/Masa.Tsc.Service.Admin.csproj b/src/Services/Masa.Tsc.Service.Admin/Masa.Tsc.Service.Admin.csproj
@@ -22,6 +22,7 @@
 		<PackageReference Include="Masa.Utils.Data.Prometheus" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Tsc.Elasticsearch" Version="$(MasaFrameworkPackageVersion)" />
+		<PackageReference Include="Masa.Contrib.StackSdks.Tsc.OpenTelemetry" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Dcc" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.Dispatcher.IntegrationEvents.Dapr" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.ReadWriteSplitting.Cqrs" Version="$(MasaFrameworkPackageVersion)" />

diff --git a/...a.Tsc.Web.Admin.Rcl/Components/Dashboards/Configurations/Panel/Trace/TscTraceDetail.razor b/...a.Tsc.Web.Admin.Rcl/Components/Dashboards/Configurations/Panel/Trace/TscTraceDetail.razor
@@ -108,7 +108,7 @@
         {
             var detail = _activeTreeItem.ToDictionary(nameof(TraceResponseTree.Children), nameof(TraceResponseTree.Attributes), nameof(TraceResponseTree.Resource), nameof(TraceResponseTree.Timelines), nameof(TraceResponseTree.Level), nameof(TraceResponseTree.Duration));
             <div class="pa-12">
-                <MList Flat Class="mb-4 rounded tracedetail" style="width:334px">
+                <MList Flat Class="mb-4 rounded tracedetail" style="width:382px">
                     <MListItem>
                         <MListItemContent>
                             <MListItemTitle>
@@ -141,9 +141,9 @@
                                     </div>
                                     @if (!string.Equals(target, "- -"))
                                     {
-                                        <div class="d-flex flex-row col-6 justify-end">
-                                            <span class="flex-column my-2" style="cursor:pointer" @onclick="async ()=>await NextAsync(false)"> 上一条</span>
-                                            <span class="flex-column my-2 ml-4" style="cursor:pointer" @onclick="async ()=>await NextAsync()">下一条</span>
+                                        <div class="d-flex flex-row col-6 justify-space-between">
+                                            <MButton Class="flex-column pa-0" MinWidth="32"> <SIcon @onclick="async ()=>await NextAsync(false)" Size="32" Tooltip="@I18n.Trace("Prev")">mdi-chevron-left</SIcon></MButton>
+                                            <MButton Class="flex-column pa-0 ml-4" MinWidth="32"><SIcon @onclick="async ()=>await NextAsync()" Size="32" Tooltip="@I18n.Trace("Next")">mdi-chevron-right</SIcon></MButton>
                                         </div>
                                     }
                                 </div>
@@ -220,7 +220,7 @@
             if (int.TryParse(statusCode, out var code) && _errorStatus.Contains(code))
             {
                 labelDictionary.TryAdd("ERROR", "#FFDBDC");
-            }           
+            }
         }
 
         foreach (var dic in labelDictionary)

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Masa.Tsc.Web.Admin.Rcl.csproj b/src/Web/Masa.Tsc.Web.Admin.Rcl/Masa.Tsc.Web.Admin.Rcl.csproj
@@ -14,8 +14,7 @@
 		<PackageReference Include="Humanizer.Core" Version="2.14.1" />
 		<PackageReference Include="Humanizer.Core.zh-CN" Version="2.14.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
-		<PackageReference Include="Masa.Contrib.StackSdks.Tsc" Version="$(MasaFrameworkPackageVersion)" />
-		<PackageReference Include="Masa.Stack.Components" Version="0.0.397" />
+		<PackageReference Include="Masa.Stack.Components" Version="0.0.412" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.3" />
 	</ItemGroup>
 

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json b/src/Web/Masa.Tsc.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json
@@ -200,7 +200,9 @@
     "Resource": "资源",
     "Detail": "详情",
     "serviceName and url must not empty": "服务名称和Ur不能为空",
-    "no more data": "没有更多的数据了"
+    "no more data": "没有更多的数据了",
+    "Prev": "上一条",
+    "Next": "下一条"
   },
   "Log": {
     "Log": "日志",

diff --git a/src/Web/Masa.Tsc.Web.Admin.Server/Masa.Tsc.Web.Admin.Server.csproj b/src/Web/Masa.Tsc.Web.Admin.Server/Masa.Tsc.Web.Admin.Server.csproj
@@ -9,6 +9,7 @@
 		<PackageReference Include="IdentityModel" Version="6.1.0-preview.1" />
 		<PackageReference Include="Masa.Contrib.Development.DaprStarter.AspNetCore" Version="$(MasaFrameworkPackageVersion)" />
 		<PackageReference Include="Masa.Contrib.Isolation.MultiEnvironment" Version="$(MasaFrameworkPackageVersion)" />
+		<PackageReference Include="Masa.Contrib.StackSdks.Config" Version="$(MasaFrameworkPackageVersion)" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\ApiGateways\Masa.Tsc.ApiGateways.Caller\Masa.Tsc.ApiGateways.Caller.csproj" />

diff --git a/src/Web/Masa.Tsc.Web.Admin.Server/Program.cs b/src/Web/Masa.Tsc.Web.Admin.Server/Program.cs
@@ -29,15 +29,6 @@
         options.CheckCertificateRevocation = false;
     });
 });
-
-builder.Services.AddObservable(builder.Logging, new MasaObservableOptions
-{
-    ServiceNameSpace = builder.Environment.EnvironmentName,
-    ServiceVersion = masaStackConfig.Version,
-    ServiceName = masaStackConfig.GetWebId(MasaStackProject.TSC),
-    Layer = masaStackConfig.Namespace,
-    ServiceInstanceId = builder.Configuration.GetValue<string>("HOSTNAME")
-}, masaStackConfig.OtlpUrl, true);
 MasaOpenIdConnectOptions masaOpenIdConnectOptions = new()
 {
     Authority = masaStackConfig.GetSsoDomain(),