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

[instrumentation/google.golang.org/grpc/otelgrpc] Do not assume HandleRPC receives a gRPCContext #4825

Merged
merged 8 commits into from
Jan 18, 2024
Merged

[instrumentation/google.golang.org/grpc/otelgrpc] Do not assume HandleRPC receives a gRPCContext #4825

merged 8 commits into from
Jan 18, 2024

Commits on Jan 17, 2024

  1. [instrumentation/google.golang.org/grpc/otelgrpc] Add safeguard to Ha… 

    …ndleRPC

To help prevent crashes such as open-telemetry/opentelemetry-collector/issues/9296, check if the context is nil before proceeding.

This is inspired by: https://github.com/grpc/grpc-go/blob/ddd377f19841eae70862559c854d957d61b3b692/stats/opencensus/opencensus.go#L204-L207
    @mx-psi
    mx-psi committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    bbff530 View commit details
    Browse the repository at this point in the history

  2. Add changelog entry

    @mx-psi
    mx-psi committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    d263c04 View commit details
    Browse the repository at this point in the history

  3. Create and handle error

    @mx-psi
    mx-psi committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    d67730c View commit details
    Browse the repository at this point in the history

  4. Make check a bit more clear

    @mx-psi
    mx-psi committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    377c541 View commit details
    Browse the repository at this point in the history

  5. Update instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go 

    Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
    @mx-psi @Aneurysm9
    mx-psi and Aneurysm9 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a4c3363 View commit details
    Browse the repository at this point in the history

  6. Remove unused code

    @mx-psi
    mx-psi committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    60fbb4e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Merge remote-tracking branch 'upstream/main' into mx-psi/grpc-safeguard

    @mx-psi
    mx-psi committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    2eb2a49 View commit details
    Browse the repository at this point in the history

  2. additional check for gctx

    @mx-psi
    mx-psi committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    9be483c View commit details
    Browse the repository at this point in the history