Update Grpc.Net.Client to use ActivitySource #2244

JamesNK · 2023-08-15T07:02:49Z

Addresses #2180

Use ActivitySource
Remove unused telemetry handler (no longer needed since the .NET 5 target is removed) and some using statements

JamesNK · 2023-08-15T07:04:59Z

re: open-telemetry/opentelemetry-dotnet#4695 (comment)

cc @tarekgh @noahfalk @eerhardt

Let me know if this fixes the issue or if more changes are required.

test/Grpc.Net.Client.Tests/DiagnosticsTests.cs

src/Grpc.Net.Client/Internal/GrpcCall.cs

tarekgh · 2023-08-15T15:50:07Z

    var diagnosticSourceEnabled = GrpcDiagnostics.DiagnosticListener.IsEnabled() &&

Is this the old way to check for DiagnosticSource? if so, I think this may need to use https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.activitysource.haslisteners?view=net-7.0 too? Or we keep this for compatability reason?

Refers to: src/Grpc.Net.Client/Internal/GrpcCall.cs:806 in 83d9037. [](commit_id = 83d9037, deletion_comment = False)

tarekgh · 2023-08-15T15:52:53Z

    var diagnosticSourceEnabled = GrpcDiagnostics.DiagnosticListener.IsEnabled() &&

All usage of diagnosticSourceEnabled need to be checked.

In reply to: 1679175015

Refers to: src/Grpc.Net.Client/Internal/GrpcCall.cs:806 in 83d9037. [](commit_id = 83d9037, deletion_comment = False)

src/Grpc.Net.Client/Internal/GrpcCall.cs

JamesNK · 2023-08-16T00:15:55Z

PR feedback applied.

src/Grpc.Net.Client/Internal/GrpcCall.cs

amcasey

Seems sensible (though I was a little surprised ActivitySource and deprecating .net 5 were in the same PR)

amcasey · 2023-08-17T20:57:32Z

src/Grpc.Net.Client/Internal/GrpcCall.cs

+
+            // ActivitySource only returns an activity if someone is listening.
+            // If we're at this point then we always want there to be an activity. Create the activity manually.
+            activity ??= new Activity(GrpcDiagnostics.ActivityName);


How come this one doesn't have an ActivityKind? Is Client the default?

The default is internal, but it can't be set when using the Activity ctor.

We can consider in the future release to add a constructor that can take a ActivityKind. I think this can help in such scenarios but still will not help older Grpc client versions that have already been released.

amcasey · 2023-08-17T20:59:50Z

test/Grpc.Net.Client.Tests/DiagnosticsTests.cs

@@ -176,6 +176,48 @@ public void DiagnosticListener_MakeCall_ActivityHasNameAndDuration()
        Assert.AreNotEqual(TimeSpan.Zero, activityDurationOnStop);
    }

+    [Test]
+    public void ActivitySource_MakeCall_ActivityHasNameAndDuration()


I'm assuming diagnosticSourceEnabled || Logger.IsEnabled(LogLevel.Critical) || Activity.Current != null is false and this test would fail without the change to GrpcCall.cs?

JamesNK · 2023-08-17T22:45:49Z

Seems sensible (though I was a little surprised ActivitySource and deprecating .net 5 were in the same PR)

.NET 5 was deprecated here #2021. This PR cleans up some left over files.

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [Google.Protobuf](https://togithub.com/protocolbuffers/protobuf) | nuget | patch | `3.24.2` -> `3.24.3` | | [Grpc.Net.Client](https://togithub.com/grpc/grpc-dotnet) | nuget | minor | `2.56.0` -> `2.57.0` | | [Testcontainers](https://dotnet.testcontainers.org/) ([source](https://togithub.com/testcontainers/testcontainers-dotnet)) | nuget | minor | `3.4.0` -> `3.5.0` | --- ### Release Notes <details> <summary>protocolbuffers/protobuf (Google.Protobuf)</summary> ### [`v3.24.3`](https://togithub.com/protocolbuffers/protobuf/compare/v3.24.2...v3.24.3) </details> <details> <summary>grpc/grpc-dotnet (Grpc.Net.Client)</summary> ### [`v2.57.0`](https://togithub.com/grpc/grpc-dotnet/releases/tag/v2.57.0) #### What's Changed - Start 2.57.x development cycle by [@jtattermusch](https://togithub.com/jtattermusch) in [grpc/grpc-dotnet#2227 - Validate Windows version when using WinHttpHandler by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2229 - Support infinite idle connection timeout values by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2231 - Improve BalancerAttributes debugging by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2235 - Update Grpc.Net.Client to remove ValueTask usage by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2222 - Update Newtonsoft.Json to 13.0.3 by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2219 - Consistently don't log message errors on cancellation by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2221 - Fix load balancing flaky test by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2223 - Improve comment in GrpcChannel for WinHttpHandler + OS validation by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2237 - Update OS version detection to get version directly from Windows by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2239 - Update implementation_comparison.md by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2240 - Update to use .NET 8 by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2021 - Bump semver from 6.3.0 to 6.3.1 in /testassets/InteropTestsGrpcWebWebsite/Tests by [@dependabot](https://togithub.com/dependabot) in [grpc/grpc-dotnet#2243 - Force yielding after awaiting CallTask to avoid holding onto locks by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2245 - Update Grpc.Net.Client to use ActivitySource by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2244 - Clear IAsyncStreamReader<T>.Current value before reading next value by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2248 - Upgrade QpsWorker to net8 by [@jtattermusch](https://togithub.com/jtattermusch) in [grpc/grpc-dotnet#2250 - Change subchannel ID to include a channel ID by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2253 - Update Grpc.Tools dependency to 2.57.0 by [@jtattermusch](https://togithub.com/jtattermusch) in [grpc/grpc-dotnet#2257 - Add transport status to subchannel picked log by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2261 - Reduce logger allocations by not using generic CreateLogger by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2256 - Update call debugger display to show status code by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2259 - Log socket lifetime when closing unusable sockets by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2258 - Fix unobserved exceptions with retries by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2255 - Change subchannel BalancerAddress when attributes change by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2228 - Fix connection bugs from BalancerAddress changes by [@JamesNK](https://togithub.com/JamesNK) in [grpc/grpc-dotnet#2265 - \[v2.57.x] Update version to 2.57.0-pre1 by [@jtattermusch](https://togithub.com/jtattermusch) in [grpc/grpc-dotnet#2266 - \[2.57.x] Update version to 2.57.0 by [@jtattermusch](https://togithub.com/jtattermusch) in [grpc/grpc-dotnet#2272 **Full Changelog**: grpc/grpc-dotnet@v2.56.0...v2.57.0 </details> <details> <summary>testcontainers/testcontainers-dotnet (Testcontainers)</summary> ### [`v3.5.0`](https://togithub.com/testcontainers/testcontainers-dotnet/releases/tag/3.5.0) [Compare Source](https://togithub.com/testcontainers/testcontainers-dotnet/compare/3.4.0...3.5.0) ### What's Changed #### 🚀 Features - feat: Allow MongoDb module configuration without credentials ([#983](https://togithub.com/testcontainers/testcontainers-dotnet/issues/983)) [@the-avid-engineer](https://togithub.com/the-avid-engineer) - feat: Add support for RSA private key (RsaPrivateCrtKeyParameters) TLS authentication with protected Docker daemon sockets ([#978](https://togithub.com/testcontainers/testcontainers-dotnet/issues/978)) [@zuntio](https://togithub.com/zuntio) - feat: Add InfluxDb module ([#975](https://togithub.com/testcontainers/testcontainers-dotnet/issues/975)) [@MelomanG](https://togithub.com/MelomanG) #### 🐛 Bug Fixes - fix: Do not pre pull Dockerfile build stages that do not correspond to base images ([#979](https://togithub.com/testcontainers/testcontainers-dotnet/issues/979)) [@HofmeisterAn](https://togithub.com/HofmeisterAn) #### 📖 Documentation - docs: Add documentation on enabling debug log messages for the default logger ([#991](https://togithub.com/testcontainers/testcontainers-dotnet/issues/991)) [@HofmeisterAn](https://togithub.com/HofmeisterAn) - docs: Add global Testcontainers header ([#967](https://togithub.com/testcontainers/testcontainers-dotnet/issues/967)) [@leocross](https://togithub.com/leocross) #### 🧹 Housekeeping - chore: Improve error message when Docker is not running ([#987](https://togithub.com/testcontainers/testcontainers-dotnet/issues/987)) [@0xced](https://togithub.com/0xced) - chore: Update BouncyCastle.Cryptography to 2.2.1 (previous Portable.BouncyCastle) ([#985](https://togithub.com/testcontainers/testcontainers-dotnet/issues/985)) [@jcmrva](https://togithub.com/jcmrva) - chore: Add User-Agent HTTP header to Docker.DotNet client ([#970](https://togithub.com/testcontainers/testcontainers-dotnet/issues/970)) [@eddumelendez](https://togithub.com/eddumelendez) - chore: Remove `CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT` env var ([#971](https://togithub.com/testcontainers/testcontainers-dotnet/issues/971)) [@eddumelendez](https://togithub.com/eddumelendez) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/cerbos/cerbos-sdk-net).  Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Oğuzhan Durgun <oguzhandurgun95@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

JamesNK added 3 commits August 15, 2023 14:24

Update Grpc.Net.Client to use ActivitySource

3507296

Fix tests

3181bfe

Comment

83d9037

JamesNK requested review from mgravell, ReubenBond, BrennanConroy and amcasey August 15, 2023 07:02

JamesNK mentioned this pull request Aug 15, 2023

[AOT] Remove usage of Linq.Expressions and especially lambda compilation open-telemetry/opentelemetry-dotnet#4695

Merged

4 tasks

eerhardt reviewed Aug 15, 2023

View reviewed changes

test/Grpc.Net.Client.Tests/DiagnosticsTests.cs Show resolved Hide resolved

src/Grpc.Net.Client/Internal/GrpcCall.cs Outdated Show resolved Hide resolved

tarekgh reviewed Aug 15, 2023

View reviewed changes

src/Grpc.Net.Client/Internal/GrpcCall.cs Outdated Show resolved Hide resolved

tarekgh reviewed Aug 15, 2023

View reviewed changes

src/Grpc.Net.Client/Internal/GrpcCall.cs Outdated Show resolved Hide resolved

noahfalk reviewed Aug 15, 2023

View reviewed changes

src/Grpc.Net.Client/Internal/GrpcCall.cs Outdated Show resolved Hide resolved

JamesNK added 2 commits August 16, 2023 07:45

PR feedback

d6858d3

Clean up

2dd142c

JamesNK commented Aug 16, 2023

View reviewed changes

src/Grpc.Net.Client/Internal/GrpcCall.cs Outdated Show resolved Hide resolved

Update src/Grpc.Net.Client/Internal/GrpcCall.cs

de688df

amcasey approved these changes Aug 17, 2023

View reviewed changes

JamesNK merged commit 89dd217 into grpc:master Aug 17, 2023
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Grpc.Net.Client to use ActivitySource #2244

Update Grpc.Net.Client to use ActivitySource #2244

JamesNK commented Aug 15, 2023 •

edited

JamesNK commented Aug 15, 2023

tarekgh commented Aug 15, 2023 •

edited

tarekgh commented Aug 15, 2023

JamesNK commented Aug 16, 2023 •

edited

amcasey left a comment

amcasey Aug 17, 2023

JamesNK Aug 17, 2023

tarekgh Aug 17, 2023

amcasey Aug 17, 2023

JamesNK Aug 17, 2023

JamesNK commented Aug 17, 2023

Update Grpc.Net.Client to use ActivitySource #2244

Update Grpc.Net.Client to use ActivitySource #2244

Conversation

JamesNK commented Aug 15, 2023 • edited

JamesNK commented Aug 15, 2023

tarekgh commented Aug 15, 2023 • edited

tarekgh commented Aug 15, 2023

JamesNK commented Aug 16, 2023 • edited

amcasey left a comment

Choose a reason for hiding this comment

amcasey Aug 17, 2023

Choose a reason for hiding this comment

JamesNK Aug 17, 2023

Choose a reason for hiding this comment

tarekgh Aug 17, 2023

Choose a reason for hiding this comment

amcasey Aug 17, 2023

Choose a reason for hiding this comment

JamesNK Aug 17, 2023

Choose a reason for hiding this comment

JamesNK commented Aug 17, 2023

JamesNK commented Aug 15, 2023 •

edited

tarekgh commented Aug 15, 2023 •

edited

JamesNK commented Aug 16, 2023 •

edited