Hello all,

after the patch 18da35c "MEDIUM: tree-wide: logsrv struct becomes logger", the
OpenTracing filter can no longer be compiled in debug mode.  This patch fixes 
it.

This patch should be backported to branch 2.9.


Best regards,

-- 
Miroslav Zagorac
Senior Developer
From 281b982eace44518014717038499d7002724f896 Mon Sep 17 00:00:00 2001
From: Miroslav Zagorac <mzago...@haproxy.com>
Date: Mon, 8 Jan 2024 12:55:11 +0100
Subject: [PATCH] MINOR: ot: logsrv struct becomes logger

Addition to commit 18da35c "MEDIUM: tree-wide: logsrv struct becomes logger",
when the OpenTracing filter is compiled in debug mode (using OT_DEBUG=1)
then logsrv should be changed to logger here as well.

This patch should be backported to branch 2.9.
---
 addons/ot/include/conf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/ot/include/conf.h b/addons/ot/include/conf.h
index a4bb7fcc0..c9c4863d5 100644
--- a/addons/ot/include/conf.h
+++ b/addons/ot/include/conf.h
@@ -60,7 +60,7 @@
 #define FLT_OT_DBG_CONF_TRACER(f,a)                                                                                                     \
 	FLT_OT_DBG(3, f FLT_OT_CONF_HDR_FMT "'%s' %p '%s' %p %u %hhu %hhu 0x%02hhx %p:%s 0x%08x %s %s %s }",                            \
 	           FLT_OT_CONF_HDR_ARGS(a, id), (a)->config, (a)->cfgbuf, (a)->plugin, (a)->tracer, (a)->rate_limit, (a)->flag_harderr, \
-	           (a)->flag_disabled, (a)->logging, &((a)->proxy_log), flt_ot_list_debug(&((a)->proxy_log.logsrvs)), (a)->analyzers,   \
+	           (a)->flag_disabled, (a)->logging, &((a)->proxy_log), flt_ot_list_debug(&((a)->proxy_log.loggers)), (a)->analyzers,   \
 	           flt_ot_list_debug(&((a)->acls)), flt_ot_list_debug(&((a)->ph_groups)), flt_ot_list_debug(&((a)->ph_scopes)))
 
 #define FLT_OT_DBG_CONF(f,a)                                                  \
-- 
2.42.0

Reply via email to