update opentelemetry conventions

Author: miguelgrinberg

elastic_transport/_async_transport.py

@@ -260,7 +260,9 @@ async def perform_request(  # type: ignore[override, return]
             node: BaseAsyncNode = self.node_pool.get()  # type: ignore[assignment]
             start_time = self._loop.time()
             try:
-                otel_span.set_node_metadata(node.host, node.port, node.base_url, target)
+                otel_span.set_node_metadata(
+                    node.host, node.port, node.base_url, target, method
+                )
                 resp = await node.perform_request(
                     method,
                     target,

elastic_transport/_otel.py

@@ -49,14 +49,25 @@ def __init__(
         self.body_strategy = body_strategy
         self.endpoint_id = endpoint_id
 
+        if self.otel_span:
+            self.otel_span.set_attribute("db.system.name", "elasticsearch")
+            if self.endpoint_id:
+                self.otel_span.set_attribute("db.operation.name", self.endpoint_id)
+
     def set_node_metadata(
-        self, host: str, port: int, base_url: str, target: str
+        self,
+        host: str,
+        port: int,
+        base_url: str,
+        target: str,
+        method: str,
     ) -> None:
         if self.otel_span is None:
             return
 
         # url.full does not contain auth info which is passed as headers
         self.otel_span.set_attribute("url.full", base_url + target)
+        self.otel_span.set_attribute("http.request.method", method)
         self.otel_span.set_attribute("server.address", host)
         self.otel_span.set_attribute("server.port", port)
 
@@ -66,10 +77,10 @@ def set_elastic_cloud_metadata(self, headers: Mapping[str, str]) -> None:
 
         cluster_name = headers.get("X-Found-Handling-Cluster")
         if cluster_name is not None:
-            self.otel_span.set_attribute("db.elasticsearch.cluster.name", cluster_name)
+            self.otel_span.set_attribute("db.namespace", cluster_name)
         node_name = headers.get("X-Found-Handling-Instance")
         if node_name is not None:
-            self.otel_span.set_attribute("db.elasticsearch.node.name", node_name)
+            self.otel_span.set_attribute("elasticsearch.node.name", node_name)
 
     def set_db_statement(self, serialized_body: bytes) -> None:
         if self.otel_span is None:
@@ -79,5 +90,5 @@ def set_db_statement(self, serialized_body: bytes) -> None:
             return
         elif self.body_strategy == "raw" and self.endpoint_id in SEARCH_ENDPOINTS:
             self.otel_span.set_attribute(
-                "db.statement", serialized_body.decode("utf-8")
+                "db.query.text", serialized_body.decode("utf-8")
             )

elastic_transport/_transport.py

@@ -338,7 +338,9 @@ def perform_request(  # type: ignore[return]
             node = self.node_pool.get()
             start_time = time.time()
             try:
-                otel_span.set_node_metadata(node.host, node.port, node.base_url, target)
+                otel_span.set_node_metadata(
+                    node.host, node.port, node.base_url, target, method
+                )
                 resp = node.perform_request(
                     method,
                     target,

tests/test_otel.py

@@ -41,6 +41,7 @@ def test_no_span():
         9200,
         "http://localhost:9200/",
         "_ml/anomaly_detectors/my-job/_open",
+        "POST",
     )
     span.set_elastic_cloud_metadata(
         {
@@ -65,6 +66,7 @@ def test_detailed_span():
             9200,
             "http://localhost:9200/",
             "_ml/anomaly_detectors/my-job/_open",
+            "POST",
         )
         span.set_elastic_cloud_metadata(
             {
@@ -77,11 +79,15 @@ def test_detailed_span():
     assert len(spans) == 1
     assert spans[0].name == "ml.open_job"
     assert spans[0].attributes == {
+        "db.system.name": "elasticsearch",
         "url.full": "http://localhost:9200/_ml/anomaly_detectors/my-job/_open",
+        "http.request.method": "POST",
         "server.address": "localhost",
         "server.port": 9200,
-        "db.elasticsearch.cluster.name": "e9106fc68e3044f0b1475b04bf4ffd5f",
-        "db.elasticsearch.node.name": "instance-0000000001",
+        "db.operation.name": "my-job/_open",
+        "http.request.method": "POST",
+        "db.namespace": "e9106fc68e3044f0b1475b04bf4ffd5f",
+        "elasticsearch.node.name": "instance-0000000001",
     }
 
 
@@ -95,5 +101,7 @@ def test_db_statement():
     assert len(spans) == 1
     assert spans[0].name == "search"
     assert spans[0].attributes == {
-        "db.statement": '{"query":{"match_all":{}}}',
+        "db.system.name": "elasticsearch",
+        "db.operation.name": "search",
+        "db.query.text": '{"query":{"match_all":{}}}',
     }