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(celery): remove reference to github issue #5381

Merged
merged 2 commits into from Mar 22, 2023

Conversation

emmettbutler
Copy link
Collaborator

@emmettbutler emmettbutler commented Mar 21, 2023

The issue referenced was resolved, but it actually does not apply to the bit of code it's pointing to.

Fixes #4649

I tried removing the code referenced by the comment, and it causes the test tests/contrib/celery/test_integration.py::CeleryDistributedTracingIntegrationTask::test_distributed_tracing_propagation_async to fail. As far as I can tell from about an hour of investigation, the celery fix only affects "hybrid messages" (those that blend protocol 1 and 2 syntax as part of a rolling Celery upgrade), which our test suite doesn't use.

Checklist

  • Change(s) are motivated and described in the PR description.
  • Testing strategy is described if automated tests are not included in the PR.
  • Risk is outlined (performance impact, potential for breakage, maintainability, etc).
  • Change is maintainable (easy to change, telemetry, documentation).
  • Library release note guidelines are followed.
  • Documentation is included (in-code, generated user docs, public corp docs).
  • Author is aware of the performance implications of this PR as reported in the benchmarks PR comment.

Reviewer Checklist

  • Title is accurate.
  • No unnecessary changes are introduced.
  • Description motivates each change.
  • Avoids breaking API changes unless absolutely necessary.
  • Testing strategy adequately addresses listed risk(s).
  • Change is maintainable (easy to change, telemetry, documentation).
  • Release note makes sense to a user of the library.
  • Reviewer is aware of, and discussed the performance implications of this PR as reported in the benchmarks PR comment.

it was resolved, but it actually does not apply to the referenced bit of code
@emmettbutler emmettbutler added the changelog/no-changelog A changelog entry is not required for this PR. label Mar 21, 2023
@emmettbutler emmettbutler requested a review from a team as a code owner March 21, 2023 21:35
@emmettbutler emmettbutler enabled auto-merge (squash) March 22, 2023 13:48
@codecov-commenter
Copy link

Codecov Report

Merging #5381 (b5702dc) into 1.x (d78d37c) will increase coverage by 0.00%.
The diff coverage is 89.47%.

@@           Coverage Diff           @@
##              1.x    #5381   +/-   ##
=======================================
  Coverage   76.53%   76.53%           
=======================================
  Files         887      887           
  Lines       70146    70158   +12     
=======================================
+ Hits        53685    53696   +11     
- Misses      16461    16462    +1     
Impacted Files Coverage Δ
ddtrace/contrib/celery/signals.py 82.03% <ø> (ø)
ddtrace/appsec/ddwaf/__init__.py 74.33% <66.66%> (+0.22%) ⬆️
ddtrace/appsec/processor.py 92.72% <100.00%> (-0.04%) ⬇️
tests/appsec/test_processor.py 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@emmettbutler emmettbutler merged commit 85f1805 into 1.x Mar 22, 2023
20 checks passed
@emmettbutler emmettbutler deleted the emmett.butler/celery-comment branch March 22, 2023 15:01
@github-actions github-actions bot added this to the v1.11.0 milestone Mar 22, 2023
IlyaMichlin pushed a commit to IlyaMichlin/dd-trace-py that referenced this pull request Mar 30, 2023
The issue referenced was
[resolved](celery/celery#6374), but it actually
does not apply to the bit of code it's pointing to.

Fixes DataDog#4649

I tried removing the code referenced by the comment, and it causes the
test
`tests/contrib/celery/test_integration.py::CeleryDistributedTracingIntegrationTask::test_distributed_tracing_propagation_async`
to fail. As far as I can tell from about an hour of investigation, the
celery [fix](celery/celery#4356) only affects
"hybrid messages" (those that blend protocol 1 and 2 syntax as part of a
rolling Celery upgrade), which our test suite doesn't use.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upstream issue celery/celery#4875 closed
3 participants