Skip to content
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

GrpcNetClient Instrumentation to leverage native Activity Status. #3569

Merged
merged 5 commits into from
Aug 12, 2022
Merged

GrpcNetClient Instrumentation to leverage native Activity Status. #3569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b67319
initial
Yun-Ting Aug 11, 2022
a7e370b
Merge branch 'main' into yunl/gRPC
Yun-Ting Aug 11, 2022
5fb69b7
Merge branch 'main' into yunl/gRPC
Yun-Ting Aug 11, 2022
a8d8640
changelog
Yun-Ting Aug 11, 2022
6649953
Merge branch 'main' into yunl/gRPC
cijothomas Aug 12, 2022
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
5 changes: 5 additions & 0 deletions src/OpenTelemetry.Instrumentation.GrpcNetClient/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

* Updated to use Activity native support from `System.Diagnostics.DiagnosticSource`
to set activity status.
([#3118](https://github.com/open-telemetry/opentelemetry-dotnet/issues/3118))
([#3569](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3569))

## 1.0.0-rc9.5

Released 2022-Aug-02
Expand Down
8 changes: 4 additions & 4 deletions src/OpenTelemetry.Instrumentation.GrpcNetClient/GrpcTagHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@ public static bool TryParseRpcServiceAndRpcMethod(string grpcMethod, out string
/// </summary>
/// <param name="statusCode">RPC status code.</param>
/// <returns>Resolved span <see cref="Status"/> for the Grpc status code.</returns>
public static Status ResolveSpanStatusForGrpcStatusCode(int statusCode)
public static ActivityStatusCode ResolveSpanStatusForGrpcStatusCode(int statusCode)
{
var status = Status.Error;
var status = ActivityStatusCode.Error;

if (typeof(StatusCanonicalCode).IsEnumDefined(statusCode))
{
status = ((StatusCanonicalCode)statusCode) switch
{
StatusCanonicalCode.Ok => Status.Unset,
_ => Status.Error,
StatusCanonicalCode.Ok => ActivityStatusCode.Unset,
_ => ActivityStatusCode.Error,
};
}

Expand Down
2 changes: 1 addition & 1 deletion ...penTelemetry.Instrumentation.GrpcNetClient/Implementation/GrpcClientDiagnosticListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public override void OnStopActivity(Activity activity, object payload)
bool validConversion = GrpcTagHelper.TryGetGrpcStatusCodeFromActivity(activity, out int status);
if (validConversion)
{
if (activity.GetStatus().StatusCode == StatusCode.Unset)
if (activity.Status == ActivityStatusCode.Unset)
{
activity.SetStatus(GrpcTagHelper.ResolveSpanStatusForGrpcStatusCode(status));
}
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTagHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void GrpcTagHelper_GetGrpcStatusCodeFromActivity()
var statusCode = GrpcTagHelper.ResolveSpanStatusForGrpcStatusCode(status);
activity.SetTag(SemanticConventions.AttributeRpcGrpcStatusCode, status);

Assert.Equal(StatusCode.Unset, statusCode.StatusCode);
Assert.Equal(ActivityStatusCode.Unset, statusCode);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

surprised that we had no tests with status being Error?

Assert.Equal(status, activity.GetTagValue(SemanticConventions.AttributeRpcGrpcStatusCode));
}

Expand Down