Merge main into develop-remove-python27 (NO SQUASH)

[TimPansino]

Overview

• Attempt 2 at fixing merge conflicts, the squash last time ruined the commit history so it still shows the same merge conflicts.

[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 #1220 +/- ## ========================================================== 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.