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

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.

diff --git a/addons/ot/README-func b/addons/ot/README-func
index a6cb21eea407db6c094e45f334d8e40edb1e2aba..273c7f928a332d5807c400ca90ddd264c5caf8e3 100644 (file)
--- a/addons/ot/README-func
+++ b/addons/ot/README-func
@@ -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_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) {
             flt_ot_var_set(<err>) {
             }

diff --git a/addons/ot/include/filter.h b/addons/ot/include/filter.h
index 6d41b72899ca742fb2eb3f474af182b9c3819ecb..c97a0cc59431a8009356ca33bd1fcafe5c45f9df 100644 (file)
--- a/addons/ot/include/filter.h
+++ b/addons/ot/include/filter.h
@@ -22,7 +22,7 @@
 
 #define FLT_OT_FMT_NAME           "'" FLT_OT_OPT_NAME "' : "
 #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_CONDITION_IF       "if"

diff --git a/addons/ot/src/scope.c b/addons/ot/src/scope.c
index 6492c27742b3466675fe3a0b81b1713d33a23f89..80b0bc21b02fb33d2150691dee9e51dbfd9c0714 100644 (file)
--- a/addons/ot/src/scope.c
+++ b/addons/ot/src/scope.c
@@ -117,7 +117,7 @@ struct flt_ot_runtime_context *flt_ot_runtime_context_init(struct stream *s, str
 
 #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.
         */
        if (flt_ot_var_register(FLT_OT_VAR_UUID, err) != -1)

diff --git a/addons/ot/test/be/ot.cfg b/addons/ot/test/be/ot.cfg
index 12cf0a17a7614ec2ebe89fd93311b58a3ff4ae93..edd3f76caaef38dca0b41cecb936ecde5d8a55f1 100644 (file)
--- a/addons/ot/test/be/ot.cfg
+++ b/addons/ot/test/be/ot.cfg
@@ -20,7 +20,7 @@
     ot-scope frontend_http_request
         extract "ot-ctx" use-headers
         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 "Frontend HTTP request" child-of "Client session"
             tag "http.method" method

diff --git a/addons/ot/test/cmp/ot.cfg b/addons/ot/test/cmp/ot.cfg
index a16fc9ea6839faa300631f2f43be63f7019e2c16..21b15dd61bb9decc218a279babb19bb7501396f0 100644 (file)
--- a/addons/ot/test/cmp/ot.cfg
+++ b/addons/ot/test/cmp/ot.cfg
@@ -21,7 +21,7 @@
 
     ot-scope client_session_start
         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"
         event on-client-session-start
 

diff --git a/addons/ot/test/ctx/ot.cfg b/addons/ot/test/ctx/ot.cfg
index a753f77b9c29cfa1c46e6ddd8131174c7d2bc5fe..a06a4e00f70c4a8d3598175e9be02e8a5a6c21f1 100644 (file)
--- a/addons/ot/test/ctx/ot.cfg
+++ b/addons/ot/test/ctx/ot.cfg
@@ -57,7 +57,7 @@
     ot-scope client_session_start_1
         span "HAProxy session" root
             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
 
     ot-scope client_session_start_2

diff --git a/addons/ot/test/fe/ot.cfg b/addons/ot/test/fe/ot.cfg
index 6f384e883ab55386190620a1d6e8c8531b7b36c2..11de82876ba07b961e72a1b12f9c218d33e58a0a 100644 (file)
--- a/addons/ot/test/fe/ot.cfg
+++ b/addons/ot/test/fe/ot.cfg
@@ -22,7 +22,7 @@
 
     ot-scope client_session_start
         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"
         event on-client-session-start
 

diff --git a/addons/ot/test/sa/ot.cfg b/addons/ot/test/sa/ot.cfg
index 654c2feaf2374d981e7dd496ccf3f3dc396d47f1..ae7413b9584c15b63ee5e04f9f59ba7e591ded87 100644 (file)
--- a/addons/ot/test/sa/ot.cfg
+++ b/addons/ot/test/sa/ot.cfg
@@ -55,7 +55,7 @@
 
     ot-scope client_session_start
         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"
         acl acl-test-src-ip src 127.0.0.1
         event on-client-session-start if acl-test-src-ip