Skip to content

Refactor (elasticsearch) to use semconv incubating attributes in tests. #3532

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 1 commit into from
May 22, 2025
Merged

Refactor (elasticsearch) to use semconv incubating attributes in tests. #3532

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
ElasticsearchInstrumentor,
)
from opentelemetry.instrumentation.elasticsearch.utils import sanitize_body
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.semconv._incubating.attributes.db_attributes import (
DB_STATEMENT,
DB_SYSTEM,
)
from opentelemetry.test.test_base import TestBase
from opentelemetry.trace import StatusCode

Expand Down Expand Up @@ -76,15 +79,15 @@ def get_elasticsearch_client(*args, **kwargs):
)
class TestElasticsearchIntegration(TestBase):
search_attributes = {
SpanAttributes.DB_SYSTEM: "elasticsearch",
DB_SYSTEM: "elasticsearch",
"elasticsearch.url": "/test-index/_search",
"elasticsearch.method": helpers.dsl_search_method,
"elasticsearch.target": "test-index",
SpanAttributes.DB_STATEMENT: str({"query": {"bool": {"filter": "?"}}}),
DB_STATEMENT: str({"query": {"bool": {"filter": "?"}}}),
}

create_attributes = {
SpanAttributes.DB_SYSTEM: "elasticsearch",
DB_SYSTEM: "elasticsearch",
"elasticsearch.url": "/test-index",
"elasticsearch.method": "HEAD",
}
Expand Down Expand Up @@ -361,13 +364,13 @@ def test_dsl_create(self, request_mock):
)

attributes = {
SpanAttributes.DB_SYSTEM: "elasticsearch",
DB_SYSTEM: "elasticsearch",
"elasticsearch.url": "/test-index",
"elasticsearch.method": "PUT",
}
self.assertSpanHasAttributes(span2, attributes)
self.assertEqual(
literal_eval(span2.attributes[SpanAttributes.DB_STATEMENT]),
literal_eval(span2.attributes[DB_STATEMENT]),
helpers.dsl_create_statement,
)

Expand Down Expand Up @@ -408,13 +411,13 @@ def test_dsl_index(self, request_mock):
span = spans[0]
self.assertEqual(span.name, helpers.dsl_index_span_name)
attributes = {
SpanAttributes.DB_SYSTEM: "elasticsearch",
DB_SYSTEM: "elasticsearch",
"elasticsearch.url": helpers.dsl_index_url,
"elasticsearch.method": "PUT",
}
self.assertSpanHasAttributes(span, attributes)
self.assertEqual(
literal_eval(span.attributes[SpanAttributes.DB_STATEMENT]),
literal_eval(span.attributes[DB_STATEMENT]),
{
"body": "A few words here, a few words there",
"title": "About searching",
Expand Down
Loading