Merge branch 'main' into django-asgi

_template/setup.py

@@ -27,7 +27,7 @@
     "version.py",
 )
 PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 setuptools.setup(

exporter/opentelemetry-exporter-datadog/setup.py

@@ -21,7 +21,7 @@
     BASE_DIR, "src", "opentelemetry", "exporter", "datadog", "version.py"
 )
 PACKAGE_INFO = {}
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 setuptools.setup(version=PACKAGE_INFO["__version__"])

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

@@ -46,7 +46,7 @@
     "aiohttp_client",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "aiohttp_client",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-aiopg/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "aiopg", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "aiopg", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-asgi/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "asgi", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "asgi", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-asyncpg/setup.py

@@ -46,7 +46,7 @@
     "asyncpg",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "asyncpg",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-boto/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "boto", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "boto", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-botocore/setup.py

@@ -46,7 +46,7 @@
     "botocore",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "botocore",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-celery/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "celery", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "celery", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py

@@ -131,7 +131,7 @@ def attach_span(task, task_id, span, is_publish=False):
     """
     span_dict = getattr(task, CTX_KEY, None)
     if span_dict is None:
-        span_dict = dict()
+        span_dict = {}
         setattr(task, CTX_KEY, span_dict)
 
     span_dict[(task_id, is_publish)] = span

instrumentation/opentelemetry-instrumentation-celery/tests/test_utils.py

@@ -199,35 +199,35 @@ def test_task_id_from_protocol_v2(self):
                 ["user"],
                 {"force_logout": True},
                 {
-                    u"chord": None,
-                    u"callbacks": None,
-                    u"errbacks": None,
-                    u"chain": None,
+                    "chord": None,
+                    "callbacks": None,
+                    "errbacks": None,
+                    "chain": None,
                 },
             ),
-            "sender": u"tests.contrib.celery.test_integration.fn_task_parameters",
-            "exchange": u"",
-            "routing_key": u"celery",
+            "sender": "tests.contrib.celery.test_integration.fn_task_parameters",
+            "exchange": "",
+            "routing_key": "celery",
             "retry_policy": None,
             "headers": {
-                u"origin": u"gen83744@hostname",
-                u"root_id": "7e917b83-4018-431d-9832-73a28e1fb6c0",
-                u"expires": None,
-                u"shadow": None,
-                u"id": "7e917b83-4018-431d-9832-73a28e1fb6c0",
-                u"kwargsrepr": u"{'force_logout': True}",
-                u"lang": u"py",
-                u"retries": 0,
-                u"task": u"tests.contrib.celery.test_integration.fn_task_parameters",
-                u"group": None,
-                u"timelimit": [None, None],
-                u"parent_id": None,
-                u"argsrepr": u"['user']",
-                u"eta": None,
+                "origin": "gen83744@hostname",
+                "root_id": "7e917b83-4018-431d-9832-73a28e1fb6c0",
+                "expires": None,
+                "shadow": None,
+                "id": "7e917b83-4018-431d-9832-73a28e1fb6c0",
+                "kwargsrepr": "{'force_logout': True}",
+                "lang": "py",
+                "retries": 0,
+                "task": "tests.contrib.celery.test_integration.fn_task_parameters",
+                "group": None,
+                "timelimit": [None, None],
+                "parent_id": None,
+                "argsrepr": "['user']",
+                "eta": None,
             },
             "properties": {
-                u"reply_to": "c3054a07-5b28-3855-b18c-1623a24aaeca",
-                u"correlation_id": "7e917b83-4018-431d-9832-73a28e1fb6c0",
+                "reply_to": "c3054a07-5b28-3855-b18c-1623a24aaeca",
+                "correlation_id": "7e917b83-4018-431d-9832-73a28e1fb6c0",
             },
         }
 

instrumentation/opentelemetry-instrumentation-dbapi/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "dbapi", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "dbapi", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-django/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "django", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "django", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py

@@ -46,7 +46,7 @@
     "elasticsearch",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "elasticsearch",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-falcon/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "falcon", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "falcon", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-fastapi/setup.py

@@ -46,7 +46,7 @@
     "fastapi",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "fastapi",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-flask/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "flask", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "flask", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-grpc/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "grpc", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "grpc", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-httpx/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "httpx", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "httpx", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-jinja2/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "jinja2", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "jinja2", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-logging/setup.py

@@ -46,7 +46,7 @@
     "logging",
     "version.py",
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
@@ -57,7 +57,7 @@
     "logging",
     "package.py",
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.

instrumentation/opentelemetry-instrumentation-mysql/setup.py

@@ -41,13 +41,13 @@
 VERSION_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "mysql", "version.py"
 )
-with open(VERSION_FILENAME) as f:
+with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
     BASE_DIR, "src", "opentelemetry", "instrumentation", "mysql", "package.py"
 )
-with open(PACKAGE_FILENAME) as f:
+with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 # Mark any instruments/runtime dependencies as test dependencies as well.