common: add a config option for jaeger agent port

jaeger-agent port is changed from 6831 to 6799 in commit 9d7280c3,
which lead to "vstart.sh ... --jaeger" can't work.
In order to fix this problem, a config option jaeger_agent_port is added
and in vstart.sh the default value of jaeger_agent_port is set to 6831.

Signed-off-by: Yang Honggang <yanghonggang_yewu@cmss.chinamobile.com>

diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index ea3c1f4fdb7e551ee0ecc05d84df1a641ea170c0..25a99c89d411e516b1891d7988e781d2d16a648b 100644 (file)
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -6318,6 +6318,14 @@ options:
   - rgw
   - osd
   with_legacy: true
+- name: jaeger_agent_port
+  type: int
+  level: advanced
+  desc: port number of the jaeger agent
+  default: 6799
+  services:
+  - rgw
+  - osd
 - name: mgr_ttl_cache_expire_seconds
   type: uint
   level: dev

diff --git a/src/common/tracer.cc b/src/common/tracer.cc
index 61c66982c952f927de83f1d357ddd01210a6186e..ffabc0b20a111adeac444019c386deefc4c2ddf8 100644 (file)
--- a/src/common/tracer.cc
+++ b/src/common/tracer.cc
@@ -24,7 +24,9 @@ Tracer::Tracer(opentelemetry::nostd::string_view service_name) {
 void Tracer::init(opentelemetry::nostd::string_view service_name) {
   if (!tracer) {
     opentelemetry::exporter::jaeger::JaegerExporterOptions exporter_options;
-    exporter_options.server_port = 6799;
+    if (g_ceph_context) {
+      exporter_options.server_port = g_ceph_context->_conf.get_val<int64_t>("jaeger_agent_port");
+    }
     const opentelemetry::sdk::trace::BatchSpanProcessorOptions processor_options;
     const auto jaeger_resource = opentelemetry::sdk::resource::Resource::Create(std::move(opentelemetry::sdk::resource::ResourceAttributes{{"service.name", service_name}}));
     auto jaeger_exporter = std::unique_ptr<opentelemetry::sdk::trace::SpanExporter>(new opentelemetry::exporter::jaeger::JaegerExporter(exporter_options));

diff --git a/src/vstart.sh b/src/vstart.sh
index bc4e0afe5ef5930ca68665a74f14844c05955cd0..5eb060e48ed2ce28c07d49ec0a9863e9d4e40128 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -712,6 +712,11 @@ prepare_conf() {
         $(format_conf "${extra_conf}")
         $AUTOSCALER_OPTS
 EOF
+    if [ "$with_jaeger" -eq 1 ] ; then
+        wconf <<EOF
+        jaeger_agent_port = 6831
+EOF
+    fi
     if [ "$lockdep" -eq 1 ] ; then
         wconf <<EOF
         lockdep = true