dummy: sonar fix

Signed-off-by: Cagri Yonca <cagri@ibm.com>

Author: CagriYonca

src/instana/instrumentation/elasticsearch.py

@@ -97,16 +97,16 @@ def discover_cluster_name(instance: Any, connection_id: str) -> Optional[str]:
         Caches result with TTL to avoid repeated API calls.
         """
         try:
-            cached = _get_cached_cluster_name(connection_id)
-            if cached:
+            if cached := _get_cached_cluster_name(connection_id):
                 return cached
 
             # perform_request is already instrumented; the span_name == "elasticsearch"
             # guard inside it prevents recursive tracing of this info() call.
             if hasattr(instance, "info"):
                 try:
-                    cluster_name = _extract_cluster_name_from_response(instance.info())
-                    if cluster_name:
+                    if cluster_name := _extract_cluster_name_from_response(
+                        instance.info()
+                    ):
                         _store_cluster_name(connection_id, cluster_name)
                         return cluster_name
                 except Exception as e:
@@ -156,8 +156,7 @@ def collect_connection_info(
         Uses caching to optimize performance.
         """
         try:
-            connection_id = get_connection_id(instance)
-            if not connection_id:
+            if not (connection_id := get_connection_id(instance)):
                 return
 
             cached = _connection_cache[connection_id]
@@ -207,8 +206,7 @@ def extract_index_from_url(url: str) -> Optional[str]:
         """Extract index name from URL path"""
         try:
             # Match pattern: /index_name/...
-            match = INDEX_PATTERN.match(url)
-            if match:
+            if match := INDEX_PATTERN.match(url):
                 index = match.group(1)
                 # Filter out special endpoints
                 if not index.startswith("_"):
@@ -223,8 +221,7 @@ def extract_document_id_from_url(url: str) -> Optional[str]:
         Pattern: /index/_doc/document_id
         """
         try:
-            match = DOCUMENT_ID_PATTERN.match(url)
-            if match:
+            if match := DOCUMENT_ID_PATTERN.match(url):
                 return match.group(1)
         except Exception:
             logger.debug("extract_document_id_from_url error:", exc_info=True)
@@ -263,6 +260,56 @@ def detect_action_from_url(method: str, url: str) -> str:
             logger.debug("detect_action_from_url error:", exc_info=True)
             return method.lower()
 
+    def _process_multi_operation(
+        span: "InstanaSpan",
+        action: str,
+        body: Optional[Any],
+        params: Optional[dict[str, Any]],
+    ) -> bool:
+        """Handle Elasticsearch multi-operation actions."""
+        if action == "mget":
+            process_mget_params(span, body, params)
+            return True
+        if action == "msearch":
+            process_msearch_params(span, body)
+            return True
+        if action == "bulk":
+            process_bulk_params(span, body)
+            return True
+        return False
+
+    def _extract_query_string(body: Any) -> str:
+        """Convert a request body to a query string."""
+        if isinstance(body, dict):
+            return json.dumps(body)
+        if isinstance(body, str):
+            return body
+        return str(body)
+
+    def _set_search_query_attribute(span: "InstanaSpan", body: Any) -> None:
+        """Set the search query span attribute when possible."""
+        try:
+            query_str = _extract_query_string(body)
+            span.set_attribute("elasticsearch.query", shorten_query_string(query_str))
+        except Exception:
+            logger.debug("extract query error:", exc_info=True)
+
+    def _set_request_param_attributes(
+        span: "InstanaSpan",
+        params: Optional[dict[str, Any]],
+        index: Optional[str],
+        doc_id: Optional[str],
+    ) -> None:
+        """Set span attributes derived from request params."""
+        if not params:
+            return
+        if not index and "index" in params:
+            index_param = to_string_es_multi_parameter(params.get("index"))
+            if index_param:
+                span.set_attribute("elasticsearch.index", index_param)
+        if not doc_id and "id" in params:
+            span.set_attribute("elasticsearch.id", str(params["id"]))
+
     def extract_params_from_request(
         span: "InstanaSpan",
         method: str,
@@ -278,54 +325,21 @@ def extract_params_from_request(
             action = detect_action_from_url(method, url)
             span.set_attribute("elasticsearch.action", action)
 
-            # Handle multi-operations with specialized processors
-            if action == "mget":
-                process_mget_params(span, body, params)
-                return
-            elif action == "msearch":
-                process_msearch_params(span, body)
-                return
-            elif action == "bulk":
-                process_bulk_params(span, body)
+            if _process_multi_operation(span, action, body, params):
                 return
 
-            # Standard single operations
-            # Extract index from URL
             index = extract_index_from_url(url)
             if index:
                 span.set_attribute("elasticsearch.index", index)
 
-            # Extract document ID from URL
             doc_id = extract_document_id_from_url(url)
             if doc_id:
                 span.set_attribute("elasticsearch.id", doc_id)
 
-            # Extract query from body for search operations
             if action == "search" and body:
-                try:
-                    if isinstance(body, dict):
-                        query_str = json.dumps(body)
-                    elif isinstance(body, str):
-                        query_str = body
-                    else:
-                        query_str = str(body)
-
-                    shortened_query = shorten_query_string(query_str)
-                    span.set_attribute("elasticsearch.query", shortened_query)
-                except Exception:
-                    logger.debug("extract query error:", exc_info=True)
-
-            # Handle params if provided
-            if params:
-                # Extract index from params if not in URL
-                if not index and "index" in params:
-                    index_param = to_string_es_multi_parameter(params.get("index"))
-                    if index_param:
-                        span.set_attribute("elasticsearch.index", index_param)
+                _set_search_query_attribute(span, body)
 
-                # Extract document ID from params
-                if not doc_id and "id" in params:
-                    span.set_attribute("elasticsearch.id", str(params["id"]))
+            _set_request_param_attributes(span, params, index, doc_id)
 
         except Exception:
             logger.debug("extract_params_from_request error:", exc_info=True)
@@ -658,6 +672,7 @@ def perform_request_with_instana(
             except Exception as exc:
                 span.record_exception(exc)
                 span.set_attribute("elasticsearch.error", str(exc))
+                raise
 
     # ---------------------------------------------------------------------------
     # Async Client Instrumentation
@@ -671,8 +686,7 @@ async def _async_discover_cluster_name(
         Reuses the shared cache helpers; only the instance.info() call is awaited.
         """
         try:
-            cached = _get_cached_cluster_name(connection_id)
-            if cached:
+            if cached := _get_cached_cluster_name(connection_id):
                 return cached
 
             if hasattr(instance, "info"):
@@ -702,8 +716,7 @@ async def _async_collect_connection_info(
         Reuses shared helpers; only cluster discovery is awaited.
         """
         try:
-            connection_id = get_connection_id(instance)
-            if not connection_id:
+            if not (connection_id := get_connection_id(instance)):
                 return
 
             cached = _connection_cache[connection_id]
@@ -789,6 +802,7 @@ async def async_perform_request_with_instana(
             except Exception as exc:
                 span.record_exception(exc)
                 span.set_attribute("elasticsearch.error", str(exc))
+                raise
 
     logger.debug("Instrumenting elasticsearch")