Support google.golang.org/grpc v1.69.0 #1431
Open
+677
−109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MrAlias
force-pushed
the
grpc-1.69.0
branch
3 times, most recently
from
0149c1c to
0018d16
Compare
MrAlias
changed the title
1 task
1 task
MrAlias
force-pushed
the
grpc-1.69.0
branch
2 times, most recently
from
1a3e07f to
6d97cc2
Compare
RonFed
reviewed
Dec 17, 2024
internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf/probe.bpf.c
Outdated
Show resolved
Hide resolved
internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/probe.go
Outdated
Show resolved
Hide resolved
internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf/probe.bpf.c
Outdated
Show resolved
Hide resolved
internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/bpf/probe.bpf.c
Outdated
Show resolved
Hide resolved
Replace the Optional field with a more expressive FailureMode and the addition of PackageConstrainsts to restrict when the uprobe should be loaded.
The handleStream function supports grpc < 1.40.0. Reuse the serverStream const for all constraints.
I was tracking that work in #1442. I was unsure if we wanted to add it here as this PR is already quite large. I can add it as a follow up, and even add it in a branch based on this branch to validate this will work. Or, I can just add it to this PR. What is your preference @RonFed? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve #1421
Resolve #1432
In
google.golang.org/grpcv1.69.0thehttp2Server.writeStatusandServer.handleStreammethod signatures changed:http2Server.writeStatusv1.68.1: https://github.com/grpc/grpc-go/blob/d6a777f952c77822f0190dff71b1fe8fe250538c/internal/transport/http2_server.go#L1049v1.69.0: https://github.com/grpc/grpc-go/blob/317271b232677b7869576a49855b01b9f4775d67/internal/transport/http2_server.go#L1045Server.handleStreamv1.68.1: https://github.com/grpc/grpc-go/blob/d6a777f952c77822f0190dff71b1fe8fe250538c/server.go#L1741v1.69.0: https://github.com/grpc/grpc-go/blob/317271b232677b7869576a49855b01b9f4775d67/server.go#L1735In both cases, they are now passed
*transport.ServerStreaminstead of*transport.Stream. Thev1.69.0version oftransport.Streamhasn't changed, just how it is referenced. Inv1.69.0the*Streamis embedded inServerStream.This PR handles this divergence and support both code paths.
Split uprobes
To reduce complexity of the uprobes by adding another
volatileflag variable, this splits functionality of the uprobes. A newPackageConstraintsfield is added to theprobe.Uprobeto provide scope of when the probe should be loaded and the behavior when it is not loaded.This "behavior when not loaded" concept overlaps with then already existing
Optionalfield of theProbe. This is replace with a more customizableFailureModetype that describes the behavior.The common functionality of the uprobes are abstracted to inlined functions.
Event type updates
The event type now reports if the status was set.
Go context parsing
The Go
context.Contextis held within theStream.ctxfield. This is not directly accessible via passed arguments of the instrumented methods; it is only accessable viaServerStream.Stream.ctx, there is an added level of indirection. This added level of indirection means for the updated code paths our header file functionality is not used.google.golang.org/grpcv1.68.1This was manually tested against
google.golang.org/grpcv1.68.1by downgrading the version ofgrpcused in our e2e tests and tested.