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: don't skip heartbeats for forked processes #11575

Merged
merged 8 commits into from
Dec 4, 2024

Conversation

juanjux
Copy link
Collaborator

@juanjux juanjux commented Nov 28, 2024

Description

We were skipping app-heartbeat messages for forked processes. The problem with this is that if a process doesn't sent a heartbeat in 60 minutes, the backend will forget its dependencies, which was causing the list to only be the updated ones for some clients, specifically with gunicorn.

This makes forked processes also sent heartbeats with solved the issue in our tests.

Will stay as draft PR until I can check with @brettlangdon the reason heartbeats were disabled for forks.

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

@juanjux juanjux added the bug label Nov 28, 2024
@juanjux juanjux requested a review from brettlangdon November 28, 2024 15:56
@juanjux juanjux self-assigned this Nov 28, 2024
Copy link
Contributor

github-actions bot commented Nov 28, 2024

CODEOWNERS have been resolved as:

releasenotes/notes/dont-skip-fork-heartbeats-23040d3ddc072298.yaml      @DataDog/apm-python
ddtrace/internal/telemetry/writer.py                                    @DataDog/apm-core-python
tests/telemetry/test_telemetry.py                                       @DataDog/apm-python

@juanjux juanjux requested a review from a team November 28, 2024 15:56
@juanjux juanjux changed the title Dont skip heartbeats for forked processes fix: don't skip heartbeats for forked processes Nov 28, 2024
@datadog-dd-trace-py-rkomorn
Copy link

Datadog Report

Branch report: juanjux/APPSEC-55999-SCA-forks-lose-dependencies
Commit report: 775ad5c
Test service: dd-trace-py

✅ 0 Failed, 1468 Passed, 0 Skipped, 23m 42.76s Total duration (12m 58s time saved)

Signed-off-by: Juanjo Alvarez <[email protected]>
Signed-off-by: Juanjo Alvarez <[email protected]>
Signed-off-by: Juanjo Alvarez <[email protected]>
Signed-off-by: Juanjo Alvarez <[email protected]>
@pr-commenter
Copy link

pr-commenter bot commented Nov 28, 2024

Benchmarks

Benchmark execution time: 2024-12-03 10:30:04

Comparing candidate commit d144747 in PR branch juanjux/APPSEC-55999-SCA-forks-lose-dependencies with baseline commit 142e643 in branch main.

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

scenario:iast_aspects-ospathbasename_aspect

  • 🟩 execution_time [-455.931ns; -398.767ns] or [-12.217%; -10.685%]

scenario:iast_aspects-ospathdirname_aspect

  • 🟩 execution_time [-397.708ns; -324.098ns] or [-9.868%; -8.041%]

@juanjux juanjux marked this pull request as ready for review December 3, 2024 09:50
@juanjux juanjux requested review from a team as code owners December 3, 2024 09:50
@juanjux juanjux requested a review from tabgok December 3, 2024 09:50
@juanjux juanjux merged commit 63a439a into main Dec 4, 2024
141 of 142 checks passed
@juanjux juanjux deleted the juanjux/APPSEC-55999-SCA-forks-lose-dependencies branch December 4, 2024 09:15
github-actions bot pushed a commit that referenced this pull request Dec 9, 2024
## Description

We were skipping app-heartbeat messages for forked processes. The
problem with this is that if a process doesn't sent a heartbeat in 60
minutes, the backend will forget its dependencies, which was causing the
list to only be the updated ones for some clients, specifically with
gunicorn.

This makes forked processes also sent heartbeats with solved the issue
in our tests.

Will stay as draft PR until I can check with @brettlangdon the reason
heartbeats were disabled for forks.

## 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)

---------

Signed-off-by: Juanjo Alvarez <[email protected]>
(cherry picked from commit 63a439a)
github-actions bot pushed a commit that referenced this pull request Dec 9, 2024
## Description

We were skipping app-heartbeat messages for forked processes. The
problem with this is that if a process doesn't sent a heartbeat in 60
minutes, the backend will forget its dependencies, which was causing the
list to only be the updated ones for some clients, specifically with
gunicorn.

This makes forked processes also sent heartbeats with solved the issue
in our tests.

Will stay as draft PR until I can check with @brettlangdon the reason
heartbeats were disabled for forks.

## 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)

---------

Signed-off-by: Juanjo Alvarez <[email protected]>
(cherry picked from commit 63a439a)
juanjux added a commit that referenced this pull request Dec 10, 2024
Backport 63a439a from #11575 to 2.17.

## Description

We were skipping app-heartbeat messages for forked processes. The
problem with this is that if a process doesn't sent a heartbeat in 60
minutes, the backend will forget its dependencies, which was causing the
list to only be the updated ones for some clients, specifically with
gunicorn.

This makes forked processes also sent heartbeats with solved the issue
in our tests.

Will stay as draft PR until I can check with @brettlangdon the reason
heartbeats were disabled for forks.

## 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: Juanjo Alvarez Martinez <[email protected]>
juanjux added a commit that referenced this pull request Dec 10, 2024
Backport 63a439a from #11575 to 2.16.

## Description

We were skipping app-heartbeat messages for forked processes. The
problem with this is that if a process doesn't sent a heartbeat in 60
minutes, the backend will forget its dependencies, which was causing the
list to only be the updated ones for some clients, specifically with
gunicorn.

This makes forked processes also sent heartbeats with solved the issue
in our tests.

Will stay as draft PR until I can check with @brettlangdon the reason
heartbeats were disabled for forks.

## 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: Juanjo Alvarez Martinez <[email protected]>
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.

3 participants