Skip to content

Commit 680b9d9

Browse files
committed
We always set HttpRoute to the same as AspNetCoreRoute, so we can just make it readonly
1 parent 303fb28 commit 680b9d9

6 files changed

Lines changed: 5 additions & 7 deletions

File tree

tracer/src/Datadog.Trace/DiagnosticListeners/AspNetCoreDiagnosticObserver.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ private static Span StartMvcCoreSpan(
404404
// these will already be set correctly
405405
rootSpanTags.AspNetCoreRoute = aspNetRoute;
406406
rootSpan.ResourceName = span.ResourceName;
407-
rootSpanTags.HttpRoute = aspNetRoute;
408407
}
409408

410409
return span;
@@ -575,7 +574,6 @@ private void OnRoutingEndpointMatched(object arg)
575574
{
576575
rootSpan.ResourceName = resourceName;
577576
tags.AspNetCoreRoute = normalizedRoute;
578-
tags.HttpRoute = normalizedRoute;
579577
}
580578

581579
_security.CheckPathParamsAndSessionId(httpContext, rootSpan, routeValues);

tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public override void SetTag(string key, string? value)
5555
AspNetCoreRoute = value;
5656
break;
5757
case "http.route":
58-
HttpRoute = value;
58+
Logger.Value.Warning("Attempted to set readonly tag {TagName} on {TagType}. Ignoring.", key, nameof(AspNetCoreTags));
5959
break;
6060
default:
6161
base.SetTag(key, value);

tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public override void SetTag(string key, string? value)
5555
AspNetCoreRoute = value;
5656
break;
5757
case "http.route":
58-
HttpRoute = value;
58+
Logger.Value.Warning("Attempted to set readonly tag {TagName} on {TagType}. Ignoring.", key, nameof(AspNetCoreTags));
5959
break;
6060
default:
6161
base.SetTag(key, value);

tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public override void SetTag(string key, string? value)
5555
AspNetCoreRoute = value;
5656
break;
5757
case "http.route":
58-
HttpRoute = value;
58+
Logger.Value.Warning("Attempted to set readonly tag {TagName} on {TagType}. Ignoring.", key, nameof(AspNetCoreTags));
5959
break;
6060
default:
6161
base.SetTag(key, value);

tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/TagListGenerator/AspNetCoreTags.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public override void SetTag(string key, string? value)
5555
AspNetCoreRoute = value;
5656
break;
5757
case "http.route":
58-
HttpRoute = value;
58+
Logger.Value.Warning("Attempted to set readonly tag {TagName} on {TagType}. Ignoring.", key, nameof(AspNetCoreTags));
5959
break;
6060
default:
6161
base.SetTag(key, value);

tracer/src/Datadog.Trace/Tagging/AspNetCoreTags.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ internal partial class AspNetCoreTags : WebTags
1919
public string AspNetCoreRoute { get; set; }
2020

2121
[Tag(Tags.HttpRoute)]
22-
public string HttpRoute { get; set; }
22+
public string HttpRoute => AspNetCoreRoute;
2323
}
2424
}

0 commit comments

Comments
 (0)