[hbase] 14/18: HBASE-26137 Backport HBASE-25732 "Change the command line argument for tracing after upgrading opentelemtry to 1.0.0" to branch-2 (#3624)

2021-09-01 Thread taklwu
This is an automated email from the ASF dual-hosted git repository.

taklwu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit dd1bdc8aff73ec1d01db83ce45e8506ef926bb91
Author: Tak Lon (Stephen) Wu 
AuthorDate: Wed Aug 25 09:01:19 2021 -0700

HBASE-26137 Backport HBASE-25732 "Change the command line argument for 
tracing after upgrading opentelemtry to 1.0.0" to branch-2 (#3624)

14/17 commits of HBASE-22120, original commit 
8df9bebdd367d52a32b08c18a7cf4f9c2d712071

Co-authored-by: Duo Zhang 

Signed-off-by: Duo Zhang 
---
 conf/hbase-env.cmd | 5 +
 conf/hbase-env.sh  | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index 1f1c3e3..4beebf6 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -81,3 +81,8 @@ set HBASE_OPTS=%HBASE_OPTS% "-XX:+UseConcMarkSweepGC" 
"-Djava.net.preferIPv4Stac
 
 @rem Tell HBase whether it should manage it's own instance of ZooKeeper or not.
 @rem set HBASE_MANAGES_ZK=true
+
+@rem Uncomment to enable trace, you can change the options to use other 
exporters such as jaeger or
+@rem zipkin. See 
https://github.com/open-telemetry/opentelemetry-java-instrumentation on how to
+@rem configure exporters and other components through system properties.
+@rem set HBASE_TRACE_OPTS="-Dotel.resource.attributes=service.name=HBase 
-Dotel.traces.exporter=logging otel.metrics.exporter=none"
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index b3c4baf..d1d9a6f 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -146,6 +146,6 @@
 # export HBASE_JSHELL_ARGS="--startup DEFAULT --startup PRINTING --startup 
hbase_startup.jsh"
 
 # Uncomment to enable trace, you can change the options to use other exporters 
such as jaeger or
-# zipkin. See 
https://github.com/open-telemetry/opentelemetry-java-instrumentation on how to 
config
-# exporters and other components through system properties.
-# export HBASE_TRACE_OPTS="-Dotel.config.sampler.probability=0.1 
-Dotel.exporter=logging"
+# zipkin. See 
https://github.com/open-telemetry/opentelemetry-java-instrumentation on how to
+# configure exporters and other components through system properties.
+# export HBASE_TRACE_OPTS="-Dotel.resource.attributes=service.name=HBase 
-Dotel.traces.exporter=logging otel.metrics.exporter=none"


[hbase] 14/18: HBASE-26137 Backport HBASE-25732 "Change the command line argument for tracing after upgrading opentelemtry to 1.0.0" to branch-2 (#3624)

2021-08-27 Thread taklwu
This is an automated email from the ASF dual-hosted git repository.

taklwu pushed a commit to branch HBASE-25853
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 85e9c1a87fbafb848daf1d94351ebbc664fe2489
Author: Tak Lon (Stephen) Wu 
AuthorDate: Wed Aug 25 09:01:19 2021 -0700

HBASE-26137 Backport HBASE-25732 "Change the command line argument for 
tracing after upgrading opentelemtry to 1.0.0" to branch-2 (#3624)

14/17 commits of HBASE-22120, original commit 
8df9bebdd367d52a32b08c18a7cf4f9c2d712071

Co-authored-by: Duo Zhang 

Signed-off-by: Duo Zhang 
---
 conf/hbase-env.cmd | 5 +
 conf/hbase-env.sh  | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index 1f1c3e3..4beebf6 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -81,3 +81,8 @@ set HBASE_OPTS=%HBASE_OPTS% "-XX:+UseConcMarkSweepGC" 
"-Djava.net.preferIPv4Stac
 
 @rem Tell HBase whether it should manage it's own instance of ZooKeeper or not.
 @rem set HBASE_MANAGES_ZK=true
+
+@rem Uncomment to enable trace, you can change the options to use other 
exporters such as jaeger or
+@rem zipkin. See 
https://github.com/open-telemetry/opentelemetry-java-instrumentation on how to
+@rem configure exporters and other components through system properties.
+@rem set HBASE_TRACE_OPTS="-Dotel.resource.attributes=service.name=HBase 
-Dotel.traces.exporter=logging otel.metrics.exporter=none"
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index b3c4baf..d1d9a6f 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -146,6 +146,6 @@
 # export HBASE_JSHELL_ARGS="--startup DEFAULT --startup PRINTING --startup 
hbase_startup.jsh"
 
 # Uncomment to enable trace, you can change the options to use other exporters 
such as jaeger or
-# zipkin. See 
https://github.com/open-telemetry/opentelemetry-java-instrumentation on how to 
config
-# exporters and other components through system properties.
-# export HBASE_TRACE_OPTS="-Dotel.config.sampler.probability=0.1 
-Dotel.exporter=logging"
+# zipkin. See 
https://github.com/open-telemetry/opentelemetry-java-instrumentation on how to
+# configure exporters and other components through system properties.
+# export HBASE_TRACE_OPTS="-Dotel.resource.attributes=service.name=HBase 
-Dotel.traces.exporter=logging otel.metrics.exporter=none"