Skip to content

[ASP.NET Core] update network.protocol.version values as per spec #5007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 10, 2023
Merged

[ASP.NET Core] update network.protocol.version values as per spec #5007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6ca710
[ASP.NET Core] Fix network.protocol.version
Oct 30, 2023
fb29f12
fix test
Oct 30, 2023
0f58faf
Merge branch 'main' into vibankwa/fix-network-protocol-version-aspnet…
vishweshbankwar Nov 1, 2023
01f2d27
Merge branch 'main' into vibankwa/fix-network-protocol-version-aspnet…
Nov 9, 2023
d213928
Merge branch 'vibankwa/fix-network-protocol-version-aspnetcore' of ht…
Nov 9, 2023
9d65736
Add changelog
Nov 9, 2023
aa9c92f
indent
Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ exception. The attribute value will be set to full name of exception type.
environment variable is set to `http` or `http/dup`.
([#4986](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4986))

* Fixed `network.protocol.version` attribute values to match the specification.
([#5007](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5007))

## 1.6.0-beta.2

Released 2023-Oct-26
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpTagHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public static string GetFlavorTagValueFromProtocol(string protocol)
switch (protocol)
{
case "HTTP/2":
return "2.0";
return "2";

case "HTTP/3":
return "3.0";
return "3";

case "HTTP/1.1":
return "1.1";
Expand Down
4 changes: 2 additions & 2 deletions test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public void GrpcAspNetCoreInstrumentationAddsCorrectAttributes_New(bool? enableG
Assert.Equal("POST", activity.GetTagValue(SemanticConventions.AttributeHttpRequestMethod));
Assert.Equal("http", activity.GetTagValue(SemanticConventions.AttributeUrlScheme));
Assert.Equal("/greet.Greeter/SayHello", activity.GetTagValue(SemanticConventions.AttributeUrlPath));
Assert.Equal("2.0", activity.GetTagValue(SemanticConventions.AttributeNetworkProtocolVersion));
Assert.Equal("2", activity.GetTagValue(SemanticConventions.AttributeNetworkProtocolVersion));
Assert.StartsWith("grpc-dotnet", activity.GetTagValue(SemanticConventions.AttributeUserAgentOriginal) as string);
}

Expand Down Expand Up @@ -292,7 +292,7 @@ public void GrpcAspNetCoreInstrumentationAddsCorrectAttributes_Dupe(bool? enable
Assert.Equal("POST", activity.GetTagValue(SemanticConventions.AttributeHttpRequestMethod));
Assert.Equal("http", activity.GetTagValue(SemanticConventions.AttributeUrlScheme));
Assert.Equal("/greet.Greeter/SayHello", activity.GetTagValue(SemanticConventions.AttributeUrlPath));
Assert.Equal("2.0", activity.GetTagValue(SemanticConventions.AttributeNetworkProtocolVersion));
Assert.Equal("2", activity.GetTagValue(SemanticConventions.AttributeNetworkProtocolVersion));
Assert.StartsWith("grpc-dotnet", activity.GetTagValue(SemanticConventions.AttributeUserAgentOriginal) as string);
}

Expand Down