Merge main into develop-remove-python27

[TimPansino]

Overview

• Fix merge conflicts on develop branch with main
• Rerun flynt to convert newer code to use f-strings

Review

The best way to view selections made based on merge conflicts:

1. Fetch origin to have up to date commit references.
2. Checkout an up to date copy of develop-remove-python27.
3. Merge with origin/main to have an up to date copy of any merge conflicts.
4. Diff working tree with origin/merge-main-develop-python27 to see what selections and edits were made for all the merge conflicts. a. This is easier to view in VSCode with GitLens Inspect than in a terminal.

git fetch --all
git checkout develop-remove-python27
git pull
git merge origin/main
git diff origin/merge-main-develop-python27

[github-actions[bot]]

🦙 MegaLinter status: ❌ ERROR

Descriptor	Linter	Files	Fixed	Errors	Elapsed time
❌ PYTHON	bandit	15		1	8.06s
✅ PYTHON	black	33	5	0	4.64s
❌ PYTHON	flake8	33		2	2.27s
✅ PYTHON	isort	33	6	0	0.34s
❌ PYTHON	pylint	33		71	14.52s

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 _

[codecov-commenter]

Codecov Report

Attention: Patch coverage is 78.12500% with 35 lines in your changes missing coverage. Please review.

Please upload report for BASE (develop-remove-python27@8c1a4b9). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
newrelic/hooks/messagebroker_confluentkafka.py	70.37%	4 Missing and 4 partials :warning:
newrelic/hooks/mlmodel_langchain.py	81.57%	2 Missing and 5 partials :warning:
newrelic/hooks/datastore_bmemcached.py	45.45%	0 Missing and 6 partials :warning:
newrelic/hooks/datastore_pymongo.py	45.45%	3 Missing and 3 partials :warning:
newrelic/hooks/datastore_aiomcache.py	71.42%	0 Missing and 2 partials :warning:
newrelic/hooks/datastore_pymemcache.py	71.42%	0 Missing and 2 partials :warning:
newrelic/hooks/messagebroker_kafkapython.py	77.77%	0 Missing and 2 partials :warning:
newrelic/hooks/database_dbapi2.py	66.66%	1 Missing :warning:
newrelic/hooks/database_dbapi2_async.py	66.66%	1 Missing :warning:

Additional details and impacted files

```diff @@ Coverage Diff @@ ## develop-remove-python27 #1217 +/- ## ========================================================== Coverage ? 81.24% ========================================================== Files ? 197 Lines ? 21601 Branches ? 3776 ========================================================== Hits ? 17549 Misses ? 2912 Partials ? 1140 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[TimPansino]

Made a mistake merging and squashed everything, so I dropped the commit and force merged an identical PR (#1220)