Merge branch 'main'

elasticapm/contrib/flask/__init__.py

@@ -50,26 +50,6 @@
 
 logger = get_logger("elasticapm.errors.client")
 
-_client = None
-
-
-def make_client(client_cls, app, **defaults):
-    config = app.config.get("ELASTIC_APM", {})
-
-    if "framework_name" not in defaults:
-        defaults["framework_name"] = "flask"
-        defaults["framework_version"] = getattr(flask, "__version__", "<0.7")
-
-    client = client_cls(config, **defaults)
-    global _client
-    _client = client
-    return client
-
-
-def get_client():
-    global _client
-    return _client
-
 
 class ElasticAPM(object):
     """
@@ -164,6 +144,7 @@ def init_app(self, app, **defaults):
         # Instrument to get spans
         if self.client.config.instrument and self.client.config.enabled:
             elasticapm.instrumentation.control.instrument()
+
             signals.request_started.connect(self.request_started, sender=app)
             signals.request_finished.connect(self.request_finished, sender=app)
             try:

elasticapm/instrumentation/register.py

@@ -63,7 +63,9 @@
     "elasticapm.instrumentation.packages.urllib.UrllibInstrumentation",
     "elasticapm.instrumentation.packages.graphql.GraphQLExecutorInstrumentation",
     "elasticapm.instrumentation.packages.graphql.GraphQLBackendInstrumentation",
-    "elasticapm.instrumentation.packages.httpcore.HTTPCoreInstrumentation",
+    "elasticapm.instrumentation.packages.httpx.sync.httpcore.HTTPCoreInstrumentation",
+    "elasticapm.instrumentation.packages.httplib2.Httplib2Instrumentation",
+    "elasticapm.instrumentation.packages.azure.AzureInstrumentation",
     "elasticapm.instrumentation.packages.kafka.KafkaInstrumentation",
 }