Skip to content

chore: ignore useless conversion lint warning from pyo3 [#12450]#12466

Merged
brettlangdon merged 2 commits into
3.0from
backport-12450-to-3.0
Feb 21, 2025
Merged

chore: ignore useless conversion lint warning from pyo3 [#12450]#12466
brettlangdon merged 2 commits into
3.0from
backport-12450-to-3.0

Conversation

@brettlangdon

@brettlangdon brettlangdon commented Feb 21, 2025

Copy link
Copy Markdown
Member

Backport #12450 to 3.0 branch.

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

@brettlangdon brettlangdon added the changelog/no-changelog A changelog entry is not required for this PR. label Feb 21, 2025
@brettlangdon brettlangdon requested a review from a team as a code owner February 21, 2025 15:17
@brettlangdon brettlangdon requested a review from juanjux February 21, 2025 15:17
@github-actions

github-actions Bot commented Feb 21, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

CODEOWNERS have been resolved as:

src/native/lib.rs                                                       @DataDog/apm-core-python

@brettlangdon brettlangdon enabled auto-merge (squash) February 21, 2025 15:20
@brettlangdon brettlangdon changed the title fix(asm): decouple appsec [backport 3.0] (#12251) chore: ignore useless conversion lint warning from pyo3 [#12450] Feb 21, 2025
@datadog-dd-trace-py-rkomorn

datadog-dd-trace-py-rkomorn Bot commented Feb 21, 2025

Copy link
Copy Markdown

Datadog Report

Branch report: backport-12450-to-3.0
Commit report: 013ab78
Test service: dd-trace-py

✅ 0 Failed, 140 Passed, 1174 Skipped, 1m 39.47s Total Time

@brettlangdon brettlangdon added changelog/no-changelog A changelog entry is not required for this PR. and removed changelog/no-changelog A changelog entry is not required for this PR. labels Feb 21, 2025
@pr-commenter

pr-commenter Bot commented Feb 21, 2025

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2025-02-21 16:06:08

Comparing candidate commit 013ab78 in PR branch backport-12450-to-3.0 with baseline commit a95e66b in branch 3.0.

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

@brettlangdon brettlangdon merged commit b8d32a2 into 3.0 Feb 21, 2025
@brettlangdon brettlangdon deleted the backport-12450-to-3.0 branch February 21, 2025 16:07
@github-actions

github-actions Bot commented Feb 27, 2025

Copy link
Copy Markdown
Contributor

The backport to 2.21 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.21 2.21
# Navigate to the new working tree
cd .worktrees/backport-2.21
# Create a new branch
git switch --create backport-12466-to-2.21
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b8d32a2b3f17394970024da142c43376ffaf66d0
# Push it to GitHub
git push --set-upstream origin backport-12466-to-2.21
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.21

Then, create a pull request where the base branch is 2.21 and the compare/head branch is backport-12466-to-2.21.

github-actions Bot pushed a commit that referenced this pull request Feb 27, 2025
@brettlangdon @ajgajg1134 @github-actions
fix(asm): decouple appsec [backport 3.0] (#12251) (#12466)
6fcaa45 
Co-authored-by: Andrew Glaude <andrew.glaude@datadoghq.com>
(cherry picked from commit b8d32a2)
github-actions Bot pushed a commit that referenced this pull request Feb 27, 2025
@brettlangdon @ajgajg1134 @github-actions
fix(asm): decouple appsec [backport 3.0] (#12251) (#12466)
ee6c4d5 
Co-authored-by: Andrew Glaude <andrew.glaude@datadoghq.com>
(cherry picked from commit b8d32a2)
This was referenced Feb 27, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emmettbutler emmettbutler emmettbutler approved these changes

@juanjux juanjux Awaiting requested review from juanjux juanjux is a code owner automatically assigned from DataDog/apm-core-python

Assignees

No one assigned

Labels

changelog/no-changelog A changelog entry is not required for this PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@brettlangdon @emmettbutler @avara1986 @ajgajg1134