From 69ae0060425c735608688c280a125ead459caea1 Mon Sep 17 00:00:00 2001
From: sravani-revuri <rvsravani24@gmail.com>
Date: Wed, 15 Apr 2026 19:46:13 +0530
Subject: [PATCH 1/2] HDDS-15033. Link SCM allocate-block calls to client
 trace.

---
 hadoop-hdds/framework/pom.xml                                 | 4 ++++
 .../hadoop/hdds/server/OzoneProtocolMessageDispatcher.java    | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 34dcdde921fc..1f71a2376f85 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -100,6 +100,10 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-context</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>simpleclient</artifactId>
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java
index a0e19664366f..8134074413cb 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java
@@ -19,6 +19,7 @@
 
 import com.google.protobuf.ServiceException;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.context.Scope;
 import java.util.function.Function;
 import org.apache.hadoop.hdds.tracing.TracingUtil;
 import org.apache.hadoop.hdds.utils.ProtocolMessageMetrics;
@@ -71,7 +72,7 @@ public RESPONSE processRequest(
       TYPE type,
       String traceId) throws ServiceException {
     Span span = TracingUtil.importAndCreateSpan(type.toString(), traceId);
-    try {
+    try (Scope currentscope = span.makeCurrent()) {
       if (logger.isTraceEnabled()) {
         logger.trace(
             "[service={}] [type={}] request is received: <json>{}</json>",

From 221eb4815eab62df2ca8e3260b1ff328ea613cb9 Mon Sep 17 00:00:00 2001
From: sravani <149140781+sravani-revuri@users.noreply.github.com>
Date: Thu, 16 Apr 2026 09:42:42 +0530
Subject: [PATCH 2/2] included lowerCamelCase

Co-authored-by: sreejasahithi <115860222+sreejasahithi@users.noreply.github.com>
---
 .../hadoop/hdds/server/OzoneProtocolMessageDispatcher.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java
index 8134074413cb..94a35d488abb 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/OzoneProtocolMessageDispatcher.java
@@ -72,7 +72,7 @@ public RESPONSE processRequest(
       TYPE type,
       String traceId) throws ServiceException {
     Span span = TracingUtil.importAndCreateSpan(type.toString(), traceId);
-    try (Scope currentscope = span.makeCurrent()) {
+    try (Scope currentScope = span.makeCurrent()) {
       if (logger.isTraceEnabled()) {
         logger.trace(
             "[service={}] [type={}] request is received: <json>{}</json>",