Skip to content

feat: Add custom span naming for dbapi and requests #3675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

feat: Add custom span naming for dbapi and requests #3675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f684cf7
feat: Add custom span naming for dbapi and requests
Aug 5, 2025
e0d372c
Downgrade opentelemetry-instrumentation requirement to >=0.55b1
Aug 5, 2025
6132d94
used remove_url_credentials instead of redact_url
Aug 6, 2025
04ec423
used only the hostname in urllib
Aug 7, 2025
aa2df3b
quick fix
Aug 7, 2025
1adcd4a
just hostname in spanname of request
Aug 12, 2025
2477368
revert -just hostname in spanname of request
Aug 12, 2025
d3b211a
test--just hostname in spanname of request
Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-richconsole/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-asyncclick/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-click/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
16 changes: 16 additions & 0 deletions ...n/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions instrumentation/opentelemetry-instrumentation-django/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-logging/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.58b0.dev",
"opentelemetry-instrumentation >= 0.55b1",
]

[project.optional-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading