CONTRIB: move contrib/opentracing to addons/ot20210402-contrib-cleanup-3

This one is the last optional module to build with haproxy, so let's move
it to addons/. It was renamed to "ot" as it was the only one whose USE_*
option did not match the directory name, now this is consistent.

Few changes were required, only the Makefile, and doc were adjusted, as
the directory was already self-contained and relocatable.

78 files changed, 17 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 46adef09a..9b22fe4be 100644
--- a/Makefile
+++ b/Makefile
@@ -781,7 +781,7 @@ OPTIONS_OBJS  += src/namespace.o
 endif
 
 ifneq ($(USE_OT),)
-include contrib/opentracing/Makefile
+include addons/ot/Makefile
 endif
 
 #### Global link options
@@ -1006,6 +1006,7 @@ clean:
 	$(Q)rm -f addons/promex/*.[oas]
 	$(Q)rm -f addons/51degrees/*.[oas] addons/51degrees/dummy/*.[oas] addons/51degrees/dummy/*/*.[oas]
 	$(Q)rm -f addons/deviceatlas/*.[oas] addons/deviceatlas/dummy/*.[oas]
+	$(Q)rm -f addons/ot/src/*.[oas]
 	$(Q)rm -f addons/wurfl/*.[oas] addons/wurfl/dummy/*.[oas]
 	$(Q)rm -f admin/iprange/iprange admin/iprange/ip6range admin/halog/halog
 	$(Q)rm -f dev/flags/flags dev/poll/poll dev/tcploop/tcploop
diff --git a/contrib/opentracing/AUTHORS b/addons/ot/AUTHORS
index 92b2831b2..92b2831b2 100644
--- a/contrib/opentracing/AUTHORS
+++ b/addons/ot/AUTHORS
diff --git a/contrib/opentracing/MAINTAINERS b/addons/ot/MAINTAINERS
index 92b2831b2..92b2831b2 100644
--- a/contrib/opentracing/MAINTAINERS
+++ b/addons/ot/MAINTAINERS
diff --git a/contrib/opentracing/Makefile b/addons/ot/Makefile
index 065f6f4a3..9d9b1bfee 100644
--- a/contrib/opentracing/Makefile
+++ b/addons/ot/Makefile
@@ -43,19 +43,19 @@ $(error OpenTracing C wrapper : can't find library)
 endif
 
 OPTIONS_OBJS += \
-	contrib/opentracing/src/cli.o         \
-	contrib/opentracing/src/conf.o        \
-	contrib/opentracing/src/event.o       \
-	contrib/opentracing/src/filter.o      \
-	contrib/opentracing/src/group.o       \
-	contrib/opentracing/src/http.o        \
-	contrib/opentracing/src/opentracing.o \
-	contrib/opentracing/src/parser.o      \
-	contrib/opentracing/src/pool.o        \
-	contrib/opentracing/src/scope.o       \
-	contrib/opentracing/src/util.o        \
-	contrib/opentracing/src/vars.o
-
-OPTIONS_CFLAGS  += $(OT_CFLAGS) -Icontrib/opentracing/include
+	addons/ot/src/cli.o         \
+	addons/ot/src/conf.o        \
+	addons/ot/src/event.o       \
+	addons/ot/src/filter.o      \
+	addons/ot/src/group.o       \
+	addons/ot/src/http.o        \
+	addons/ot/src/opentracing.o \
+	addons/ot/src/parser.o      \
+	addons/ot/src/pool.o        \
+	addons/ot/src/scope.o       \
+	addons/ot/src/util.o        \
+	addons/ot/src/vars.o
+
+OPTIONS_CFLAGS  += $(OT_CFLAGS) -Iaddons/ot/include
 OPTIONS_LDFLAGS += $(OT_LDFLAGS)
 OPTIONS_CFLAGS  += $(OT_DEFINE)
diff --git a/contrib/opentracing/README b/addons/ot/README
index a08f47138..a08f47138 100644
--- a/contrib/opentracing/README
+++ b/addons/ot/README
diff --git a/contrib/opentracing/README-func b/addons/ot/README-func
index 273c7f928..273c7f928 100644
--- a/contrib/opentracing/README-func
+++ b/addons/ot/README-func
diff --git a/contrib/opentracing/README-pool b/addons/ot/README-pool
index 8164b04de..8164b04de 100644
--- a/contrib/opentracing/README-pool
+++ b/addons/ot/README-pool
diff --git a/contrib/opentracing/include/cli.h b/addons/ot/include/cli.h
index 80ed6e8dc..80ed6e8dc 100644
--- a/contrib/opentracing/include/cli.h
+++ b/addons/ot/include/cli.h
diff --git a/contrib/opentracing/include/conf.h b/addons/ot/include/conf.h
index 97df12e05..97df12e05 100644
--- a/contrib/opentracing/include/conf.h
+++ b/addons/ot/include/conf.h
diff --git a/contrib/opentracing/include/config.h b/addons/ot/include/config.h
index 3b2636558..3b2636558 100644
--- a/contrib/opentracing/include/config.h
+++ b/addons/ot/include/config.h
diff --git a/contrib/opentracing/include/debug.h b/addons/ot/include/debug.h
index 7becdf72f..7becdf72f 100644
--- a/contrib/opentracing/include/debug.h
+++ b/addons/ot/include/debug.h
diff --git a/contrib/opentracing/include/define.h b/addons/ot/include/define.h
index 876916173..876916173 100644
--- a/contrib/opentracing/include/define.h
+++ b/addons/ot/include/define.h
diff --git a/contrib/opentracing/include/event.h b/addons/ot/include/event.h
index 8d59163a3..8d59163a3 100644
--- a/contrib/opentracing/include/event.h
+++ b/addons/ot/include/event.h
diff --git a/contrib/opentracing/include/filter.h b/addons/ot/include/filter.h
index 0b36354e5..0b36354e5 100644
--- a/contrib/opentracing/include/filter.h
+++ b/addons/ot/include/filter.h
diff --git a/contrib/opentracing/include/group.h b/addons/ot/include/group.h
index a9bfcc674..a9bfcc674 100644
--- a/contrib/opentracing/include/group.h
+++ b/addons/ot/include/group.h
diff --git a/contrib/opentracing/include/http.h b/addons/ot/include/http.h
index c323cdea4..c323cdea4 100644
--- a/contrib/opentracing/include/http.h
+++ b/addons/ot/include/http.h
diff --git a/contrib/opentracing/include/include.h b/addons/ot/include/include.h
index 3c0d11094..3c0d11094 100644
--- a/contrib/opentracing/include/include.h
+++ b/addons/ot/include/include.h
diff --git a/contrib/opentracing/include/opentracing.h b/addons/ot/include/opentracing.h
index 2dbf5321a..2dbf5321a 100644
--- a/contrib/opentracing/include/opentracing.h
+++ b/addons/ot/include/opentracing.h
diff --git a/contrib/opentracing/include/parser.h b/addons/ot/include/parser.h
index 5e7b298d5..5e7b298d5 100644
--- a/contrib/opentracing/include/parser.h
+++ b/addons/ot/include/parser.h
diff --git a/contrib/opentracing/include/pool.h b/addons/ot/include/pool.h
index df72c8459..df72c8459 100644
--- a/contrib/opentracing/include/pool.h
+++ b/addons/ot/include/pool.h
diff --git a/contrib/opentracing/include/scope.h b/addons/ot/include/scope.h
index 7b3f26542..7b3f26542 100644
--- a/contrib/opentracing/include/scope.h
+++ b/addons/ot/include/scope.h
diff --git a/contrib/opentracing/include/util.h b/addons/ot/include/util.h
index 776ddd203..776ddd203 100644
--- a/contrib/opentracing/include/util.h
+++ b/addons/ot/include/util.h
diff --git a/contrib/opentracing/include/vars.h b/addons/ot/include/vars.h
index 5ce88794a..5ce88794a 100644
--- a/contrib/opentracing/include/vars.h
+++ b/addons/ot/include/vars.h
diff --git a/contrib/opentracing/src/cli.c b/addons/ot/src/cli.c
index 529c6874c..529c6874c 100644
--- a/contrib/opentracing/src/cli.c
+++ b/addons/ot/src/cli.c
diff --git a/contrib/opentracing/src/conf.c b/addons/ot/src/conf.c
index 626d418bd..626d418bd 100644
--- a/contrib/opentracing/src/conf.c
+++ b/addons/ot/src/conf.c
diff --git a/contrib/opentracing/src/event.c b/addons/ot/src/event.c
index 90b582876..90b582876 100644
--- a/contrib/opentracing/src/event.c
+++ b/addons/ot/src/event.c
diff --git a/contrib/opentracing/src/filter.c b/addons/ot/src/filter.c
index 6699d4613..6699d4613 100644
--- a/contrib/opentracing/src/filter.c
+++ b/addons/ot/src/filter.c
diff --git a/contrib/opentracing/src/group.c b/addons/ot/src/group.c
index f9fdeccb9..f9fdeccb9 100644
--- a/contrib/opentracing/src/group.c
+++ b/addons/ot/src/group.c
diff --git a/contrib/opentracing/src/http.c b/addons/ot/src/http.c
index 72b31b76f..72b31b76f 100644
--- a/contrib/opentracing/src/http.c
+++ b/addons/ot/src/http.c
diff --git a/contrib/opentracing/src/opentracing.c b/addons/ot/src/opentracing.c
index b79b90a51..b79b90a51 100644
--- a/contrib/opentracing/src/opentracing.c
+++ b/addons/ot/src/opentracing.c
diff --git a/contrib/opentracing/src/parser.c b/addons/ot/src/parser.c
index b53d58d44..b53d58d44 100644
--- a/contrib/opentracing/src/parser.c
+++ b/addons/ot/src/parser.c
diff --git a/contrib/opentracing/src/pool.c b/addons/ot/src/pool.c
index ead53e1b8..ead53e1b8 100644
--- a/contrib/opentracing/src/pool.c
+++ b/addons/ot/src/pool.c
diff --git a/contrib/opentracing/src/scope.c b/addons/ot/src/scope.c
index 462c86577..462c86577 100644
--- a/contrib/opentracing/src/scope.c
+++ b/addons/ot/src/scope.c
diff --git a/contrib/opentracing/src/util.c b/addons/ot/src/util.c
index 3adc5a300..3adc5a300 100644
--- a/contrib/opentracing/src/util.c
+++ b/addons/ot/src/util.c
diff --git a/contrib/opentracing/src/vars.c b/addons/ot/src/vars.c
index 0db55141f..0db55141f 100644
--- a/contrib/opentracing/src/vars.c
+++ b/addons/ot/src/vars.c
diff --git a/contrib/opentracing/test/README-speed-cmp b/addons/ot/test/README-speed-cmp
index 9251faa37..9251faa37 100644
--- a/contrib/opentracing/test/README-speed-cmp
+++ b/addons/ot/test/README-speed-cmp
diff --git a/contrib/opentracing/test/README-speed-ctx b/addons/ot/test/README-speed-ctx
index fa8fc2ccc..fa8fc2ccc 100644
--- a/contrib/opentracing/test/README-speed-ctx
+++ b/addons/ot/test/README-speed-ctx
diff --git a/contrib/opentracing/test/README-speed-fe-be b/addons/ot/test/README-speed-fe-be
index ab2b7af20..ab2b7af20 100644
--- a/contrib/opentracing/test/README-speed-fe-be
+++ b/addons/ot/test/README-speed-fe-be
diff --git a/contrib/opentracing/test/README-speed-sa b/addons/ot/test/README-speed-sa
index ea8749d60..ea8749d60 100644
--- a/contrib/opentracing/test/README-speed-sa
+++ b/addons/ot/test/README-speed-sa
diff --git a/contrib/opentracing/test/be/cfg-dd.json b/addons/ot/test/be/cfg-dd.json
index 8b69b031c..8b69b031c 100644
--- a/contrib/opentracing/test/be/cfg-dd.json
+++ b/addons/ot/test/be/cfg-dd.json
diff --git a/contrib/opentracing/test/be/cfg-jaeger.yml b/addons/ot/test/be/cfg-jaeger.yml
index 0893166be..0893166be 100644
--- a/contrib/opentracing/test/be/cfg-jaeger.yml
+++ b/addons/ot/test/be/cfg-jaeger.yml
diff --git a/contrib/opentracing/test/be/cfg-zipkin.json b/addons/ot/test/be/cfg-zipkin.json
index f0e30d587..f0e30d587 100644
--- a/contrib/opentracing/test/be/cfg-zipkin.json
+++ b/addons/ot/test/be/cfg-zipkin.json
diff --git a/contrib/opentracing/test/be/haproxy.cfg b/addons/ot/test/be/haproxy.cfg
index c225a2f32..c225a2f32 100644
--- a/contrib/opentracing/test/be/haproxy.cfg
+++ b/addons/ot/test/be/haproxy.cfg
diff --git a/contrib/opentracing/test/be/ot.cfg b/addons/ot/test/be/ot.cfg
index edd3f76ca..edd3f76ca 100644
--- a/contrib/opentracing/test/be/ot.cfg
+++ b/addons/ot/test/be/ot.cfg
diff --git a/contrib/opentracing/test/cmp/cfg-dd.json b/addons/ot/test/cmp/cfg-dd.json
index a931f4594..a931f4594 100644
--- a/contrib/opentracing/test/cmp/cfg-dd.json
+++ b/addons/ot/test/cmp/cfg-dd.json
diff --git a/contrib/opentracing/test/cmp/cfg-jaeger.yml b/addons/ot/test/cmp/cfg-jaeger.yml
index 78efc2d16..78efc2d16 100644
--- a/contrib/opentracing/test/cmp/cfg-jaeger.yml
+++ b/addons/ot/test/cmp/cfg-jaeger.yml
diff --git a/contrib/opentracing/test/cmp/cfg-zipkin.json b/addons/ot/test/cmp/cfg-zipkin.json
index 7e9d3dd32..7e9d3dd32 100644
--- a/contrib/opentracing/test/cmp/cfg-zipkin.json
+++ b/addons/ot/test/cmp/cfg-zipkin.json
diff --git a/contrib/opentracing/test/cmp/haproxy.cfg b/addons/ot/test/cmp/haproxy.cfg
index 9d22725ae..9d22725ae 100644
--- a/contrib/opentracing/test/cmp/haproxy.cfg
+++ b/addons/ot/test/cmp/haproxy.cfg
diff --git a/contrib/opentracing/test/cmp/ot.cfg b/addons/ot/test/cmp/ot.cfg
index 21b15dd61..21b15dd61 100644
--- a/contrib/opentracing/test/cmp/ot.cfg
+++ b/addons/ot/test/cmp/ot.cfg
diff --git a/contrib/opentracing/test/ctx/cfg-dd.json b/addons/ot/test/ctx/cfg-dd.json
index f68d97a2c..f68d97a2c 100644
--- a/contrib/opentracing/test/ctx/cfg-dd.json
+++ b/addons/ot/test/ctx/cfg-dd.json
diff --git a/contrib/opentracing/test/ctx/cfg-jaeger.yml b/addons/ot/test/ctx/cfg-jaeger.yml
index 659724ac7..659724ac7 100644
--- a/contrib/opentracing/test/ctx/cfg-jaeger.yml
+++ b/addons/ot/test/ctx/cfg-jaeger.yml
diff --git a/contrib/opentracing/test/ctx/cfg-zipkin.json b/addons/ot/test/ctx/cfg-zipkin.json
index 3a3a25783..3a3a25783 100644
--- a/contrib/opentracing/test/ctx/cfg-zipkin.json
+++ b/addons/ot/test/ctx/cfg-zipkin.json
diff --git a/contrib/opentracing/test/ctx/haproxy.cfg b/addons/ot/test/ctx/haproxy.cfg
index d240a9955..d240a9955 100644
--- a/contrib/opentracing/test/ctx/haproxy.cfg
+++ b/addons/ot/test/ctx/haproxy.cfg
diff --git a/contrib/opentracing/test/ctx/ot.cfg b/addons/ot/test/ctx/ot.cfg
index a06a4e00f..a06a4e00f 100644
--- a/contrib/opentracing/test/ctx/ot.cfg
+++ b/addons/ot/test/ctx/ot.cfg
diff --git a/contrib/opentracing/test/empty/cfg-dd.json b/addons/ot/test/empty/cfg-dd.json
index 38b65f188..38b65f188 100644
--- a/contrib/opentracing/test/empty/cfg-dd.json
+++ b/addons/ot/test/empty/cfg-dd.json
diff --git a/contrib/opentracing/test/empty/cfg-jaeger.yml b/addons/ot/test/empty/cfg-jaeger.yml
index 08fadd8a3..08fadd8a3 100644
--- a/contrib/opentracing/test/empty/cfg-jaeger.yml
+++ b/addons/ot/test/empty/cfg-jaeger.yml
diff --git a/contrib/opentracing/test/empty/cfg-zipkin.json b/addons/ot/test/empty/cfg-zipkin.json
index 55fde9f92..55fde9f92 100644
--- a/contrib/opentracing/test/empty/cfg-zipkin.json
+++ b/addons/ot/test/empty/cfg-zipkin.json
diff --git a/contrib/opentracing/test/empty/haproxy.cfg b/addons/ot/test/empty/haproxy.cfg
index 9d40db96a..9d40db96a 100644
--- a/contrib/opentracing/test/empty/haproxy.cfg
+++ b/addons/ot/test/empty/haproxy.cfg
diff --git a/contrib/opentracing/test/empty/ot.cfg b/addons/ot/test/empty/ot.cfg
index 961c8bccc..961c8bccc 100644
--- a/contrib/opentracing/test/empty/ot.cfg
+++ b/addons/ot/test/empty/ot.cfg
diff --git a/contrib/opentracing/test/fe/cfg-dd.json b/addons/ot/test/fe/cfg-dd.json
index 84afe5639..84afe5639 100644
--- a/contrib/opentracing/test/fe/cfg-dd.json
+++ b/addons/ot/test/fe/cfg-dd.json
diff --git a/contrib/opentracing/test/fe/cfg-jaeger.yml b/addons/ot/test/fe/cfg-jaeger.yml
index 1365efaa0..1365efaa0 100644
--- a/contrib/opentracing/test/fe/cfg-jaeger.yml
+++ b/addons/ot/test/fe/cfg-jaeger.yml
diff --git a/contrib/opentracing/test/fe/cfg-zipkin.json b/addons/ot/test/fe/cfg-zipkin.json
index 1546b10dd..1546b10dd 100644
--- a/contrib/opentracing/test/fe/cfg-zipkin.json
+++ b/addons/ot/test/fe/cfg-zipkin.json
diff --git a/contrib/opentracing/test/fe/haproxy.cfg b/addons/ot/test/fe/haproxy.cfg
index bfc0ec9d6..bfc0ec9d6 100644
--- a/contrib/opentracing/test/fe/haproxy.cfg
+++ b/addons/ot/test/fe/haproxy.cfg
diff --git a/contrib/opentracing/test/fe/ot.cfg b/addons/ot/test/fe/ot.cfg
index 11de82876..11de82876 100644
--- a/contrib/opentracing/test/fe/ot.cfg
+++ b/addons/ot/test/fe/ot.cfg
diff --git a/contrib/opentracing/test/func-stat.sh b/addons/ot/test/func-stat.sh
index cf5bd9e39..cf5bd9e39 100755
--- a/contrib/opentracing/test/func-stat.sh
+++ b/addons/ot/test/func-stat.sh
diff --git a/contrib/opentracing/test/get-opentracing-plugins.sh b/addons/ot/test/get-opentracing-plugins.sh
index f2fe2d6b7..f2fe2d6b7 100755
--- a/contrib/opentracing/test/get-opentracing-plugins.sh
+++ b/addons/ot/test/get-opentracing-plugins.sh
diff --git a/contrib/opentracing/test/index.html b/addons/ot/test/index.html
index 09ed6fa3d..09ed6fa3d 100644
--- a/contrib/opentracing/test/index.html
+++ b/addons/ot/test/index.html
diff --git a/contrib/opentracing/test/run-cmp.sh b/addons/ot/test/run-cmp.sh
index 77b48bd01..77b48bd01 100755
--- a/contrib/opentracing/test/run-cmp.sh
+++ b/addons/ot/test/run-cmp.sh
diff --git a/contrib/opentracing/test/run-ctx.sh b/addons/ot/test/run-ctx.sh
index 064fa7dce..064fa7dce 100755
--- a/contrib/opentracing/test/run-ctx.sh
+++ b/addons/ot/test/run-ctx.sh
diff --git a/contrib/opentracing/test/run-fe-be.sh b/addons/ot/test/run-fe-be.sh
index 7e70ad618..7e70ad618 100755
--- a/contrib/opentracing/test/run-fe-be.sh
+++ b/addons/ot/test/run-fe-be.sh
diff --git a/contrib/opentracing/test/run-sa.sh b/addons/ot/test/run-sa.sh
index e5682ea74..e5682ea74 100755
--- a/contrib/opentracing/test/run-sa.sh
+++ b/addons/ot/test/run-sa.sh
diff --git a/contrib/opentracing/test/sa/cfg-dd.json b/addons/ot/test/sa/cfg-dd.json
index 0c476f73d..0c476f73d 100644
--- a/contrib/opentracing/test/sa/cfg-dd.json
+++ b/addons/ot/test/sa/cfg-dd.json
diff --git a/contrib/opentracing/test/sa/cfg-jaeger.yml b/addons/ot/test/sa/cfg-jaeger.yml
index e14f91e8e..e14f91e8e 100644
--- a/contrib/opentracing/test/sa/cfg-jaeger.yml
+++ b/addons/ot/test/sa/cfg-jaeger.yml
diff --git a/contrib/opentracing/test/sa/cfg-zipkin.json b/addons/ot/test/sa/cfg-zipkin.json
index 9d155baaf..9d155baaf 100644
--- a/contrib/opentracing/test/sa/cfg-zipkin.json
+++ b/addons/ot/test/sa/cfg-zipkin.json
diff --git a/contrib/opentracing/test/sa/haproxy.cfg b/addons/ot/test/sa/haproxy.cfg
index 988e3ab91..988e3ab91 100644
--- a/contrib/opentracing/test/sa/haproxy.cfg
+++ b/addons/ot/test/sa/haproxy.cfg
diff --git a/contrib/opentracing/test/sa/ot.cfg b/addons/ot/test/sa/ot.cfg
index ae7413b95..ae7413b95 100644
--- a/contrib/opentracing/test/sa/ot.cfg
+++ b/addons/ot/test/sa/ot.cfg
diff --git a/contrib/opentracing/test/test-speed.sh b/addons/ot/test/test-speed.sh
index ef2ccf061..ef2ccf061 100755
--- a/contrib/opentracing/test/test-speed.sh
+++ b/addons/ot/test/test-speed.sh
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 565582ccb..edf7c54af 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -21218,7 +21218,7 @@ filter opentracing [id <id>] config <file>
                 filter must have its own scope defined.
 
 More detailed documentation related to the operation, configuration and use
-of the filter can be found in the contrib/opentracing directory.
+of the filter can be found in the addons/ot directory.
 
 
 10. FastCGI applications