diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml index 614075da34..60eb4d860e 100644 --- a/exporter/opentelemetry-exporter-richconsole/pyproject.toml +++ b/exporter/opentelemetry-exporter-richconsole/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ dependencies = [ "opentelemetry-api ~= 1.12", "opentelemetry-sdk ~= 1.12", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-semantic-conventions >=0.55b1", "rich>=10.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml index 8f9bfd6139..51704c5b54 100644 --- a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.5", - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml index b5d8b4aacd..8de6db899d 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml index 6f55ff6cfe..0dffe18c2c 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml index 5e745e2cfa..72e142f18d 100644 --- a/instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.27", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "typing_extensions ~= 4.1", ] diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml index dfd49eff33..beaf24c9a2 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml index a2b3737fdc..a615c58c16 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml @@ -27,9 +27,9 @@ classifiers = [ dependencies = [ "asgiref ~= 3.0", "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-asyncclick/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncclick/pyproject.toml index 835942dfac..cf9e54749e 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncclick/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-asyncclick/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt ~= 1.0", "typing_extensions ~= 4.12", ] diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml index 8205b39196..511757b3b9 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.14", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml index 5e857e57d0..6d2e628be3 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml index bdb48fed88..8b7822c91f 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml @@ -25,8 +25,8 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "opentelemetry-propagator-aws-xray ~= 1.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml index 81f21a1386..88cd06732b 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml @@ -25,8 +25,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml index 7c2d116d00..cafdcb9309 100644 --- a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml index c0171970fc..0541e4c110 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.30", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "opentelemetry-propagator-aws-xray ~= 1.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml index 24fb7baa4d..3e4faa3dd0 100644 --- a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml b/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml index f09edb1fdd..ac006c0f9e 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-click/pyproject.toml b/instrumentation/opentelemetry-instrumentation-click/pyproject.toml index 025fbf4950..541fdd8605 100644 --- a/instrumentation/opentelemetry-instrumentation-click/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-click/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml index e1e8c046ec..578e30e972 100644 --- a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", "opentelemetry-api ~= 1.12", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml index 7b74467a8f..79a2aab0c9 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py index 0d1a228be1..bc80c6a6c2 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py @@ -68,6 +68,18 @@ ConnectionT = TypeVar("ConnectionT") CursorT = TypeVar("CursorT") +TABLE_NAME_REGEX = r"(?i)(?:FROM|INTO|UPDATE|DELETE FROM)\s+\"?(\w+\"?\.\"?\w+|\w+)\"?" + + +def extract_table_name(statement): + """ + Extracts the table name from an SQL statement. + """ + match = re.search(TABLE_NAME_REGEX, statement) + if match: + return match.group(1).replace('"', '') + return None + def trace_integration( connect_module: Callable[..., Any], @@ -566,6 +578,10 @@ def traced_execution( return query_method(*args, **kwargs) name = self.get_operation_name(cursor, args) + statement = self.get_statement(cursor, args) + table_name = extract_table_name(statement) + if table_name: + name = f"{name} {table_name}" if not name: name = ( self._db_api_integration.database diff --git a/instrumentation/opentelemetry-instrumentation-django/pyproject.toml b/instrumentation/opentelemetry-instrumentation-django/pyproject.toml index 97ecd17dce..58cdbe5d73 100644 --- a/instrumentation/opentelemetry-instrumentation-django/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-django/pyproject.toml @@ -26,15 +26,15 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-wsgi == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-wsgi >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] asgi = [ - "opentelemetry-instrumentation-asgi == 0.58b0.dev", + "opentelemetry-instrumentation-asgi >= 0.55b1", ] instruments = [ "django >= 1.10", diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml b/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml index 935e2150d4..64a99fcfc8 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml b/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml index 43d29c85d0..1e3cefe8c0 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml @@ -26,10 +26,10 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-wsgi == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-wsgi >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "packaging >= 20.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml index 88bec68920..04d9a54008 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml @@ -26,10 +26,10 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-asgi == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-asgi >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml b/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml index e3029c2745..99b880828b 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml @@ -26,10 +26,10 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-wsgi == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-wsgi >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "packaging >= 21.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml b/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml index 95a5d1d3da..58799b875a 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml b/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml index 47234b04d1..a8f270497e 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml b/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml index edf252e88f..ee09096b66 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml b/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml index 11a41876b4..8a7a60fa8f 100644 --- a/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.5", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml b/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml index 4d22d5b2e9..24e9cc2bab 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml b/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml index 058e76ef93..aa90f3159d 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml b/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml index 4e0e5cfb4e..a4953777d0 100644 --- a/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml index a8ad32cc8e..369ae27df8 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", "opentelemetry-api ~= 1.5", "packaging >= 20.0", "wrapt >= 1.0.0, < 2.0.0", diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml index f9f5fcae39..f538f8a09b 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml index a67c50f042..a45353dfee 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml index b064674c05..f8ffb8ff82 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml index 82aebea494..a2cbfcadf3 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-pymssql/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymssql/pyproject.toml index f75caba29d..fc536ff80e 100644 --- a/instrumentation/opentelemetry-instrumentation-pymssql/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-pymssql/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml index 33b57c6073..d5d383eaf6 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml index edcc3006b9..57b00bf094 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml @@ -26,10 +26,10 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-wsgi == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-wsgi >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml index e5561edd4b..d6ea145065 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.12.1", ] diff --git a/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml b/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml index f8877b225c..d87c98758b 100644 --- a/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml b/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml index 4ea77ee127..63970bd541 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py index 7cfc3a4fee..e457cae79d 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py @@ -147,7 +147,7 @@ def response_hook(span, request_obj, response): ExcludeList, get_excluded_urls, parse_excluded_urls, - redact_url, + remove_url_credentials, sanitize_method, ) from opentelemetry.util.http.httplib import set_ip_on_next_http_connection @@ -231,8 +231,12 @@ def get_or_create_headers(): # https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-spans.md#http-client method = request.method span_name = get_default_span_name(method) + url = remove_url_credentials(request.url) + parsed_url = urlparse(url) + hostname = parsed_url.hostname + span_name = f"{span_name} {hostname}" + - url = redact_url(request.url) span_attributes = {} _set_http_method( diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml index 3d2eefc5b9..0915b86817 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", "packaging >= 21.0", "wrapt >= 1.11.2", ] diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml index 6d6ec70685..8e1ff76542 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-dbapi == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-dbapi >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml b/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml index e3d07348f6..bff6431dcf 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml @@ -26,10 +26,10 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-instrumentation-asgi == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-instrumentation-asgi >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml index 2eb831bf07..c52131535f 100644 --- a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", "opentelemetry-api ~= 1.11", "psutil >= 5.9.0, < 8", ] diff --git a/instrumentation/opentelemetry-instrumentation-threading/pyproject.toml b/instrumentation/opentelemetry-instrumentation-threading/pyproject.toml index 8db3d93a64..542a305f51 100644 --- a/instrumentation/opentelemetry-instrumentation-threading/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-threading/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml index 7d0939652d..43cae71f24 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml @@ -25,9 +25,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml index b145ef6045..9467700ee8 100644 --- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml b/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml index eaa36fdb22..3fb4fe5a5b 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml b/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml index 6e544f3f9d..11047e9ccc 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml index 2fb03db03e..92d952b60d 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml @@ -26,9 +26,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", - "opentelemetry-semantic-conventions == 0.58b0.dev", - "opentelemetry-util-http == 0.58b0.dev", + "opentelemetry-instrumentation >= 0.55b1", + "opentelemetry-semantic-conventions >= 0.55b1", + "opentelemetry-util-http >= 0.55b1", ] [project.optional-dependencies] diff --git a/opentelemetry-contrib-instrumentations/pyproject.toml b/opentelemetry-contrib-instrumentations/pyproject.toml index 9f40ebfac3..5347b3445a 100644 --- a/opentelemetry-contrib-instrumentations/pyproject.toml +++ b/opentelemetry-contrib-instrumentations/pyproject.toml @@ -29,57 +29,57 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "opentelemetry-instrumentation-aio-pika==0.58b0.dev", - "opentelemetry-instrumentation-aiohttp-client==0.58b0.dev", - "opentelemetry-instrumentation-aiohttp-server==0.58b0.dev", - "opentelemetry-instrumentation-aiokafka==0.58b0.dev", - "opentelemetry-instrumentation-aiopg==0.58b0.dev", - "opentelemetry-instrumentation-asgi==0.58b0.dev", - "opentelemetry-instrumentation-asyncclick==0.58b0.dev", - "opentelemetry-instrumentation-asyncio==0.58b0.dev", - "opentelemetry-instrumentation-asyncpg==0.58b0.dev", - "opentelemetry-instrumentation-aws-lambda==0.58b0.dev", - "opentelemetry-instrumentation-boto==0.58b0.dev", - "opentelemetry-instrumentation-boto3sqs==0.58b0.dev", - "opentelemetry-instrumentation-botocore==0.58b0.dev", - "opentelemetry-instrumentation-cassandra==0.58b0.dev", - "opentelemetry-instrumentation-celery==0.58b0.dev", - "opentelemetry-instrumentation-click==0.58b0.dev", - "opentelemetry-instrumentation-confluent-kafka==0.58b0.dev", - "opentelemetry-instrumentation-dbapi==0.58b0.dev", - "opentelemetry-instrumentation-django==0.58b0.dev", - "opentelemetry-instrumentation-elasticsearch==0.58b0.dev", - "opentelemetry-instrumentation-falcon==0.58b0.dev", - "opentelemetry-instrumentation-fastapi==0.58b0.dev", - "opentelemetry-instrumentation-flask==0.58b0.dev", - "opentelemetry-instrumentation-grpc==0.58b0.dev", - "opentelemetry-instrumentation-httpx==0.58b0.dev", - "opentelemetry-instrumentation-jinja2==0.58b0.dev", - "opentelemetry-instrumentation-kafka-python==0.58b0.dev", - "opentelemetry-instrumentation-logging==0.58b0.dev", - "opentelemetry-instrumentation-mysql==0.58b0.dev", - "opentelemetry-instrumentation-mysqlclient==0.58b0.dev", - "opentelemetry-instrumentation-pika==0.58b0.dev", - "opentelemetry-instrumentation-psycopg==0.58b0.dev", - "opentelemetry-instrumentation-psycopg2==0.58b0.dev", - "opentelemetry-instrumentation-pymemcache==0.58b0.dev", - "opentelemetry-instrumentation-pymongo==0.58b0.dev", - "opentelemetry-instrumentation-pymssql==0.58b0.dev", - "opentelemetry-instrumentation-pymysql==0.58b0.dev", - "opentelemetry-instrumentation-pyramid==0.58b0.dev", - "opentelemetry-instrumentation-redis==0.58b0.dev", - "opentelemetry-instrumentation-remoulade==0.58b0.dev", - "opentelemetry-instrumentation-requests==0.58b0.dev", - "opentelemetry-instrumentation-sqlalchemy==0.58b0.dev", - "opentelemetry-instrumentation-sqlite3==0.58b0.dev", - "opentelemetry-instrumentation-starlette==0.58b0.dev", - "opentelemetry-instrumentation-system-metrics==0.58b0.dev", - "opentelemetry-instrumentation-threading==0.58b0.dev", - "opentelemetry-instrumentation-tornado==0.58b0.dev", - "opentelemetry-instrumentation-tortoiseorm==0.58b0.dev", - "opentelemetry-instrumentation-urllib==0.58b0.dev", - "opentelemetry-instrumentation-urllib3==0.58b0.dev", - "opentelemetry-instrumentation-wsgi==0.58b0.dev", + "opentelemetry-instrumentation-aio-pika>=0.55b1", + "opentelemetry-instrumentation-aiohttp-client>=0.55b1", + "opentelemetry-instrumentation-aiohttp-server>=0.55b1", + "opentelemetry-instrumentation-aiokafka>=0.55b1", + "opentelemetry-instrumentation-aiopg>=0.55b1", + "opentelemetry-instrumentation-asgi>=0.55b1", + "opentelemetry-instrumentation-asyncclick>=0.55b1", + "opentelemetry-instrumentation-asyncio>=0.55b1", + "opentelemetry-instrumentation-asyncpg>=0.55b1", + "opentelemetry-instrumentation-aws-lambda>=0.55b1", + "opentelemetry-instrumentation-boto>=0.55b1", + "opentelemetry-instrumentation-boto3sqs>=0.55b1", + "opentelemetry-instrumentation-botocore>=0.55b1", + "opentelemetry-instrumentation-cassandra>=0.55b1", + "opentelemetry-instrumentation-celery>=0.55b1", + "opentelemetry-instrumentation-click>=0.55b1", + "opentelemetry-instrumentation-confluent-kafka>=0.55b1", + "opentelemetry-instrumentation-dbapi>=0.55b1", + "opentelemetry-instrumentation-django>=0.55b1", + "opentelemetry-instrumentation-elasticsearch>=0.55b1", + "opentelemetry-instrumentation-falcon>=0.55b1", + "opentelemetry-instrumentation-fastapi>=0.55b1", + "opentelemetry-instrumentation-flask>=0.55b1", + "opentelemetry-instrumentation-grpc>=0.55b1", + "opentelemetry-instrumentation-httpx>=0.55b1", + "opentelemetry-instrumentation-jinja2>=0.55b1", + "opentelemetry-instrumentation-kafka-python>=0.55b1", + "opentelemetry-instrumentation-logging>=0.55b1", + "opentelemetry-instrumentation-mysql>=0.55b1", + "opentelemetry-instrumentation-mysqlclient>=0.55b1", + "opentelemetry-instrumentation-pika>=0.55b1", + "opentelemetry-instrumentation-psycopg>=0.55b1", + "opentelemetry-instrumentation-psycopg2>=0.55b1", + "opentelemetry-instrumentation-pymemcache>=0.55b1", + "opentelemetry-instrumentation-pymongo>=0.55b1", + "opentelemetry-instrumentation-pymssql>=0.55b1", + "opentelemetry-instrumentation-pymysql>=0.55b1", + "opentelemetry-instrumentation-pyramid>=0.55b1", + "opentelemetry-instrumentation-redis>=0.55b1", + "opentelemetry-instrumentation-remoulade>=0.55b1", + "opentelemetry-instrumentation-requests>=0.55b1", + "opentelemetry-instrumentation-sqlalchemy>=0.55b1", + "opentelemetry-instrumentation-sqlite3>=0.55b1", + "opentelemetry-instrumentation-starlette>=0.55b1", + "opentelemetry-instrumentation-system-metrics>=0.55b1", + "opentelemetry-instrumentation-threading>=0.55b1", + "opentelemetry-instrumentation-tornado>=0.55b1", + "opentelemetry-instrumentation-tortoiseorm>=0.55b1", + "opentelemetry-instrumentation-urllib>=0.55b1", + "opentelemetry-instrumentation-urllib3>=0.55b1", + "opentelemetry-instrumentation-wsgi>=0.55b1", ] [project.urls] diff --git a/opentelemetry-distro/pyproject.toml b/opentelemetry-distro/pyproject.toml index a03bc35b6b..fc847df040 100644 --- a/opentelemetry-distro/pyproject.toml +++ b/opentelemetry-distro/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.58b0.dev", + "opentelemetry-instrumentation >=0.55b1", "opentelemetry-sdk ~= 1.13", ] diff --git a/opentelemetry-instrumentation/pyproject.toml b/opentelemetry-instrumentation/pyproject.toml index 6f0e7b0396..01ac114065 100644 --- a/opentelemetry-instrumentation/pyproject.toml +++ b/opentelemetry-instrumentation/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.4", - "opentelemetry-semantic-conventions == 0.58b0.dev", + "opentelemetry-semantic-conventions >= 0.55b1", "wrapt >= 1.0.0, < 2.0.0", "packaging >= 18.0", ] diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index 15c5536941..298e27cb14 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -26,199 +26,199 @@ }, { "library": "aio_pika >= 7.2.0, < 10.0.0", - "instrumentation": "opentelemetry-instrumentation-aio-pika==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-aio-pika>=0.55b1", }, { "library": "aiohttp ~= 3.0", - "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-aiohttp-client>=0.55b1", }, { "library": "aiohttp ~= 3.0", - "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-aiohttp-server>=0.55b1", }, { "library": "aiokafka >= 0.8, < 1.0", - "instrumentation": "opentelemetry-instrumentation-aiokafka==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-aiokafka>=0.55b1", }, { "library": "aiopg >= 0.13.0, < 2.0.0", - "instrumentation": "opentelemetry-instrumentation-aiopg==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-aiopg>=0.55b1", }, { "library": "asgiref ~= 3.0", - "instrumentation": "opentelemetry-instrumentation-asgi==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-asgi>=0.55b1", }, { "library": "asyncclick ~= 8.0", - "instrumentation": "opentelemetry-instrumentation-asyncclick==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-asyncclick>=0.55b1", }, { "library": "asyncpg >= 0.12.0", - "instrumentation": "opentelemetry-instrumentation-asyncpg==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-asyncpg>=0.55b1", }, { "library": "boto~=2.0", - "instrumentation": "opentelemetry-instrumentation-boto==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-boto>=0.55b1", }, { "library": "boto3 ~= 1.0", - "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-boto3sqs>=0.55b1", }, { "library": "botocore ~= 1.0", - "instrumentation": "opentelemetry-instrumentation-botocore==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-botocore>=0.55b1", }, { "library": "cassandra-driver ~= 3.25", - "instrumentation": "opentelemetry-instrumentation-cassandra==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-cassandra>=0.55b1", }, { "library": "scylla-driver ~= 3.25", - "instrumentation": "opentelemetry-instrumentation-cassandra==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-cassandra>=0.55b1", }, { "library": "celery >= 4.0, < 6.0", - "instrumentation": "opentelemetry-instrumentation-celery==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-celery>=0.55b1", }, { "library": "click >= 8.1.3, < 9.0.0", - "instrumentation": "opentelemetry-instrumentation-click==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-click>=0.55b1", }, { "library": "confluent-kafka >= 1.8.2, <= 2.7.0", - "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-confluent-kafka>=0.55b1", }, { "library": "django >= 1.10", - "instrumentation": "opentelemetry-instrumentation-django==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-django>=0.55b1", }, { "library": "elasticsearch >= 6.0", - "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-elasticsearch>=0.55b1", }, { "library": "falcon >= 1.4.1, < 5.0.0", - "instrumentation": "opentelemetry-instrumentation-falcon==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-falcon>=0.55b1", }, { "library": "fastapi ~= 0.92", - "instrumentation": "opentelemetry-instrumentation-fastapi==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-fastapi>=0.55b1", }, { "library": "flask >= 1.0", - "instrumentation": "opentelemetry-instrumentation-flask==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-flask>=0.55b1", }, { "library": "grpcio >= 1.42.0", - "instrumentation": "opentelemetry-instrumentation-grpc==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-grpc>=0.55b1", }, { "library": "httpx >= 0.18.0", - "instrumentation": "opentelemetry-instrumentation-httpx==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-httpx>=0.55b1", }, { "library": "jinja2 >= 2.7, < 4.0", - "instrumentation": "opentelemetry-instrumentation-jinja2==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-jinja2>=0.55b1", }, { "library": "kafka-python >= 2.0, < 3.0", - "instrumentation": "opentelemetry-instrumentation-kafka-python==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-kafka-python>=0.55b1", }, { "library": "kafka-python-ng >= 2.0, < 3.0", - "instrumentation": "opentelemetry-instrumentation-kafka-python==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-kafka-python>=0.55b1", }, { "library": "mysql-connector-python >= 8.0, < 10.0", - "instrumentation": "opentelemetry-instrumentation-mysql==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-mysql>=0.55b1", }, { "library": "mysqlclient < 3", - "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-mysqlclient>=0.55b1", }, { "library": "pika >= 0.12.0", - "instrumentation": "opentelemetry-instrumentation-pika==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-pika>=0.55b1", }, { "library": "psycopg >= 3.1.0", - "instrumentation": "opentelemetry-instrumentation-psycopg==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-psycopg>=0.55b1", }, { "library": "psycopg2 >= 2.7.3.1", - "instrumentation": "opentelemetry-instrumentation-psycopg2==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-psycopg2>=0.55b1", }, { "library": "psycopg2-binary >= 2.7.3.1", - "instrumentation": "opentelemetry-instrumentation-psycopg2==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-psycopg2>=0.55b1", }, { "library": "pymemcache >= 1.3.5, < 5", - "instrumentation": "opentelemetry-instrumentation-pymemcache==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-pymemcache>=0.55b1", }, { "library": "pymongo >= 3.1, < 5.0", - "instrumentation": "opentelemetry-instrumentation-pymongo==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-pymongo>=0.55b1", }, { "library": "pymssql >= 2.1.5, < 3", - "instrumentation": "opentelemetry-instrumentation-pymssql==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-pymssql>=0.55b1", }, { "library": "PyMySQL < 2", - "instrumentation": "opentelemetry-instrumentation-pymysql==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-pymysql>=0.55b1", }, { "library": "pyramid >= 1.7", - "instrumentation": "opentelemetry-instrumentation-pyramid==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-pyramid>=0.55b1", }, { "library": "redis >= 2.6", - "instrumentation": "opentelemetry-instrumentation-redis==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-redis>=0.55b1", }, { "library": "remoulade >= 0.50", - "instrumentation": "opentelemetry-instrumentation-remoulade==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-remoulade>=0.55b1", }, { "library": "requests ~= 2.0", - "instrumentation": "opentelemetry-instrumentation-requests==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-requests>=0.55b1", }, { "library": "sqlalchemy >= 1.0.0, < 2.1.0", - "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-sqlalchemy>=0.55b1", }, { "library": "starlette >= 0.13", - "instrumentation": "opentelemetry-instrumentation-starlette==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-starlette>=0.55b1", }, { "library": "psutil >= 5", - "instrumentation": "opentelemetry-instrumentation-system-metrics==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-system-metrics>=0.55b1", }, { "library": "tornado >= 5.1.1", - "instrumentation": "opentelemetry-instrumentation-tornado==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-tornado>=0.55b1", }, { "library": "tortoise-orm >= 0.17.0", - "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-tortoiseorm>=0.55b1", }, { "library": "pydantic >= 1.10.2", - "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-tortoiseorm>=0.55b1", }, { "library": "urllib3 >= 1.0.0, < 3.0.0", - "instrumentation": "opentelemetry-instrumentation-urllib3==0.58b0.dev", + "instrumentation": "opentelemetry-instrumentation-urllib3>=0.55b1", }, ] default_instrumentations = [ - "opentelemetry-instrumentation-asyncio==0.58b0.dev", - "opentelemetry-instrumentation-dbapi==0.58b0.dev", - "opentelemetry-instrumentation-logging==0.58b0.dev", - "opentelemetry-instrumentation-sqlite3==0.58b0.dev", - "opentelemetry-instrumentation-threading==0.58b0.dev", - "opentelemetry-instrumentation-urllib==0.58b0.dev", - "opentelemetry-instrumentation-wsgi==0.58b0.dev", + "opentelemetry-instrumentation-asyncio>=0.55b1", + "opentelemetry-instrumentation-dbapi>=0.55b1", + "opentelemetry-instrumentation-logging>=0.55b1", + "opentelemetry-instrumentation-sqlite3>=0.55b1", + "opentelemetry-instrumentation-threading>=0.55b1", + "opentelemetry-instrumentation-urllib>=0.55b1", + "opentelemetry-instrumentation-wsgi>=0.55b1", ]