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(profiling): fix endpoint profiling for stack v2 [backport 2.10] #10257

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 16, 2024

Backport 000ff0a from #10246 to 2.10.

Stack v1 implementation

if endpoint_collection_enabled:
self.trace_resource_container = span._local_root._resource

Wrong stack v2 implementation

if endpoint_collection_enabled:
root_service_bytes = ensure_binary_or_empty(span._local_root.service)

Found this while working on #10230. Submitting this as a separate PR to merge and backport this ASAP.

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

Stack v1 implementation

https://github.com/DataDog/dd-trace-py/blob/9029186edf9d21e3ff375eb694e60d47f92c0f96/ddtrace/profiling/event.py#L107-L108

Wrong stack v2 implementation

https://github.com/DataDog/dd-trace-py/blob/f42fb50fcef8ef4dd00c168551a5e3b624c25878/ddtrace/internal/datadog/profiling/ddup/_ddup.pyx#L286-L287

Found this while working on #10230. Submitting this as a separate PR to
merge and backport this ASAP.

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

(cherry picked from commit 000ff0a)
@github-actions github-actions bot added the Profiling Continous Profling label Aug 16, 2024
@github-actions github-actions bot requested review from a team as code owners August 16, 2024 14:31
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Aug 16, 2024

Datadog Report

Branch report: backport-10246-to-2.10
Commit report: d1d11b8
Test service: dd-trace-py

✅ 0 Failed, 135 Passed, 963 Skipped, 1h 19m 26.84s Total duration (55m 15.41s time saved)

@taegyunkim taegyunkim closed this Aug 16, 2024
@taegyunkim taegyunkim reopened this Aug 16, 2024
@taegyunkim taegyunkim enabled auto-merge (squash) August 16, 2024 14:59
@pr-commenter
Copy link

pr-commenter bot commented Aug 16, 2024

Benchmarks

Benchmark execution time: 2024-08-16 15:06:12

Comparing candidate commit d1d11b8 in PR branch backport-10246-to-2.10 with baseline commit 29d24e8 in branch 2.10.

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

@taegyunkim taegyunkim closed this Aug 16, 2024
auto-merge was automatically disabled August 16, 2024 15:45

Pull request was closed

@taegyunkim taegyunkim reopened this Aug 16, 2024
@taegyunkim taegyunkim enabled auto-merge (squash) August 16, 2024 15:45
@taegyunkim taegyunkim closed this Aug 16, 2024
auto-merge was automatically disabled August 16, 2024 17:11

Pull request was closed

@taegyunkim taegyunkim reopened this Aug 16, 2024
@taegyunkim taegyunkim closed this Aug 16, 2024
@taegyunkim taegyunkim reopened this Aug 16, 2024
@taegyunkim taegyunkim enabled auto-merge (squash) August 16, 2024 18:47
@taegyunkim taegyunkim merged commit 63edc2e into 2.10 Aug 16, 2024
299 of 366 checks passed
@taegyunkim taegyunkim deleted the backport-10246-to-2.10 branch August 16, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Profiling Continous Profling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant