(hive) branch master updated: HIVE-28660: OTEL: Modify span names to remove inconsistency in case of completed queries (#5575). (Tanishq Chugh, reviewed by Ayush Saxena)

[ayushsaxena]

This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new fd4b157bd62 HIVE-28660: OTEL: Modify span names to remove 
inconsistency in case of completed queries (#5575). (Tanishq Chugh, reviewed by 
Ayush Saxena)
fd4b157bd62 is described below

commit fd4b157bd626c9b7176160413ae8d6dd69a2e4b2
Author: Tanishq Chugh <tanishqch...@cloudera.com>
AuthorDate: Tue Dec 10 22:38:00 2024 +0530

    HIVE-28660: OTEL: Modify span names to remove inconsistency in case of 
completed queries (#5575). (Tanishq Chugh, reviewed by Ayush Saxena)
---
 .../java/org/apache/hive/service/servlet/OTELExporter.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/src/java/org/apache/hive/service/servlet/OTELExporter.java 
b/service/src/java/org/apache/hive/service/servlet/OTELExporter.java
index 4b179bcd670..56aac3fc34b 100644
--- a/service/src/java/org/apache/hive/service/servlet/OTELExporter.java
+++ b/service/src/java/org/apache/hive/service/servlet/OTELExporter.java
@@ -94,7 +94,7 @@ public class OTELExporter extends Thread {
           if (task.getReturnValue() != null && task.getEndTime() != null
                   && queryIdToTasksMap.get(queryID).add(task.getTaskId())) {
             Context parentContext = Context.current().with(rootspan);
-            tracer.spanBuilder(queryID + " - " + task.getTaskId() + " - live")
+            tracer.spanBuilder(queryID + " - " + task.getTaskId())
                     
.setParent(parentContext).setAllAttributes(addTaskAttributes(task))
                     .setStartTimestamp(task.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan()
                     .end(task.getEndTime(), TimeUnit.MILLISECONDS);
@@ -102,12 +102,12 @@ public class OTELExporter extends Thread {
         }
       } else {
         // In case of live queries being seen for first time and has 
initialized its queryDisplay
-        rootspan = tracer.spanBuilder(queryID + " - live")
+        rootspan = tracer.spanBuilder(queryID)
                 .setStartTimestamp(lQuery.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan();
         Set<String> completedTasks = new HashSet<>();
         Context parentContext = Context.current().with(rootspan);
 
-        Span initSpan = tracer.spanBuilder(queryID + " - 
live").setParent(parentContext)
+        Span initSpan = tracer.spanBuilder(queryID).setParent(parentContext)
                 .setStartTimestamp(lQuery.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan()
                 .setAttribute("QueryId", queryID)
                 .setAttribute("QueryString", 
lQuery.getQueryDisplay().getQueryString())
@@ -122,7 +122,7 @@ public class OTELExporter extends Thread {
           if (task.getReturnValue() != null && task.getEndTime() != null) {
             completedTasks.add(task.getTaskId());
             parentContext = Context.current().with(rootspan);
-            tracer.spanBuilder(queryID + " - " + task.getTaskId() + " - live")
+            tracer.spanBuilder(queryID + " - " + task.getTaskId())
                     
.setParent(parentContext).setAllAttributes(addTaskAttributes(task))
                     .setStartTimestamp(task.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan()
                     .end(task.getEndTime(), TimeUnit.MILLISECONDS);
@@ -146,7 +146,7 @@ public class OTELExporter extends Thread {
         for (QueryDisplay.TaskDisplay task : 
hQuery.getQueryDisplay().getTaskDisplays()) {
           if (!completedTasks.contains(task.getTaskId())) {
             Context parentContext = Context.current().with(rootspan);
-            tracer.spanBuilder(hQueryId + " - " + task.getTaskId() + " - 
completed")
+            tracer.spanBuilder(hQueryId + " - " + task.getTaskId())
                     
.setParent(parentContext).setAllAttributes(addTaskAttributes(task))
                     .setStartTimestamp(task.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan()
                     .end(task.getEndTime(), TimeUnit.MILLISECONDS);
@@ -165,7 +165,7 @@ public class OTELExporter extends Thread {
                 .setStartTimestamp(hQuery.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan();
         Context parentContext = Context.current().with(rootspan);
 
-        Span initSpan = tracer.spanBuilder(hQueryId + " - 
completed").setParent(parentContext)
+        Span initSpan = tracer.spanBuilder(hQueryId).setParent(parentContext)
                 .setStartTimestamp(hQuery.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan()
                 .setAttribute("QueryId", hQueryId)
                 .setAttribute("QueryString", 
hQuery.getQueryDisplay().getQueryString())
@@ -178,7 +178,7 @@ public class OTELExporter extends Thread {
 
         for (QueryDisplay.TaskDisplay task : 
hQuery.getQueryDisplay().getTaskDisplays()) {
           parentContext = Context.current().with(rootspan);
-          tracer.spanBuilder(hQueryId + " - " + task.getTaskId() + " - 
completed")
+          tracer.spanBuilder(hQueryId + " - " + task.getTaskId())
                   
.setParent(parentContext).setAllAttributes(addTaskAttributes(task))
                   .setStartTimestamp(task.getBeginTime(), 
TimeUnit.MILLISECONDS).startSpan()
                   .end(task.getEndTime(), TimeUnit.MILLISECONDS);