Skip to content

Commit 0a1cb45

Browse files
Revert "[Backport 9.0] Update opentelemetry conventions" (#253)
* Revert "Update opentelemetry conventions (#245) (#249)" This reverts commit c7e210d. * keep the linter updates
1 parent c7e210d commit 0a1cb45

File tree

5 files changed

+10
-43
lines changed

5 files changed

+10
-43
lines changed

docs/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545

4646
intersphinx_mapping = {
4747
"python": ("https://docs.python.org/3", None),
48-
"requests": ("https://requests.readthedocs.io/en/latest", None),
48+
"requests": ("https://docs.python-requests.org/en/latest", None),
4949
}

elastic_transport/_async_transport.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,7 @@ async def perform_request( # type: ignore[override, return]
260260
node: BaseAsyncNode = self.node_pool.get() # type: ignore[assignment]
261261
start_time = self._loop.time()
262262
try:
263-
otel_span.set_node_metadata(
264-
node.host, node.port, node.base_url, target, method
265-
)
263+
otel_span.set_node_metadata(node.host, node.port, node.base_url, target)
266264
resp = await node.perform_request(
267265
method,
268266
target,
@@ -366,7 +364,6 @@ async def perform_request( # type: ignore[override, return]
366364
# We either got a response we're happy with or
367365
# we've exhausted all of our retries so we return it.
368366
if not retry or attempt >= max_retries:
369-
otel_span.set_db_response(resp.meta.status)
370367
return TransportApiResponse(resp.meta, body)
371368
else:
372369
_logger.warning(

elastic_transport/_otel.py

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,14 @@ def __init__(
4949
self.body_strategy = body_strategy
5050
self.endpoint_id = endpoint_id
5151

52-
if self.otel_span:
53-
self.otel_span.set_attribute("db.system.name", "elasticsearch")
54-
if self.endpoint_id:
55-
self.otel_span.set_attribute("db.operation.name", self.endpoint_id)
56-
5752
def set_node_metadata(
58-
self,
59-
host: str,
60-
port: int,
61-
base_url: str,
62-
target: str,
63-
method: str,
53+
self, host: str, port: int, base_url: str, target: str
6454
) -> None:
6555
if self.otel_span is None:
6656
return
6757

6858
# url.full does not contain auth info which is passed as headers
6959
self.otel_span.set_attribute("url.full", base_url + target)
70-
self.otel_span.set_attribute("http.request.method", method)
7160
self.otel_span.set_attribute("server.address", host)
7261
self.otel_span.set_attribute("server.port", port)
7362

@@ -77,10 +66,10 @@ def set_elastic_cloud_metadata(self, headers: Mapping[str, str]) -> None:
7766

7867
cluster_name = headers.get("X-Found-Handling-Cluster")
7968
if cluster_name is not None:
80-
self.otel_span.set_attribute("db.namespace", cluster_name)
69+
self.otel_span.set_attribute("db.elasticsearch.cluster.name", cluster_name)
8170
node_name = headers.get("X-Found-Handling-Instance")
8271
if node_name is not None:
83-
self.otel_span.set_attribute("elasticsearch.node.name", node_name)
72+
self.otel_span.set_attribute("db.elasticsearch.node.name", node_name)
8473

8574
def set_db_statement(self, serialized_body: bytes) -> None:
8675
if self.otel_span is None:
@@ -90,11 +79,5 @@ def set_db_statement(self, serialized_body: bytes) -> None:
9079
return
9180
elif self.body_strategy == "raw" and self.endpoint_id in SEARCH_ENDPOINTS:
9281
self.otel_span.set_attribute(
93-
"db.query.text", serialized_body.decode("utf-8")
82+
"db.statement", serialized_body.decode("utf-8")
9483
)
95-
96-
def set_db_response(self, status_code: int) -> None:
97-
if self.otel_span is None:
98-
return
99-
100-
self.otel_span.set_attribute("db.response.status_code", str(status_code))

elastic_transport/_transport.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,7 @@ def perform_request( # type: ignore[return]
338338
node = self.node_pool.get()
339339
start_time = time.time()
340340
try:
341-
otel_span.set_node_metadata(
342-
node.host, node.port, node.base_url, target, method
343-
)
341+
otel_span.set_node_metadata(node.host, node.port, node.base_url, target)
344342
resp = node.perform_request(
345343
method,
346344
target,
@@ -444,7 +442,6 @@ def perform_request( # type: ignore[return]
444442
# We either got a response we're happy with or
445443
# we've exhausted all of our retries so we return it.
446444
if not retry or attempt >= max_retries:
447-
otel_span.set_db_response(resp.meta.status)
448445
return TransportApiResponse(resp.meta, body)
449446
else:
450447
_logger.warning(

tests/test_otel.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ def test_no_span():
4141
9200,
4242
"http://localhost:9200/",
4343
"_ml/anomaly_detectors/my-job/_open",
44-
"POST",
4544
)
4645
span.set_elastic_cloud_metadata(
4746
{
@@ -66,30 +65,23 @@ def test_detailed_span():
6665
9200,
6766
"http://localhost:9200/",
6867
"_ml/anomaly_detectors/my-job/_open",
69-
"POST",
7068
)
7169
span.set_elastic_cloud_metadata(
7270
{
7371
"X-Found-Handling-Cluster": "e9106fc68e3044f0b1475b04bf4ffd5f",
7472
"X-Found-Handling-Instance": "instance-0000000001",
7573
}
7674
)
77-
span.set_db_response(202)
7875

7976
spans = memory_exporter.get_finished_spans()
8077
assert len(spans) == 1
8178
assert spans[0].name == "ml.open_job"
8279
assert spans[0].attributes == {
83-
"db.system.name": "elasticsearch",
8480
"url.full": "http://localhost:9200/_ml/anomaly_detectors/my-job/_open",
85-
"http.request.method": "POST",
8681
"server.address": "localhost",
8782
"server.port": 9200,
88-
"db.operation.name": "my-job/_open",
89-
"http.request.method": "POST",
90-
"db.namespace": "e9106fc68e3044f0b1475b04bf4ffd5f",
91-
"elasticsearch.node.name": "instance-0000000001",
92-
"db.response.status_code": "202",
83+
"db.elasticsearch.cluster.name": "e9106fc68e3044f0b1475b04bf4ffd5f",
84+
"db.elasticsearch.node.name": "instance-0000000001",
9385
}
9486

9587

@@ -103,7 +95,5 @@ def test_db_statement():
10395
assert len(spans) == 1
10496
assert spans[0].name == "search"
10597
assert spans[0].attributes == {
106-
"db.system.name": "elasticsearch",
107-
"db.operation.name": "search",
108-
"db.query.text": '{"query":{"match_all":{}}}',
98+
"db.statement": '{"query":{"match_all":{}}}',
10999
}

0 commit comments

Comments
 (0)