Skip to content

Conversation

TimPansino
Copy link
Contributor

@TimPansino TimPansino commented Jan 11, 2024

Overview

  • Merge main into develop-logging-attributes
  • Pin failing starlette tests

umaannamalai and others added 11 commits December 18, 2023 13:58
* Add nonce to CSP in browser agent

* Adjust nonce position

* Add testing for browser timing nonces
* Temporarily pin hypercorn to <0.16

* Temporarily pin hypercorn to <0.16

* Add comment to tox.ini

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Remove case sensitive check in should_insert_html.

* [Mega-Linter] Apply linters fixes

* Remove header decoding.

---------

Co-authored-by: umaannamalai <[email protected]>
* Fix import issue in tests

* Parallelize wheel building and add muslinux support

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Add nonce to CSP in browser agent

* Adjust nonce position

* Add testing for browser timing nonces

* Deprecated browser timing footer APIs.

* Full rip out of browser timing footer

* Remove cross agent tests for RUM footer (per repo)

* Update cat_map tests

* Adjust browser header generation timing accuracy

* Fix browser tests

* Linting

* Apply suggestions from code review

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Update wrapt to 1.16.0

* Import duplicate functions directly from wrapt

* Update object wrappers for wrapt 1.16.0

* Add warning to wrapt duplicate code

* Linting

* Use super rather than hard coded Object proxy

* Formatting

* Add test file for wrapper attributes

* Unify ObjectWrapper with FunctionWrapper

* Remove ObjectWrapper from httplib

* Remove ObjectWrapper from tastypie

* Replace ObjectWrapper use in console

* Remove ObjectWrapper from celery

* Remove extra import

* Update agent APIs

* Deprecate ObjectWrapper

* Fix object wrapper imports

* More import issues

* Fix taskwrapper in celery

* Pin last supported flask restx version for 3.7

* Undo tox changes

* Change all api.object_wrapper references to use new locations

* Fixup: callable_name import

* Fixup: callable_name import

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Hannah Stepanek <[email protected]>
@TimPansino TimPansino requested a review from a team January 11, 2024 22:14
@TimPansino TimPansino changed the base branch from main to develop-logging-attributes January 11, 2024 22:15
Copy link

github-actions bot commented Jan 11, 2024

🦙 MegaLinter status: ❌ ERROR

Descriptor Linter Files Fixed Errors Elapsed time
✅ PYTHON bandit 22 0 6.35s
✅ PYTHON black 37 13 0 3.51s
❌ PYTHON flake8 37 17 1.54s
✅ PYTHON isort 37 15 0 0.5s
❌ PYTHON pylint 37 103 18.03s
✅ RST rstcheck 1 0 0.88s
✅ RST rstfmt 1 0 0 3.08s
✅ RST rst-lint 1 0 0.66s
✅ YAML prettier 1 1 0 0.66s
✅ YAML v8r 1 0 2.59s
✅ YAML yamllint 1 0 0.26s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@mergify mergify bot added the tests-failing Tests failing in CI. label Jan 11, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jan 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (develop-logging-attributes@92cca1e). Click here to learn what that means.

Additional details and impacted files
@@                      Coverage Diff                      @@
##             develop-logging-attributes    #1034   +/-   ##
=============================================================
  Coverage                              ?   81.21%           
=============================================================
  Files                                 ?      190           
  Lines                                 ?    19714           
  Branches                              ?     3457           
=============================================================
  Hits                                  ?    16011           
  Misses                                ?     2716           
  Partials                              ?      987           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@hmstepanek hmstepanek left a comment

Choose a reason for hiding this comment

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

Fixed one minor duplication from a merge conflict otherwise looks good.

@hmstepanek hmstepanek merged commit d9c6462 into develop-logging-attributes Jan 11, 2024
@hmstepanek hmstepanek deleted the merge-main-develop-logging branch January 11, 2024 23:54
@mergify mergify bot removed the tests-failing Tests failing in CI. label Jan 11, 2024
@TimPansino TimPansino restored the merge-main-develop-logging branch January 11, 2024 23:55
@TimPansino TimPansino deleted the merge-main-develop-logging branch August 15, 2024 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants