[Elastic Search] Fix sanitization for bulk queries

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2132](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2132))
 - `opentelemetry-resource-detector-azure` Changed timeout to 4 seconds due to [timeout bug](https://github.com/open-telemetry/opentelemetry-python/issues/3644)
   ([#2136](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2136))
+- Fix elastic-search instrumentation sanitization to support bulk queries
+  ([#1990](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1988))
 
 ## Version 1.22.0/0.43b0 (2023-12-14)
 

instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/utils.py

@@ -52,9 +52,15 @@ def _unflatten_dict(d):
 
 
 def sanitize_body(body) -> str:
+    if isinstance(body, bytes):
+        body = body.decode("utf8")
+
     if isinstance(body, str):
         body = json.loads(body)
 
+    if isinstance(body, list):
+        return str([sanitize_body(elem) for elem in body])
+
     flatten_body = _flatten_dict(body)
 
     for key in flatten_body:

instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py

@@ -486,3 +486,19 @@ def test_body_sanitization(self, _):
             sanitize_body(json.dumps(sanitization_queries.interval_query)),
             str(sanitization_queries.interval_query_sanitized),
         )
+        self.assertEqual(
+            sanitize_body(
+                [
+                    json.dumps(sanitization_queries.filter_query).encode("utf-8"),
+                    json.dumps(sanitization_queries.match_query).encode("utf-8"),
+                    json.dumps(sanitization_queries.interval_query).encode("utf-8"),
+                ]
+            ),
+            str(
+                [
+                    str(sanitization_queries.filter_query_sanitized),
+                    str(sanitization_queries.match_query_sanitized),
+                    str(sanitization_queries.interval_query_sanitized),
+                ]
+            ),
+        )