Merge branch 'main' into 902-add-aws-consumers

instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-aiopg/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-asgi/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-asyncpg/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-aws-lambda/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-boto/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-botocore/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-celery/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-dbapi/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-django/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-falcon/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-fastapi/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-flask/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-grpc/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-httpx/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-jinja2/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-kafka-python/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-logging/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-mysql/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pika/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-psycopg2/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pymemcache/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pymongo/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pymysql/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-pyramid/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-redis/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-requests/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-sklearn/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-sqlite3/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-starlette/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-tornado/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -45,12 +45,13 @@ def get(self):
 
 ::
 
-    export OTEL_PYTHON_TORNADO_EXLUDED_URLS='/healthz,/ping'
+    export OTEL_PYTHON_TORNADO_EXCLUDED_URLS='/healthz,/ping'
 
 Then any requests made to ``/healthz`` and ``/ping`` will not be automatically traced.
 
 Request attributes
-********************
+******************
+
 To extract certain attributes from Tornado's request object and use them as span attributes, set the environment variable ``OTEL_PYTHON_TORNADO_TRACED_REQUEST_ATTRS`` to a comma
 delimited list of request attribute names.
 

instrumentation/opentelemetry-instrumentation-urllib/setup.py

@@ -28,8 +28,8 @@
 config.read("setup.cfg")
 
 # We provide extras_require parameter to setuptools.setup later which
-# overwrites the extra_require section from setup.cfg. To support extra_require
-# secion in setup.cfg, we load it here and merge it with the extra_require param.
+# overwrites the extras_require section from setup.cfg. To support extras_require
+# section in setup.cfg, we load it here and merge it with the extras_require param.
 extras_require = {}
 if "options.extras_require" in config:
     for key, value in config["options.extras_require"].items():