1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "MINOR: opentracing: change the scope of the variable 'ot.uuid' from 'sess' to 'txn'"

Browse Source 
This reverts commit 560c7b874aef5922199e36a7f31466af323f489f.

The ot.uuid variable should have the 'sess' scope because it is created
when an OpenTracing filter is attached to a stream.  After that, the
stream processing is started and on that occasion the contexts for the
variables that have the range 'txn' and 'req' are initialized.  This
means that we cannot use variables with the specified scopes before that
point.

This patch must be backported in 2.5.
This commit is contained in:
Miroslav Zagorac 2022-02-23 10:28:10 +01:00 committed by Willy Tarreau
parent e6f76f0663
commit 220a1ad33b
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/ot/README-func
View File

@ -144,7 +144,7 @@ context is created, and flags are set that define which analyzers are used.
flt_ot_runtime_context_init(<err>) { flt_ot_runtime_context_init(<err>) {
flt_ot_pool_alloc() { flt_ot_pool_alloc() {
} }
/* Initializing and setting the variable 'txn.ot.uuid'. */ /* Initializing and setting the variable 'sess.ot.uuid'. */
if (flt_ot_var_register(<err>) != -1) { if (flt_ot_var_register(<err>) != -1) {
flt_ot_var_set(<err>) { flt_ot_var_set(<err>) {
} }

2
addons/ot/include/filter.h
View File

@ -22,7 +22,7 @@
#define FLT_OT_FMT_NAME "'" FLT_OT_OPT_NAME "' : " #define FLT_OT_FMT_NAME "'" FLT_OT_OPT_NAME "' : "
#define FLT_OT_FMT_TYPE "'filter' : " #define FLT_OT_FMT_TYPE "'filter' : "
#define FLT_OT_VAR_UUID "txn", "ot", "uuid" #define FLT_OT_VAR_UUID "sess", "ot", "uuid"
#define FLT_OT_ALERT(f, ...) ha_alert(FLT_OT_FMT_TYPE FLT_OT_FMT_NAME f "\n", ##__VA_ARGS__) #define FLT_OT_ALERT(f, ...) ha_alert(FLT_OT_FMT_TYPE FLT_OT_FMT_NAME f "\n", ##__VA_ARGS__)
#define FLT_OT_CONDITION_IF "if" #define FLT_OT_CONDITION_IF "if"

2
addons/ot/src/scope.c
View File

@ -117,7 +117,7 @@ struct flt_ot_runtime_context *flt_ot_runtime_context_init(struct stream *s, str
#ifdef USE_OT_VARS #ifdef USE_OT_VARS
/* /*
* The HAProxy variable 'txn.ot.uuid' is registered here, * The HAProxy variable 'sess.ot.uuid' is registered here,
* after which its value is set to runtime context UUID. * after which its value is set to runtime context UUID.
*/ */
if (flt_ot_var_register(FLT_OT_VAR_UUID, err) != -1) if (flt_ot_var_register(FLT_OT_VAR_UUID, err) != -1)

2
addons/ot/test/be/ot.cfg
View File

@ -20,7 +20,7 @@
ot-scope frontend_http_request ot-scope frontend_http_request
extract "ot-ctx" use-headers extract "ot-ctx" use-headers
span "HAProxy session" child-of "ot-ctx" root span "HAProxy session" child-of "ot-ctx" root
baggage "haproxy_id" var(txn.ot.uuid) baggage "haproxy_id" var(sess.ot.uuid)
span "Client session" child-of "HAProxy session" span "Client session" child-of "HAProxy session"
span "Frontend HTTP request" child-of "Client session" span "Frontend HTTP request" child-of "Client session"
tag "http.method" method tag "http.method" method

2
addons/ot/test/cmp/ot.cfg
View File

@ -21,7 +21,7 @@
ot-scope client_session_start ot-scope client_session_start
span "HAProxy session" root span "HAProxy session" root
baggage "haproxy_id" var(txn.ot.uuid) baggage "haproxy_id" var(sess.ot.uuid)
span "Client session" child-of "HAProxy session" span "Client session" child-of "HAProxy session"
event on-client-session-start event on-client-session-start

2
addons/ot/test/ctx/ot.cfg
View File

@ -57,7 +57,7 @@
ot-scope client_session_start_1 ot-scope client_session_start_1
span "HAProxy session" root span "HAProxy session" root
inject "ot_ctx_1" use-headers use-vars inject "ot_ctx_1" use-headers use-vars
baggage "haproxy_id" var(txn.ot.uuid) baggage "haproxy_id" var(sess.ot.uuid)
event on-client-session-start event on-client-session-start
ot-scope client_session_start_2 ot-scope client_session_start_2

2
addons/ot/test/fe/ot.cfg
View File

@ -22,7 +22,7 @@
ot-scope client_session_start ot-scope client_session_start
span "HAProxy session" root span "HAProxy session" root
baggage "haproxy_id" var(txn.ot.uuid) baggage "haproxy_id" var(sess.ot.uuid)
span "Client session" child-of "HAProxy session" span "Client session" child-of "HAProxy session"
event on-client-session-start event on-client-session-start

2
addons/ot/test/sa/ot.cfg
View File

@ -55,7 +55,7 @@
ot-scope client_session_start ot-scope client_session_start
span "HAProxy session" root span "HAProxy session" root
baggage "haproxy_id" var(txn.ot.uuid) baggage "haproxy_id" var(sess.ot.uuid)
span "Client session" child-of "HAProxy session" span "Client session" child-of "HAProxy session"
acl acl-test-src-ip src 127.0.0.1 acl acl-test-src-ip src 127.0.0.1
event on-client-session-start if acl-test-src-ip event on-client-session-start if acl-test-src-ip