diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py index 3dc32216d7..3ca304b870 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py @@ -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 @@ -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 @@ -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: