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.

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

fix: kafka consumer parenting logic #11653

Merged
merged 6 commits into from
Dec 11, 2024
Merged

Conversation

wconti27
Copy link
Contributor

@wconti27 wconti27 commented Dec 10, 2024

Fixes bug where Kafka consumer was creating unparented spans when consuming a message with no context present.

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

@wconti27 wconti27 requested review from a team as code owners December 10, 2024 15:08
Copy link
Contributor

github-actions bot commented Dec 10, 2024

CODEOWNERS have been resolved as:

releasenotes/notes/fix-kafka-consumer-parenting-29acfd08e05d2350.yaml   @DataDog/apm-python
ddtrace/contrib/internal/kafka/patch.py                                 @DataDog/apm-core-python @DataDog/apm-idm-python
tests/contrib/kafka/test_kafka.py                                       @DataDog/apm-core-python @DataDog/apm-idm-python

@pr-commenter
Copy link

pr-commenter bot commented Dec 10, 2024

Benchmarks

Benchmark execution time: 2024-12-11 23:07:14

Comparing candidate commit 04ab9c1 in PR branch conti/fix-kafka-consumer-parenting with baseline commit 9ba734f in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 394 metrics, 2 unstable metrics.

Copy link
Collaborator

@emmettbutler emmettbutler left a comment

Choose a reason for hiding this comment

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

This could use a regression test and a release note

@wconti27 wconti27 requested a review from a team as a code owner December 10, 2024 20:47
@wconti27 wconti27 self-assigned this Dec 11, 2024
@wconti27
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Dec 11, 2024

Devflow running: /merge

View all feedbacks in Devflow UI.


2024-12-11 17:12:59 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 31m.


2024-12-11 19:13:25 UTCMergeQueue: The build pipeline has timeout

The merge request has been interrupted because the build took longer than expected. The current limit for the base branch 'main' is 120 minutes.

Possible reasons:

  • some mandatory checkruns are failing:
    • require-checklist

@wconti27 wconti27 enabled auto-merge (squash) December 11, 2024 22:55
@wconti27 wconti27 merged commit 385d8e0 into main Dec 11, 2024
500 checks passed
@wconti27 wconti27 deleted the conti/fix-kafka-consumer-parenting branch December 11, 2024 23:13
github-actions bot pushed a commit that referenced this pull request Dec 13, 2024
Fixes bug where Kafka consumer was creating unparented spans when
consuming a message with no context present.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: Emmett Butler <[email protected]>
(cherry picked from commit 385d8e0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants