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.

Sign up for GitHub

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

Jump to bottom

fix(botocore): account for None data_obj case in Kinesis #10628

Merged
merged 13 commits into from
Sep 23, 2024
Merged

fix(botocore): account for None data_obj case in Kinesis #10628

merged 13 commits into from
Sep 23, 2024

Conversation

ZStriker19
Copy link
Contributor

@ZStriker19 ZStriker19 commented Sep 11, 2024 •
edited by erikayasuda
Loading

This accounts for the possibility of None being returned for the data_obj value from the method get_kinesis_data_object in _patched_kinesis_api_call.

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 11, 2024 •
edited
Loading

CODEOWNERS have been resolved as:

releasenotes/notes/kinesis_none_type_fix-4b39f2059184359e.yaml          @DataDog/apm-python
ddtrace/contrib/internal/botocore/services/kinesis.py                   @DataDog/apm-core-python @DataDog/apm-idm-python
ddtrace/contrib/internal/botocore/utils.py                              @DataDog/apm-core-python @DataDog/apm-idm-python
tests/contrib/botocore/test.py                                          @DataDog/apm-core-python @DataDog/apm-idm-python

@pr-commenter
Copy link

pr-commenter bot commented Sep 11, 2024 •
edited
Loading

Benchmarks

Benchmark execution time: 2024-09-20 17:54:37

Comparing candidate commit 5f46b04 in PR branch zachg/fix_kinesis_none_return_ with baseline commit 33daba9 in branch main.

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

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

datadog-dd-trace-py-rkomorn bot commented Sep 11, 2024 •
edited
Loading

Datadog Report

Branch report: zachg/fix_kinesis_none_return_
Commit report: 5f46b04
Test service: dd-trace-py

✅ 0 Failed, 592 Passed, 604 Skipped, 17m 59.8s Total duration (18m 42.93s time saved)

@ZStriker19 ZStriker19 marked this pull request as ready for review September 12, 2024 20:45
@ZStriker19 ZStriker19 requested review from a team as code owners September 12, 2024 20:49
@ZStriker19 ZStriker19 enabled auto-merge (squash) September 16, 2024 17:06
@ZStriker19 ZStriker19 requested a review from a team as a code owner September 16, 2024 17:30
@ZStriker19 ZStriker19 merged commit 5546c23 into main Sep 23, 2024
569 of 570 checks passed
@ZStriker19 ZStriker19 deleted the zachg/fix_kinesis_none_return_ branch September 23, 2024 14:44
github-actions bot pushed a commit that referenced this pull request Sep 23, 2024
@ZStriker19 @github-actions
fix(botocore): account for None data_obj case in Kinesis (#10628)
373f628 
This accounts for the possibility of None being returned for the
data_obj value from the method `get_kinesis_data_object` in
`_patched_kinesis_api_call`.

## 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: erikayasuda <[email protected]>
(cherry picked from commit 5546c23)
@github-actions github-actions bot mentioned this pull request Sep 23, 2024
Merged
2 tasks
github-actions bot pushed a commit that referenced this pull request Sep 23, 2024
@ZStriker19 @github-actions
fix(botocore): account for None data_obj case in Kinesis (#10628)
b4ea051 
This accounts for the possibility of None being returned for the
data_obj value from the method `get_kinesis_data_object` in
`_patched_kinesis_api_call`.

## 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: erikayasuda <[email protected]>
(cherry picked from commit 5546c23)
@github-actions github-actions bot mentioned this pull request Sep 23, 2024
Open
2 tasks
ZStriker19 added a commit that referenced this pull request Sep 23, 2024
@github-actions @ZStriker19
fix(botocore): account for None data_obj case in Kinesis [backport 2.…
6eb517d 
…12] (#10761)

Backport 5546c23 from #10628 to 2.12.

This accounts for the possibility of None being returned for the
data_obj value from the method `get_kinesis_data_object` in
`_patched_kinesis_api_call`.


## 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 <[email protected]>
mabdinur pushed a commit that referenced this pull request Sep 25, 2024
@ZStriker19 @erikayasuda @mabdinur
fix(botocore): account for None data_obj case in Kinesis (#10628)
580eff6 
This accounts for the possibility of None being returned for the
data_obj value from the method `get_kinesis_data_object` in
`_patched_kinesis_api_call`.


## 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: erikayasuda <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikayasuda erikayasuda erikayasuda approved these changes

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

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

Assignees
No one assigned
Labels
backport 2.12 backport 2.13
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ZStriker19 @erikayasuda