lith 5 anos atrás
pai
commit
bce5547785

+ 4 - 2
dotnet/Sers/Sers.ServiceCenter/Sers.Gover.Zipkin/Extensions/ZipkinExtensions.cs

@@ -92,8 +92,7 @@ namespace Vit.Extensions
 
             trace.Record(Annotations.ClientSend());
             trace.Record(Annotations.Rpc("ServiceCenter"));
-            trace.Record(Annotations.ServiceName(rpcData.apiStationName_Get()));
-            trace.Record(Annotations.Tag("http.path", rpcData.route));
+            trace.Record(Annotations.ServiceName(rpcData.apiStationName_Get()));          
             trace.Record(Annotations.Tag("http.url", rpcData.http_url_Get()));
             trace.Record(Annotations.Tag("http.method", rpcData.http_method_Get()));
 
@@ -111,6 +110,9 @@ namespace Vit.Extensions
 
 
             return (s, apiReplyMessage) => {
+
+                //gover会在内部把route处理为真正的route名称
+                trace.Record(Annotations.Tag("http.path", rpcData.route));
                 trace.Record(Annotations.ClientRecv()); 
             };
         }

+ 22 - 21
dotnet/Sers/Sers.ServiceCenter/Sers.Gover/Base/GoverManage.cs

@@ -108,6 +108,25 @@ namespace Sers.Gover.Base
         {
             try
             {
+                #region (x.0)ApiScopeEvent
+                apiScopeEventList?.ForEach(onScope =>
+                {
+                    try
+                    {
+                        var onDispose = onScope(rpcData, requestMessage);
+                        if (onDispose != null)
+                        {
+                            callback += onDispose;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Error(ex);
+                    }
+                });
+                #endregion
+
+
                 #region (x.1)route 判空               
                 if (string.IsNullOrWhiteSpace(rpcData.route))
                 {
@@ -188,32 +207,14 @@ namespace Sers.Gover.Base
                 }
 
 
-                //(x.2) 修正 requestMessage
+                //(x.x.2) 修正 requestMessage
                 if (requestMessage.rpcContextData_OriData.Count <= 0) {
                     requestMessage.RpcContextData_OriData_Set(rpcData);
                 }
-                #endregion
-
-                #region (x.8)ApiScopeEvent
-                apiScopeEventList?.ForEach(onScope =>
-                {
-                    try
-                    {
-                        var onDispose = onScope(rpcData, requestMessage);
-                        if (onDispose != null)
-                        {
-                            callback += onDispose;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error(ex);
-                    }
-                });
-                #endregion
+                #endregion             
 
 
-                #region (x.9)服务调用
+                #region (x.8)服务调用
                 apiNode.CallApiAsync(rpcData, requestMessage, sender,callback);                
                 #endregion