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

Jump to bottom

Update Grpc.Net.Client to use ActivitySource #2244

Merged
merged 6 commits into from
Aug 17, 2023
Merged

Update Grpc.Net.Client to use ActivitySource #2244

merged 6 commits into from
Aug 17, 2023

Conversation

JamesNK
Copy link
Member

@JamesNK JamesNK commented Aug 15, 2023 •
edited
Loading

Addresses #2180

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

@JamesNK
Copy link
Member Author

JamesNK commented Aug 15, 2023

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.

@JamesNK JamesNK mentioned this pull request Aug 15, 2023
Merged
4 tasks
@tarekgh
Copy link

tarekgh commented Aug 15, 2023 •
edited
Loading 

    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
Copy link

tarekgh commented Aug 15, 2023 

    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)

@JamesNK
Copy link
Member Author

JamesNK commented Aug 16, 2023 •
edited
Loading

PR feedback applied.

amcasey
amcasey approved these changes Aug 17, 2023
View reviewed changes
Copy link
Contributor

@amcasey amcasey left a comment

Choose a reason for hiding this comment

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

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

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);
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

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

Copy link

Choose a reason for hiding this comment

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

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.

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()
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes

@JamesNK
Copy link
Member Author

JamesNK commented Aug 17, 2023

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.

@JamesNK JamesNK merged commit 89dd217 into grpc:master Aug 17, 2023
2 checks passed
oguzhand95 referenced this pull request in cerbos/cerbos-sdk-net Sep 11, 2023
@renovate
chore(deps): Update .net deps (#100)
d383640 
[![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
[@&#8203;jtattermusch](https://togithub.com/jtattermusch) in
[https://github.com/grpc/grpc-dotnet/pull/2227](https://togithub.com/grpc/grpc-dotnet/pull/2227)
- Validate Windows version when using WinHttpHandler by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2229](https://togithub.com/grpc/grpc-dotnet/pull/2229)
- Support infinite idle connection timeout values by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2231](https://togithub.com/grpc/grpc-dotnet/pull/2231)
- Improve BalancerAttributes debugging by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2235](https://togithub.com/grpc/grpc-dotnet/pull/2235)
- Update Grpc.Net.Client to remove ValueTask usage by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2222](https://togithub.com/grpc/grpc-dotnet/pull/2222)
- Update Newtonsoft.Json to 13.0.3 by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2219](https://togithub.com/grpc/grpc-dotnet/pull/2219)
- Consistently don't log message errors on cancellation by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2221](https://togithub.com/grpc/grpc-dotnet/pull/2221)
- Fix load balancing flaky test by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2223](https://togithub.com/grpc/grpc-dotnet/pull/2223)
- Improve comment in GrpcChannel for WinHttpHandler + OS validation by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2237](https://togithub.com/grpc/grpc-dotnet/pull/2237)
- Update OS version detection to get version directly from Windows by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2239](https://togithub.com/grpc/grpc-dotnet/pull/2239)
- Update implementation_comparison.md by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2240](https://togithub.com/grpc/grpc-dotnet/pull/2240)
- Update to use .NET 8 by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2021](https://togithub.com/grpc/grpc-dotnet/pull/2021)
- Bump semver from 6.3.0 to 6.3.1 in
/testassets/InteropTestsGrpcWebWebsite/Tests by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/grpc/grpc-dotnet/pull/2243](https://togithub.com/grpc/grpc-dotnet/pull/2243)
- Force yielding after awaiting CallTask to avoid holding onto locks by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2245](https://togithub.com/grpc/grpc-dotnet/pull/2245)
- Update Grpc.Net.Client to use ActivitySource by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2244](https://togithub.com/grpc/grpc-dotnet/pull/2244)
- Clear IAsyncStreamReader<T>.Current value before reading next value by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2248](https://togithub.com/grpc/grpc-dotnet/pull/2248)
- Upgrade QpsWorker to net8 by
[@&#8203;jtattermusch](https://togithub.com/jtattermusch) in
[https://github.com/grpc/grpc-dotnet/pull/2250](https://togithub.com/grpc/grpc-dotnet/pull/2250)
- Change subchannel ID to include a channel ID by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2253](https://togithub.com/grpc/grpc-dotnet/pull/2253)
- Update Grpc.Tools dependency to 2.57.0 by
[@&#8203;jtattermusch](https://togithub.com/jtattermusch) in
[https://github.com/grpc/grpc-dotnet/pull/2257](https://togithub.com/grpc/grpc-dotnet/pull/2257)
- Add transport status to subchannel picked log by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2261](https://togithub.com/grpc/grpc-dotnet/pull/2261)
- Reduce logger allocations by not using generic CreateLogger by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2256](https://togithub.com/grpc/grpc-dotnet/pull/2256)
- Update call debugger display to show status code by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2259](https://togithub.com/grpc/grpc-dotnet/pull/2259)
- Log socket lifetime when closing unusable sockets by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2258](https://togithub.com/grpc/grpc-dotnet/pull/2258)
- Fix unobserved exceptions with retries by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2255](https://togithub.com/grpc/grpc-dotnet/pull/2255)
- Change subchannel BalancerAddress when attributes change by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2228](https://togithub.com/grpc/grpc-dotnet/pull/2228)
- Fix connection bugs from BalancerAddress changes by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2265](https://togithub.com/grpc/grpc-dotnet/pull/2265)
- \[v2.57.x] Update version to 2.57.0-pre1 by
[@&#8203;jtattermusch](https://togithub.com/jtattermusch) in
[https://github.com/grpc/grpc-dotnet/pull/2266](https://togithub.com/grpc/grpc-dotnet/pull/2266)
- \[2.57.x] Update version to 2.57.0 by
[@&#8203;jtattermusch](https://togithub.com/jtattermusch) in
[https://github.com/grpc/grpc-dotnet/pull/2272](https://togithub.com/grpc/grpc-dotnet/pull/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
([#&#8203;983](https://togithub.com/testcontainers/testcontainers-dotnet/issues/983))
[@&#8203;the-avid-engineer](https://togithub.com/the-avid-engineer)
- feat: Add support for RSA private key (RsaPrivateCrtKeyParameters) TLS
authentication with protected Docker daemon sockets
([#&#8203;978](https://togithub.com/testcontainers/testcontainers-dotnet/issues/978))
[@&#8203;zuntio](https://togithub.com/zuntio)
- feat: Add InfluxDb module
([#&#8203;975](https://togithub.com/testcontainers/testcontainers-dotnet/issues/975))
[@&#8203;MelomanG](https://togithub.com/MelomanG)

#### 🐛 Bug Fixes

- fix: Do not pre pull Dockerfile build stages that do not correspond to
base images
([#&#8203;979](https://togithub.com/testcontainers/testcontainers-dotnet/issues/979))
[@&#8203;HofmeisterAn](https://togithub.com/HofmeisterAn)

#### 📖 Documentation

- docs: Add documentation on enabling debug log messages for the default
logger
([#&#8203;991](https://togithub.com/testcontainers/testcontainers-dotnet/issues/991))
[@&#8203;HofmeisterAn](https://togithub.com/HofmeisterAn)
- docs: Add global Testcontainers header
([#&#8203;967](https://togithub.com/testcontainers/testcontainers-dotnet/issues/967))
[@&#8203;leocross](https://togithub.com/leocross)

#### 🧹 Housekeeping

- chore: Improve error message when Docker is not running
([#&#8203;987](https://togithub.com/testcontainers/testcontainers-dotnet/issues/987))
[@&#8203;0xced](https://togithub.com/0xced)
- chore: Update BouncyCastle.Cryptography to 2.2.1 (previous
Portable.BouncyCastle)
([#&#8203;985](https://togithub.com/testcontainers/testcontainers-dotnet/issues/985))
[@&#8203;jcmrva](https://togithub.com/jcmrva)
- chore: Add User-Agent HTTP header to Docker.DotNet client
([#&#8203;970](https://togithub.com/testcontainers/testcontainers-dotnet/issues/970))
[@&#8203;eddumelendez](https://togithub.com/eddumelendez)
- chore: Remove `CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT` env var
([#&#8203;971](https://togithub.com/testcontainers/testcontainers-dotnet/issues/971))
[@&#8203;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.

---

- [ ] <!-- rebase-check -->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).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lmolkova lmolkova lmolkova left review comments

@alanwest alanwest alanwest left review comments

@noahfalk noahfalk noahfalk left review comments

@eerhardt eerhardt eerhardt left review comments

@tarekgh tarekgh tarekgh left review comments

@reyang reyang reyang left review comments

@vishweshbankwar vishweshbankwar vishweshbankwar left review comments

@CodeBlanch CodeBlanch CodeBlanch left review comments

@amcasey amcasey amcasey approved these changes

@mgravell mgravell Awaiting requested review from mgravell

@ReubenBond ReubenBond Awaiting requested review from ReubenBond

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@JamesNK @tarekgh @lmolkova @alanwest @noahfalk @eerhardt @amcasey @reyang @vishweshbankwar @CodeBlanch