chore: unvendor psutil and wrapt (#6651)

We had vendored psutil in #1160 due to a lack of wheels for all support
architectures and OSes. This has since been resolved.

At the same time, we can also unvendor wrapt which was added in #755,
which also releases all wheels we need.

We pin the minimum version to the previously vendored version.

## Checklist

- [x] Change(s) are motivated and described in the PR description.
- [x] Testing strategy is described if automated tests are not included
in the PR.
- [x] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed. If no release note is required, add label
`changelog/no-changelog`.
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

- [x] Title is accurate.
- [x] No unnecessary changes are introduced.
- [x] Description motivates each change.
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [x] Testing strategy adequately addresses listed risk(s).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] Release note makes sense to a user of the library.
- [x] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [x] 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 <[email protected]>

Author: majorgreys

ddtrace/_monkey.py

@@ -3,7 +3,7 @@
 import threading
 from typing import TYPE_CHECKING
 
-from ddtrace.vendor.wrapt.importer import when_imported
+from wrapt.importer import when_imported
 
 from .internal.compat import PY2
 from .internal.logger import get_logger

ddtrace/appsec/_handlers.py

@@ -2,6 +2,8 @@
 import json
 
 from six import BytesIO
+from wrapt import wrap_function_wrapper as _w
+from wrapt.importer import when_imported
 import xmltodict
 
 from ddtrace import config
@@ -12,8 +14,6 @@
 from ddtrace.internal import core
 from ddtrace.internal.constants import HTTP_REQUEST_BLOCKED
 from ddtrace.internal.logger import get_logger
-from ddtrace.vendor.wrapt import wrap_function_wrapper as _w
-from ddtrace.vendor.wrapt.importer import when_imported
 
 
 try:

ddtrace/appsec/_iast/_patch.py

@@ -3,9 +3,10 @@
 import sys
 from typing import TYPE_CHECKING
 
+from wrapt import FunctionWrapper
+from wrapt import resolve_path
+
 from ddtrace.internal.logger import get_logger
-from ddtrace.vendor.wrapt import FunctionWrapper
-from ddtrace.vendor.wrapt import resolve_path
 
 from ._utils import _is_iast_enabled
 

ddtrace/appsec/_iast/_patch_modules.py

@@ -1,4 +1,4 @@
-from ddtrace.vendor.wrapt.importer import when_imported
+from wrapt.importer import when_imported
 
 
 IAST_PATCH = {

ddtrace/contrib/aiobotocore/patch.py

@@ -1,11 +1,11 @@
 import os
 
 import aiobotocore.client
+import wrapt
 
 from ddtrace import config
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.utils.version import parse_version
-from ddtrace.vendor import wrapt
 
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND

ddtrace/contrib/aiohttp/patch.py

@@ -1,6 +1,7 @@
 import os
 
 import aiohttp
+import wrapt
 from yarl import URL
 
 from ddtrace import config
@@ -10,7 +11,6 @@
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.internal.utils.formats import asbool
-from ddtrace.vendor import wrapt
 
 from ...ext import SpanKind
 from ...ext import SpanTypes

ddtrace/contrib/aiomysql/patch.py

@@ -1,4 +1,5 @@
 import aiomysql
+import wrapt
 
 from ddtrace import Pin
 from ddtrace import config
@@ -9,7 +10,6 @@
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.schema import schematize_database_operation
 from ddtrace.internal.utils.wrappers import unwrap
-from ddtrace.vendor import wrapt
 
 from ...ext import SpanKind
 from ...ext import SpanTypes

ddtrace/contrib/aiopg/connection.py

@@ -2,6 +2,7 @@
 
 from aiopg import __version__
 from aiopg.utils import _ContextManager
+import wrapt
 
 from ddtrace import config
 from ddtrace.constants import ANALYTICS_SAMPLE_RATE_KEY
@@ -16,7 +17,6 @@
 from ddtrace.internal.schema import schematize_service_name
 from ddtrace.internal.utils.version import parse_version
 from ddtrace.pin import Pin
-from ddtrace.vendor import wrapt
 
 
 AIOPG_VERSION = parse_version(__version__)

ddtrace/contrib/aiopg/patch.py

@@ -3,13 +3,13 @@
 
 import aiopg.connection
 import psycopg2.extensions
+import wrapt
 
 from ddtrace.contrib.aiopg.connection import AIOTracedConnection
 from ddtrace.contrib.psycopg.connection import patch_conn as psycopg_patch_conn
 from ddtrace.contrib.psycopg.extensions import _patch_extensions
 from ddtrace.contrib.psycopg.extensions import _unpatch_extensions
 from ddtrace.internal.utils.wrappers import unwrap as _u
-from ddtrace.vendor import wrapt
 
 
 def get_version():

ddtrace/contrib/aioredis/patch.py

@@ -3,12 +3,12 @@
 import sys
 
 import aioredis
+from wrapt import wrap_function_wrapper as _w
 
 from ddtrace import config
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.utils.wrappers import unwrap as _u
 from ddtrace.pin import Pin
-from ddtrace.vendor.wrapt import wrap_function_wrapper as _w
 
 from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY