align endpoint to java version

SkyAPM · Mar 11, 2024 · bd90243 · bd90243
1 parent 3fa62f4
commit bd90243
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/SkyApm.Diagnostics.AspNetCore/Handlers/DefaultHostingDiagnosticHandler.cs b/src/SkyApm.Diagnostics.AspNetCore/Handlers/DefaultHostingDiagnosticHandler.cs
@@ -53,7 +53,8 @@ public bool OnlyMatch(HttpContext request)
 
         public void BeginRequest(ITracingContext tracingContext, HttpContext httpContext)
         {
-            var context = tracingContext.CreateEntrySegmentContext(httpContext.Request.Path,
+            var context = tracingContext.CreateEntrySegmentContext(
+                httpContext.Request.Method.ToUpper() + ":" + httpContext.Request.Path,
                 new HttpRequestCarrierHeaderCollection(httpContext.Request));
             context.Span.SpanLayer = SpanLayer.HTTP;
             context.Span.Component = Common.Components.ASPNETCORE;
@@ -167,4 +168,4 @@ private string CollectBody(HttpContext httpContext, int lengthThreshold)
             }
         }
     }
-}
+}
diff --git a/src/SkyApm.Diagnostics.HttpClient/Handlers/DefaultRequestDiagnosticHandler.cs b/src/SkyApm.Diagnostics.HttpClient/Handlers/DefaultRequestDiagnosticHandler.cs
@@ -47,7 +47,7 @@ public bool OnlyMatch(HttpRequestMessage request)
 
         public void Handle(ITracingContext tracingContext, HttpRequestMessage request)
         {
-            var operationName = request.RequestUri.GetLeftPart(UriPartial.Path);
+            var operationName = request.RequestUri.GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.UriEscaped);
 
             var ignored = _httpClientDiagnosticConfig.IgnorePaths != null
                 && _httpClientDiagnosticConfig.IgnorePaths
@@ -115,4 +115,4 @@ private string CollectHeaders(HttpRequestMessage request, IEnumerable<string> ke
             return sb.ToString();
         }
     }
-}
+}