unvendor wrapt (#1678)

While investigating #1676, I noticed that wrapt now builds binary
wheels for a plethora of platforms. We originally opted to vendor
wrapt so we could build binary wheels ourselves. This came with
the added complexity of compiling/packaging C code.

Unvendoring wrapt removes all that complexity, and we benefit of
binary wheels for a larger set of platforms than what we provided
ourselves.

Author: beniwohli

Jenkinsfile

@@ -139,12 +139,10 @@ pipeline {
               deleteDir()
               unstash 'source'
               dir("${BASE_DIR}"){
-                sh script: 'pip3 install --user cibuildwheel', label: "Installing cibuildwheel"
-                sh script: 'mkdir wheelhouse', label: "creating wheelhouse"
-                // skip pypy builds with CIBW_SKIP=pp*
-                sh script: 'CIBW_SKIP="pp* cp27* cp35*" CIBW_ARCHS_LINUX="x86_64 aarch64" cibuildwheel --platform linux --output-dir wheelhouse; ls -l wheelhouse'
+                sh script: 'pip3 install --user wheel', label: "Installing wheel"
+                sh script: 'python3 setup.py bdist_wheel', label: "Building universal wheel"
               }
-              stash allowEmpty: true, name: 'packages', includes: "${BASE_DIR}/wheelhouse/*.whl,${BASE_DIR}/dist/*.tar.gz", useDefaultExcludes: false
+              stash allowEmpty: true, name: 'packages', includes: "${BASE_DIR}/dist/*.whl,${BASE_DIR}/dist/*.tar.gz", useDefaultExcludes: false
             }
           }
         }

elasticapm/contrib/django/middleware/__init__.py

@@ -36,14 +36,15 @@
 from types import FunctionType
 from typing import Optional
 
+import wrapt
 from django.apps import apps
 from django.conf import settings as django_settings
 from django.http import HttpRequest, HttpResponse
 
 import elasticapm
 from elasticapm.conf import constants
 from elasticapm.contrib.django.client import client, get_client
-from elasticapm.utils import build_name_with_http_method_prefix, get_name_from_func, wrapt
+from elasticapm.utils import build_name_with_http_method_prefix, get_name_from_func
 
 try:
     from importlib import import_module

elasticapm/handlers/logging.py

@@ -36,10 +36,11 @@
 import traceback
 import warnings
 
+import wrapt
+
 from elasticapm import get_client
 from elasticapm.base import Client
 from elasticapm.traces import execution_context
-from elasticapm.utils import wrapt
 from elasticapm.utils.stacks import iter_stack_frames
 
 

elasticapm/instrumentation/packages/base.py

@@ -31,8 +31,9 @@
 import functools
 import os
 
+import wrapt
+
 from elasticapm.traces import execution_context
-from elasticapm.utils import wrapt
 from elasticapm.utils.logging import get_logger
 
 logger = get_logger("elasticapm.instrument")

elasticapm/instrumentation/packages/dbapi2.py

@@ -35,9 +35,10 @@
 
 import re
 
+import wrapt
+
 from elasticapm.instrumentation.packages.base import AbstractInstrumentedModule
 from elasticapm.traces import capture_span
-from elasticapm.utils import wrapt
 from elasticapm.utils.encoding import force_text, shorten