From: Miroslav Zagorac <mzagorac@haproxy.com>
Date: Thu, 9 Sep 2021 12:19:25 +0000 (+0200)
Subject: MINOR: opentracing: change the scope of the variable 'ot.uuid' from 'sess' to 'txn'
X-Git-Tag: v2.5-dev7~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=560c7b874aef5922199e36a7f31466af323f489f;p=thirdparty%2Fhaproxy.git

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

At the suggestion of Willy Tarreau, the scope of the 'ot.uuid' variable was
changed from 'sess' to 'txn', so it is now limited to the transaction only.
---

diff --git a/addons/ot/README-func b/addons/ot/README-func
index 273c7f928a..a6cb21eea4 100644
--- 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 'sess.ot.uuid'. */
+         /* Initializing and setting the variable 'txn.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 c97a0cc594..6d41b72899 100644
--- 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           "sess", "ot", "uuid"
+#define FLT_OT_VAR_UUID           "txn", "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 80b0bc21b0..6492c27742 100644
--- 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 'sess.ot.uuid' is registered here,
+	 * The HAProxy variable 'txn.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 edd3f76caa..12cf0a17a7 100644
--- 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(sess.ot.uuid)
+            baggage "haproxy_id" var(txn.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 21b15dd61b..a16fc9ea68 100644
--- 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(sess.ot.uuid)
+            baggage "haproxy_id" var(txn.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 a06a4e00f7..a753f77b9c 100644
--- 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(sess.ot.uuid)
+            baggage "haproxy_id" var(txn.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 11de82876b..6f384e883a 100644
--- 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(sess.ot.uuid)
+            baggage "haproxy_id" var(txn.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 ae7413b958..654c2feaf2 100644
--- 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(sess.ot.uuid)
+            baggage "haproxy_id" var(txn.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