From be27342337fdbdaf731e8cae1d3bc5d2f0043cf0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 8 Aug 2025 13:44:27 +0200 Subject: [PATCH] Cleanup jaeger backend from devstack and examples Jaeger native backend was replaced witrh OTLP and removed in [1] Though devstack and some option references remained as is, which could confuse users. [1] https://review.opendev.org/c/openstack/osprofiler/+/952373 Change-Id: I9f47b9fe5a4791d170a740a228b9cac5a5936e58 Signed-off-by: Dmitriy Rabotyagov --- devstack/README.rst | 4 ++-- devstack/lib/osprofiler | 10 +--------- devstack/plugin.sh | 5 ++--- doc/source/user/similar_projects.rst | 2 +- osprofiler/opts.py | 3 ++- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/devstack/README.rst b/devstack/README.rst index 7469f79..f19b033 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -16,7 +16,7 @@ that control this: * ```` - default messaging driver is used * ``redis`` - Redis is installed - * ``jaeger`` - Jaeger is installed + * ``otlp`` - Jaeger is installed * ``sqlalchemy`` - SQLAlchemy driver is installed The default value of ``OSPROFILER_CONNECTION_STRING`` is set automatically @@ -31,7 +31,7 @@ that control this: * ``elasticsearch://host:port`` - use Elasticsearch as trace storage * ``mongodb://host:port`` - use MongoDB as trace storage * ``loginsight://username:password@host`` - use LogInsight as trace collector/storage - * ``jaeger://host:port`` - use Jaeger as trace collector + * ``otlp://host:port`` - use OTLP as trace collector * ``mysql+pymysql://username:password@host/profiler?charset=utf8`` - use SQLAlchemy driver with MySQL database diff --git a/devstack/lib/osprofiler b/devstack/lib/osprofiler index d5b4755..0a9f4bf 100644 --- a/devstack/lib/osprofiler +++ b/devstack/lib/osprofiler @@ -69,11 +69,6 @@ function install_jaeger_backend() { fi } -function install_jaeger() { - install_jaeger_backend - pip_install jaeger-client -} - function install_otlp() { # For OTLP we use Jaeger backend but any OTLP compatible backend # can be used. @@ -81,7 +76,7 @@ function install_otlp() { pip_install opentelemetry-sdk opentelemetry-exporter-otlp } -function drop_jaeger() { +function drop_jaeger_backend() { sg docker -c 'docker rm jaeger --force' } @@ -119,9 +114,6 @@ function install_osprofiler_collector() { elif [ "$OSPROFILER_COLLECTOR" == "redis" ]; then install_redis OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-"redis://localhost:6379"} - elif [ "$OSPROFILER_COLLECTOR" == "jaeger" ]; then - install_jaeger - OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-"jaeger://localhost:6831"} elif [ "$OSPROFILER_COLLECTOR" == "otlp" ]; then install_otlp OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-"otlp://localhost:4318"} diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 49cd670..be8ba4a 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -20,10 +20,9 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then configure_osprofiler_in_tempest elif [[ "$1" == "unstack" ]]; then - if [[ "$OSPROFILER_COLLECTOR" == "jaeger" || \ - "$OSPROFILER_COLLECTOR" == "otlp" ]]; then + if [[ "$OSPROFILER_COLLECTOR" == "otlp" ]]; then echo_summary "Deleting jaeger docker container" - drop_jaeger + drop_jaeger_backend fi fi diff --git a/doc/source/user/similar_projects.rst b/doc/source/user/similar_projects.rst index 7b449ac..8c4163e 100644 --- a/doc/source/user/similar_projects.rst +++ b/doc/source/user/similar_projects.rst @@ -16,5 +16,5 @@ that are similar (in idea and ideal to OSprofiler). .. _Dapper: http://research.google.com/pubs/pub36356.html .. _Tomograph: https://github.com/stackforge/tomograph .. _HTrace: https://htrace.incubator.apache.org/ -.. _Jaeger: https://uber.github.io/jaeger/ +.. _Jaeger: https://www.jaegertracing.io/ .. _OpenTracing: https://opentracing.io/ diff --git a/osprofiler/opts.py b/osprofiler/opts.py index 1431a75..3869b62 100644 --- a/osprofiler/opts.py +++ b/osprofiler/opts.py @@ -114,7 +114,8 @@ Examples of possible values: * ``mongodb://127.0.0.1:27017`` - use mongodb driver for sending spans. * ``elasticsearch://127.0.0.1:9200`` - use elasticsearch driver for sending spans. -* ``jaeger://127.0.0.1:6831`` - use jaeger tracing as driver for sending spans. +* ``otlp://127.0.0.1:4318`` - use OpenTelementry as driver for sending spans + to jaeger. """) _es_doc_type_opt = cfg.StrOpt(