Merge branch 'feat-x-opaque-id'

Author: Sean Sullivan

elastic_datashader/elastic.py

@@ -179,13 +179,13 @@ def get_search_base(
     dsl_query = params["dsl_query"]
     dsl_filter = params["dsl_filter"]
     user = params.get("user")
-
+    x_opaque_id = params.get("x-opaque-id")
     # Connect to Elasticsearch
     es = Elasticsearch(
         elastic_hosts.split(","),
         verify_certs=False,
         timeout=900,
-        headers=get_es_headers(headers, user),
+        headers=get_es_headers(headers, user,x_opaque_id),
     )
 
     # Create base search
@@ -375,11 +375,12 @@ def load_datashader_headers(header_file_path_str: Optional[str]) -> Dict[Any, An
 
     return loaded_yaml
 
-def get_es_headers(request_headers=None, user=None):
+def get_es_headers(request_headers=None, user=None,x_opaque_id=None):
     """
 
     :param request_headers:
     :param user:
+    :param x_opaque_id:
     :return:
     """
 
@@ -397,7 +398,8 @@ def get_es_headers(request_headers=None, user=None):
     # Set runas user based off user provided
     if user:
         result["es-security-runas-user"] = user
-
+    if x_opaque_id:
+        result["x-opaque-id"] = x_opaque_id
     if config.api_key:
         result["Authorization"] = f"ApiKey {config.api_key}"
 

elastic_datashader/routers/tms.py

@@ -3,6 +3,7 @@
 from socket import gethostname
 from typing import Optional
 import time
+import uuid
 from elasticsearch import Elasticsearch
 from elasticsearch.exceptions import NotFoundError
 from elasticsearch_dsl import Document
@@ -185,13 +186,14 @@ def generate_tile_to_cache(idx: str, x: int, y: int, z: int, params, parameter_h
     # If we fail, then make sure to remove the cache placeholder and unclaim the task.
     # Then bail and let another request have a shot at it.
     try:
-        headers = get_es_headers(request_headers=request.headers, user=params["user"])
+        x_opaque_id = str(uuid.uuid4())
+        headers = get_es_headers(request_headers=request.headers, user=params["user"],x_opaque_id=x_opaque_id)
         logger.debug("Loaded input headers %s", request.headers)
         logger.debug("Loaded elasticsearch headers %s", headers)
 
         # Get or generate extended parameters
         params = merge_generated_parameters(request.headers, params, idx, parameter_hash)
-
+        params = {**params,"x-opaque-id":x_opaque_id}
         base_tile_info = {
             'hash': parameter_hash,
             'idx': idx,