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): change out.host tags to point to celery broker #10750

Merged
merged 27 commits into from
Nov 25, 2024

Conversation

ZStriker19
Copy link
Contributor

@ZStriker19 ZStriker19 commented Sep 20, 2024

Motivation

Change out.host tags to point towards the celery broker, instead of the local celery hostname. Fixes service-representation issues.

Fixes 11491

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

Copy link
Contributor

github-actions bot commented Sep 20, 2024

CODEOWNERS have been resolved as:

.riot/requirements/1509aa1.txt                                          @DataDog/apm-python
.riot/requirements/1df4aa0.txt                                          @DataDog/apm-python
.riot/requirements/654f8c0.txt                                          @DataDog/apm-python
releasenotes/notes/update-celery-out-host-tag-be8da4f2ab88b4cf.yaml     @DataDog/apm-python
tests/contrib/celery/test_tagging.py                                    @DataDog/apm-core-python @DataDog/apm-idm-python
ddtrace/contrib/internal/celery/signals.py                              @DataDog/apm-core-python @DataDog/apm-idm-python
riotfile.py                                                             @DataDog/apm-python
tests/contrib/celery/base.py                                            @DataDog/apm-core-python @DataDog/apm-idm-python
tests/contrib/celery/test_integration.py                                @DataDog/apm-core-python @DataDog/apm-idm-python
tests/contrib/jobspec.yml                                               @DataDog/apm-core-python @DataDog/apm-idm-python

@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Sep 20, 2024

Datadog Report

Branch report: zachg/fix_celery_outgoing_tags
Commit report: d644a36
Test service: dd-trace-py

✅ 0 Failed, 1097 Passed, 281 Skipped, 8m 50.59s Total duration (17m 43.95s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Sep 20, 2024

Benchmarks

Benchmark execution time: 2024-11-25 20:34:07

Comparing candidate commit 96695f1 in PR branch zachg/fix_celery_outgoing_tags with baseline commit b5b6dd0 in branch main.

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

@wconti27 wconti27 marked this pull request as ready for review November 22, 2024 18:31
@wconti27 wconti27 requested review from a team as code owners November 22, 2024 18:31
@wconti27 wconti27 changed the title fix(celery): add message.destination and change out.host tags fix(celery): change out.host tags to point to celery broker Nov 22, 2024
@wconti27 wconti27 requested a review from a team as a code owner November 22, 2024 21:20
@wconti27 wconti27 self-assigned this Nov 22, 2024
tests/contrib/celery/test_tagging.py Outdated Show resolved Hide resolved
tests/contrib/celery/test_tagging.py Outdated Show resolved Hide resolved
@wconti27 wconti27 requested a review from djova November 25, 2024 19:03
Copy link

@djova djova left a comment

Choose a reason for hiding this comment

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

👍 with a suggestion

ddtrace/contrib/internal/celery/signals.py Outdated Show resolved Hide resolved
@wconti27
Copy link
Contributor

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 25, 2024

Devflow running: /merge

View all feedbacks in Devflow UI.


2024-11-25 19:54:57 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2024-11-25 20:36:50 UTC ℹ️ MergeQueue: merge request added to the queue

The median merge time in main is 34m.

Copy link
Collaborator

@wantsui wantsui left a comment

Choose a reason for hiding this comment

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

I am also approving, but left a note about a possible edge case.

@dd-mergequeue dd-mergequeue bot merged commit b9573be into main Nov 25, 2024
554 checks passed
@dd-mergequeue dd-mergequeue bot deleted the zachg/fix_celery_outgoing_tags branch November 25, 2024 21:06
github-actions bot pushed a commit that referenced this pull request Nov 25, 2024
Co-authored-by: wconti27 <william.conti@datadoghq.com>
(cherry picked from commit b9573be)
wconti27 added a commit that referenced this pull request Nov 26, 2024
… 2.17] (#11540)

Backport b9573be from #10750 to 2.17.

## Motivation

Change `out.host` tags to point towards the celery broker, instead of
the local celery hostname. Fixes service-representation issues.

Fixes [11491](#11491)

## 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: Zachary Groves <32471391+ZStriker19@users.noreply.github.com>
Co-authored-by: William Conti <58711692+wconti27@users.noreply.github.com>
Co-authored-by: William Conti <william.conti@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants