Merge branch 'master' into redis-pubsub

Author: beniwohli

.ci/.jenkins_framework.yml

@@ -8,6 +8,7 @@ FRAMEWORK:
  - django-3.2
  - flask-0.12
  - flask-1.1
+ - flask-2.0
  - opentracing-newest
  - twisted-18
  - celery-3-flask-1.0

.ci/.jenkins_framework_full.yml

@@ -15,6 +15,7 @@ FRAMEWORK:
  - flask-0.12
  - flask-1.0
  - flask-1.1
+ - flask-2.0
  - celery-3-flask-1.0
  - celery-3-django-1.11
  - celery-3-django-2.0

docs/supported-technologies.asciidoc

@@ -51,6 +51,7 @@ We support these Flask versions:
  * 0.12 (Deprecated)
  * 1.0
  * 1.1
+ * 2.0
 
 [float]
 [[supported-aiohttp]]

elasticapm/utils/cloud.py

@@ -45,7 +45,8 @@ def aws_metadata():
  try:
  # This will throw an error if the metadata server isn't available,
  # and will be quiet in the logs, unlike urllib3
- socket.create_connection(("169.254.169.254", 80), 0.1)
+ with socket.create_connection(("169.254.169.254", 80), 0.1):
+ pass
 
  try:
  # This whole block is almost unnecessary. IMDSv1 will be supported
@@ -135,7 +136,8 @@ def azure_metadata():
  try:
  # This will throw an error if the metadata server isn't available,
  # and will be quiet in the logs, unlike urllib3
- socket.create_connection(("169.254.169.254", 80), 0.1)
+ with socket.create_connection(("169.254.169.254", 80), 0.1):
+ pass
 
  # Can't use newest metadata service version, as it's not guaranteed
  # to be available in all regions

tests/bdd/api_key_tests.py

@@ -40,7 +40,7 @@
 scenarios(os.path.join("features", "api_key.feature"))
 
 
-@given("an agent")
+@given("an agent", target_fixture="an_agent")
 def an_agent(elasticapm_client):
  return elasticapm_client
 

tests/requirements/reqs-base.txt

@@ -1,32 +1,32 @@
-pytest==6.2.2
-pytest-django==4.1.0
-coverage==5.4
-pytest-cov==2.11.1
+pytest==6.2.4
+pytest-django==4.3.0
+coverage==5.5
+pytest-cov==2.12.0
 pytest-localserver==0.5.0
-pytest-mock==3.5.1
-pytest-benchmark==3.2.3
-pytest-bdd==3.4.0
+pytest-mock==3.6.1
+pytest-benchmark==3.4.1
+pytest-bdd==4.0.2
 pytest-rerunfailures==9.1.1
 jsonschema==3.2.0
 
 
 py==1.10.0
-more-itertools==8.6.0
+more-itertools==8.7.0
 pluggy==0.13.1
 atomicwrites==1.4.0
 pyrsistent==0.17.3
-configparser==5.0.1
+configparser==5.0.2
 contextlib2==0.6.0
-importlib-metadata==3.4.0
+importlib-metadata==4.0.1
 packaging==20.9
 Mako==1.1.4
 glob2==0.7
 parse==1.19.0
 parse-type==0.5.2
 toml==0.10.2
 iniconfig==1.1.1
-docutils==0.16
-py-cpuinfo==7.0.0
+docutils==0.17.1
+py-cpuinfo==8.0.0
 statistics==1.0.3.5
 
 urllib3
@@ -49,5 +49,5 @@ ecs_logging
 structlog
 
 
-pytest-asyncio==0.14.0 ; python_version >= '3.7'
+pytest-asyncio==0.15.1 ; python_version >= '3.7'
 asynctest==0.13.0 ; python_version >= '3.7'

tests/requirements/reqs-flask-2.0.txt

@@ -0,0 +1,2 @@
+Flask>=2.0,<3
+-r reqs-base.txt