Skip to content

refactor(elasticsearch) Replace SpanAttributes by semconv attributes #3503

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

Merged
merged 2 commits into from
May 15, 2025
Merged

refactor(elasticsearch) Replace SpanAttributes by semconv attributes #3503

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79b9593
replace SpanAttributes by semconv attributes
almudenasanz May 15, 2025
fc4780c
Merge branch 'main' into elasticsearch-spanattributes
xrmx May 15, 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
11 changes: 6 additions & 5 deletions ...instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ def response_hook(span, response):
from opentelemetry.instrumentation.elasticsearch.version import __version__
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.utils import unwrap
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.semconv._incubating.attributes.db_attributes import (
DB_STATEMENT,
DB_SYSTEM,
)
from opentelemetry.trace import SpanKind, Status, StatusCode, get_tracer

from .utils import sanitize_body
Expand Down Expand Up @@ -288,7 +291,7 @@ def normalize_kwargs(k, v):

if span.is_recording():
attributes = {
SpanAttributes.DB_SYSTEM: "elasticsearch",
DB_SYSTEM: "elasticsearch",
}
if url:
attributes["elasticsearch.url"] = url
Expand All @@ -297,9 +300,7 @@ def normalize_kwargs(k, v):
if body:
# Don't set db.statement for bulk requests, as it can be very large
if isinstance(body, dict):
attributes[SpanAttributes.DB_STATEMENT] = (
sanitize_body(body)
)
attributes[DB_STATEMENT] = sanitize_body(body)
if params:
attributes["elasticsearch.params"] = str(params)
if doc_id:
Expand Down