This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 56e82414bb HDDS-7978. Use shell command as root span name (#5387)
56e82414bb is described below
commit 56e82414bb86d3a0fb0a55445c7e8ee501cbaa63
Author: VarshaRavi <[email protected]>
AuthorDate: Wed Oct 4 18:11:38 2023 +0530
HDDS-7978. Use shell command as root span name (#5387)
---
.../tools/src/main/java/org/apache/hadoop/hdds/cli/OzoneAdmin.java | 3 ++-
.../src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java | 3 ++-
.../tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java | 3 ++-
.../tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java | 3 ++-
.../main/java/org/apache/hadoop/ozone/shell/tenant/TenantShell.java | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/OzoneAdmin.java
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/OzoneAdmin.java
index 19c0d69bb9..093dd93430 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/OzoneAdmin.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/cli/OzoneAdmin.java
@@ -87,7 +87,8 @@ public class OzoneAdmin extends GenericCli {
@Override
public int execute(String[] argv) {
TracingUtil.initTracing("shell", createOzoneConfiguration());
- return TracingUtil.executeInNewSpan("main",
+ String spanName = "ozone admin " + String.join(" ", argv);
+ return TracingUtil.executeInNewSpan(spanName,
() -> super.execute(argv));
}
}
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
index fe6c61ccc6..1cde5fecb9 100644
---
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
@@ -81,7 +81,8 @@ public class OzoneFsShell extends FsShell {
TracingUtil.initTracing("FsShell", conf);
conf.setQuietMode(false);
shell.setConf(conf);
- int res = TracingUtil.executeInNewSpan("main",
+ String spanName = "ozone fs " + String.join(" ", argv);
+ int res = TracingUtil.executeInNewSpan(spanName,
() -> shell.execute(argv));
System.exit(res);
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
index cc134913f3..04b2c706f7 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java
@@ -47,7 +47,8 @@ public class OzoneShell extends Shell {
@Override
public int execute(String[] argv) {
TracingUtil.initTracing("shell", createOzoneConfiguration());
- return TracingUtil.executeInNewSpan("main",
+ String spanName = "ozone sh " + String.join(" ", argv);
+ return TracingUtil.executeInNewSpan(spanName,
() -> super.execute(argv));
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java
index 685830f079..60269ad538 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java
@@ -37,7 +37,8 @@ public class S3Shell extends Shell {
@Override
public int execute(String[] argv) {
TracingUtil.initTracing("s3shell", createOzoneConfiguration());
- return TracingUtil.executeInNewSpan("s3shell",
+ String spanName = "ozone s3 " + String.join(" ", argv);
+ return TracingUtil.executeInNewSpan(spanName,
() -> super.execute(argv));
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantShell.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantShell.java
index 36f8066bf3..cd5bb11af1 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantShell.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/tenant/TenantShell.java
@@ -38,7 +38,8 @@ public class TenantShell extends Shell {
@Override
public int execute(String[] argv) {
TracingUtil.initTracing("tenant-shell", createOzoneConfiguration());
- return TracingUtil.executeInNewSpan("tenant-shell",
+ String spanName = "ozone tenant " + String.join(" ", argv);
+ return TracingUtil.executeInNewSpan(spanName,
() -> super.execute(argv));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
