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

ci: update which packages to select for update #10612

Merged
merged 14 commits into from
Sep 24, 2024

Conversation

quinna-h
Copy link
Contributor

@quinna-h quinna-h commented Sep 10, 2024

Skip over pinned modules when checking for outdated packages.

Since the modules are pinned, we won't actually update the latest that we use from the riotfile, so it is not necessary to include them in the list of candidates for updating a package version.

Future items:

  • Figure out a more robust solution for mapping the suite name to the integration name (currently hardcoded in a dict)

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

@quinna-h quinna-h added the changelog/no-changelog A changelog entry is not required for this PR. label Sep 10, 2024
@quinna-h quinna-h changed the title ci: update when we update latest ci: update when we update latest versions Sep 10, 2024
Copy link
Contributor

github-actions bot commented Sep 10, 2024

CODEOWNERS have been resolved as:

scripts/freshvenvs.py                                                   @DataDog/apm-core-python

@pr-commenter
Copy link

pr-commenter bot commented Sep 10, 2024

Benchmarks

Benchmark execution time: 2024-09-24 02:52:41

Comparing candidate commit 1293ddd in PR branch quinna.halim/update-package-logic with baseline commit cf6f007 in branch main.

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

@quinna-h quinna-h changed the title ci: update when we update latest versions ci: update which packages to select for update Sep 11, 2024
@quinna-h quinna-h marked this pull request as ready for review September 16, 2024 15:05
@quinna-h quinna-h requested a review from a team as a code owner September 16, 2024 15:05
@quinna-h quinna-h marked this pull request as draft September 16, 2024 15:06
@quinna-h quinna-h marked this pull request as ready for review September 16, 2024 19:07
@quinna-h quinna-h requested a review from a team as a code owner September 16, 2024 19:07
Copy link
Collaborator

@emmettbutler emmettbutler left a comment

Choose a reason for hiding this comment

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

If I understand this series of workflows properly, this line in freshvenvs.py is the original source of the list of packages that might need updates. Instead of setting up another workflow and committing another text file to source control, I think it's possible to achieve the goal of avoiding updates for certain packages by putting the update_pinned.py logic directly in the freshvenvs script.

@quinna-h
Copy link
Contributor Author

If I understand this series of workflows properly, this line in freshvenvs.py is the original source of the list of packages that might need updates. Instead of setting up another workflow and committing another text file to source control, I think it's possible to achieve the goal of avoiding updates for certain packages by putting the update_pinned.py logic directly in the freshvenvs script.

Addressed! A concern I had was how frequently are we running scripts/freshvenvs vs updating the riotfile (the thought being that parsing through all the Venvs in riotfile is time consuming), but on second thought doing this once a week is fine.

Copy link
Collaborator

@emmettbutler emmettbutler left a comment

Choose a reason for hiding this comment

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

This is looking great. I left a bunch of comments about clarity and readability, plus one that appears to be a logical error. Let me know when you'd like another review!

scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
wip

wip

Update scripts/freshvenvs.py

Co-authored-by: datadog-datadog-prod-us1[bot] <88084959+datadog-datadog-prod-us1[bot]@users.noreply.github.com>

wip

wip

wip

wip

wip

wip

wip

wip

wip

move to scripts

move to scripts

wip

wip

wip

wip

wip

wip

wip

wip

wip

wip

wip

chore: [SVLS-5262] Span Pointer standard hashing (#10687)

Adding a standard hashing function for Span Pointers. This continues to
be a private API for now.

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

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

fix(llmobs): safely handle non-json serializable arguments (#10694)

Safely handle non-JSON serializable tag arguments in LLMObs.annotate()
and the OpenAI/LangChain/Bedrock/Anthropic integrations.
- LLMObs.annotate(): we previously just discarded the entire argument to
annotate if the argument was non-JSON serializable. Now, we safely
convert non-JSON serializable fields/objects to a default placeholder
text, meaning users can still send *some* data even if some of it may be
invalid.
- Same idea with each integration, we ensure we safely handle non-JSON
serializable args and default to placeholder texts if necessary.
- We've moved all json.dumps() call into a private helper `safe_json()`
which does the above for us.

Note: This PR removes some tests in `test_llmobs_service.py` regarding
truly unserializable objects as this is highly unlikely, someone would
have to go out of their way to make a truly unserializable object (i.e.
override `__repr__()` with a non-json serializable value). We still
catch these so any resulting crashes should not be from our code.

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

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

fix(llmobs): ensure integration metrics are disabled in agentless mode (#10712)

Follows up on #10084, which missed a condition where agentless mode
should always disable integration metrics.

Adds standard testing cases for the `BaseLLMIntegration` class, which
was missing prior to this (and thus the reason for missing this edge
case prior)

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

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

chore(crashtracking): add python version to crashtracker tags (#10720)

During escalations it's currently difficult to find the exact Python
version relevant for a defect. This is a simple fix for that.

I'm recommending a backport because
1. The fix is simple
2. 2.11 and onward introduce crashtracker, and we're still dealing with
crashes from those versions

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

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

minor changes

minor changes
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
scripts/freshvenvs.py Outdated Show resolved Hide resolved
quinna-h and others added 6 commits September 23, 2024 11:01
Co-authored-by: Emmett Butler <723615+emmettbutler@users.noreply.github.com>
Co-authored-by: Emmett Butler <723615+emmettbutler@users.noreply.github.com>
Co-authored-by: Emmett Butler <723615+emmettbutler@users.noreply.github.com>
Co-authored-by: Emmett Butler <723615+emmettbutler@users.noreply.github.com>
@quinna-h quinna-h enabled auto-merge (squash) September 23, 2024 16:30
@quinna-h quinna-h enabled auto-merge (squash) September 23, 2024 17:50
@quinna-h quinna-h merged commit 3ef1c30 into main Sep 24, 2024
552 checks passed
@quinna-h quinna-h deleted the quinna.halim/update-package-logic branch September 24, 2024 02:57
mabdinur pushed a commit that referenced this pull request Sep 25, 2024
Skip over pinned modules when checking for outdated packages. 

Since the modules are pinned, we won't actually update the latest that
we use from the riotfile, so it is not necessary to include them in the
list of candidates for updating a package version.

Future items:
- Figure out a more robust solution for mapping the suite name to the
integration name (currently hardcoded in a `dict`)



## 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: Emmett Butler <723615+emmettbutler@users.noreply.github.com>
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.

2 participants