openstack/osprofiler
Code Issues Proposed changes

Cleanup jaeger backend from devstack and examples

Browse Source 
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 <dmitriy.rabotyagov@cleura.com>
This commit is contained in:
Dmitriy Rabotyagov
2025-08-08 13:44:27 +02:00
parent e03de733da
commit be27342337
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/README.rst
View File

@@ -16,7 +16,7 @@ that control this:
* ``<empty>`` - default messaging driver is used * ``<empty>`` - default messaging driver is used
* ``redis`` - Redis is installed * ``redis`` - Redis is installed
* ``jaeger`` - Jaeger is installed * ``otlp`` - Jaeger is installed
* ``sqlalchemy`` - SQLAlchemy driver is installed * ``sqlalchemy`` - SQLAlchemy driver is installed
The default value of ``OSPROFILER_CONNECTION_STRING`` is set automatically 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 * ``elasticsearch://host:port`` - use Elasticsearch as trace storage
* ``mongodb://host:port`` - use MongoDB as trace storage * ``mongodb://host:port`` - use MongoDB as trace storage
* ``loginsight://username:password@host`` - use LogInsight as trace collector/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 * ``mysql+pymysql://username:password@host/profiler?charset=utf8`` - use SQLAlchemy driver with MySQL database

10
devstack/lib/osprofiler
View File

@@ -69,11 +69,6 @@ function install_jaeger_backend() {
fi fi
} }
function install_jaeger() {
install_jaeger_backend
pip_install jaeger-client
}
function install_otlp() { function install_otlp() {
# For OTLP we use Jaeger backend but any OTLP compatible backend # For OTLP we use Jaeger backend but any OTLP compatible backend
# can be used. # can be used.
@@ -81,7 +76,7 @@ function install_otlp() {
pip_install opentelemetry-sdk opentelemetry-exporter-otlp pip_install opentelemetry-sdk opentelemetry-exporter-otlp
} }
function drop_jaeger() { function drop_jaeger_backend() {
sg docker -c 'docker rm jaeger --force' sg docker -c 'docker rm jaeger --force'
} }
@@ -119,9 +114,6 @@ function install_osprofiler_collector() {
elif [ "$OSPROFILER_COLLECTOR" == "redis" ]; then elif [ "$OSPROFILER_COLLECTOR" == "redis" ]; then
install_redis install_redis
OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-"redis://localhost:6379"} 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 elif [ "$OSPROFILER_COLLECTOR" == "otlp" ]; then
install_otlp install_otlp
OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-"otlp://localhost:4318"} OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-"otlp://localhost:4318"}

5
devstack/plugin.sh
View File

@@ -20,10 +20,9 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
configure_osprofiler_in_tempest configure_osprofiler_in_tempest
elif [[ "$1" == "unstack" ]]; then elif [[ "$1" == "unstack" ]]; then
if [[ "$OSPROFILER_COLLECTOR" == "jaeger" || \ if [[ "$OSPROFILER_COLLECTOR" == "otlp" ]]; then
"$OSPROFILER_COLLECTOR" == "otlp" ]]; then
echo_summary "Deleting jaeger docker container" echo_summary "Deleting jaeger docker container"
drop_jaeger drop_jaeger_backend
fi fi
fi fi

2
doc/source/user/similar_projects.rst
View File

@@ -16,5 +16,5 @@ that are similar (in idea and ideal to OSprofiler).
.. _Dapper: http://research.google.com/pubs/pub36356.html .. _Dapper: http://research.google.com/pubs/pub36356.html
.. _Tomograph: https://github.com/stackforge/tomograph .. _Tomograph: https://github.com/stackforge/tomograph
.. _HTrace: https://htrace.incubator.apache.org/ .. _HTrace: https://htrace.incubator.apache.org/
.. _Jaeger: https://uber.github.io/jaeger/ .. _Jaeger: https://www.jaegertracing.io/
.. _OpenTracing: https://opentracing.io/ .. _OpenTracing: https://opentracing.io/

3
osprofiler/opts.py
View File

@@ -114,7 +114,8 @@ Examples of possible values:
* ``mongodb://127.0.0.1:27017`` - use mongodb driver for sending spans. * ``mongodb://127.0.0.1:27017`` - use mongodb driver for sending spans.
* ``elasticsearch://127.0.0.1:9200`` - use elasticsearch driver for sending * ``elasticsearch://127.0.0.1:9200`` - use elasticsearch driver for sending
spans. 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( _es_doc_type_opt = cfg.StrOpt(