ADH-5827: Use raw Hive query id in Tez caller context

ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java

@@ -94,8 +94,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
-import static org.apache.hadoop.hive.shims.HadoopShims.USER_ID;
-
 /**
  *
  * TezTask handles the execution of TezWork. Currently it executes a graph of map and reduce work
@@ -214,8 +212,7 @@ public int execute() {
       // TODO: we could perhaps reuse the same directory for HiveResources?
       Path scratchDir = utils.createTezDir(ctx.getMRScratchDir(), conf);
       CallerContext callerContext =
-          CallerContext.create("HIVE", String.format(USER_ID, queryPlan.getQueryId(), userName), "HIVE_QUERY_ID",
-              queryPlan.getQueryStr());
+          createCallerContext(queryPlan.getQueryId(), queryPlan.getQueryStr());
 
       perfLogger.perfLogBegin(CLASS_NAME, PerfLogger.TEZ_GET_SESSION);
       session = sessionRef.value = WorkloadManagerFederation.getSession(
@@ -464,6 +461,13 @@ private void logResources(List<LocalResource> additionalLr) {
     }
   }
 
+  @VisibleForTesting
+  static CallerContext createCallerContext(String queryId, String queryStr) {
+    // The callerId must match the HIVE_QUERY_ID entity id emitted by ATSHook.
+    // User information belongs to the Hadoop caller context used by audit logs.
+    return CallerContext.create("HIVE", queryId, "HIVE_QUERY_ID", queryStr);
+  }
+
   /**
    * Ensures that the Tez Session is open and the AM has all necessary jars configured.
    */

ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTaskCallerContext.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.ql.exec.tez;
+
+import org.apache.tez.client.CallerContext;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestTezTaskCallerContext {
+
+  @Test
+  public void testCreateCallerContextUsesHiveQueryId() {
+    String queryId = "hive_20260601151408_438d1789-d603-412b-bb1d-5401effba17c";
+
+    CallerContext callerContext = TezTask.createCallerContext(queryId, "select 1");
+
+    assertEquals("HIVE", callerContext.getContext());
+    assertEquals("HIVE_QUERY_ID", callerContext.getCallerType());
+    assertEquals(queryId, callerContext.getCallerId());
+    assertEquals("select 1", callerContext.getBlob());
+  }
+}