CONTRIB: move contrib/opentracing to addons/ot

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.

diff --git a/Makefile b/Makefile
index 46adef09a57eda36cb389209e866ba3956d28fb5..9b22fe4becdfb46ecde89e33e4fcafb8a43035cc 100644 (file)
--- 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
similarity index 100%
rename from contrib/opentracing/AUTHORS
rename to addons/ot/AUTHORS

diff --git a/contrib/opentracing/MAINTAINERS b/addons/ot/MAINTAINERS
similarity index 100%
rename from contrib/opentracing/MAINTAINERS
rename to addons/ot/MAINTAINERS

diff --git a/contrib/opentracing/Makefile b/addons/ot/Makefile
similarity index 69%
rename from contrib/opentracing/Makefile
rename to addons/ot/Makefile
index 065f6f4a39b74a9de45990bc6d0c0c5eb0de33dc..9d9b1bfeeba18d9e6c86f729d08037b2a83013b7 100644 (file)
--- 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
similarity index 100%
rename from contrib/opentracing/README
rename to addons/ot/README

diff --git a/contrib/opentracing/README-func b/addons/ot/README-func
similarity index 100%
rename from contrib/opentracing/README-func
rename to addons/ot/README-func

diff --git a/contrib/opentracing/README-pool b/addons/ot/README-pool
similarity index 100%
rename from contrib/opentracing/README-pool
rename to addons/ot/README-pool

diff --git a/contrib/opentracing/include/cli.h b/addons/ot/include/cli.h
similarity index 100%
rename from contrib/opentracing/include/cli.h
rename to addons/ot/include/cli.h

diff --git a/contrib/opentracing/include/conf.h b/addons/ot/include/conf.h
similarity index 100%
rename from contrib/opentracing/include/conf.h
rename to addons/ot/include/conf.h

diff --git a/contrib/opentracing/include/config.h b/addons/ot/include/config.h
similarity index 100%
rename from contrib/opentracing/include/config.h
rename to addons/ot/include/config.h

diff --git a/contrib/opentracing/include/debug.h b/addons/ot/include/debug.h
similarity index 100%
rename from contrib/opentracing/include/debug.h
rename to addons/ot/include/debug.h

diff --git a/contrib/opentracing/include/define.h b/addons/ot/include/define.h
similarity index 100%
rename from contrib/opentracing/include/define.h
rename to addons/ot/include/define.h

diff --git a/contrib/opentracing/include/event.h b/addons/ot/include/event.h
similarity index 100%
rename from contrib/opentracing/include/event.h
rename to addons/ot/include/event.h

diff --git a/contrib/opentracing/include/filter.h b/addons/ot/include/filter.h
similarity index 100%
rename from contrib/opentracing/include/filter.h
rename to addons/ot/include/filter.h

diff --git a/contrib/opentracing/include/group.h b/addons/ot/include/group.h
similarity index 100%
rename from contrib/opentracing/include/group.h
rename to addons/ot/include/group.h

diff --git a/contrib/opentracing/include/http.h b/addons/ot/include/http.h
similarity index 100%
rename from contrib/opentracing/include/http.h
rename to addons/ot/include/http.h

diff --git a/contrib/opentracing/include/include.h b/addons/ot/include/include.h
similarity index 100%
rename from contrib/opentracing/include/include.h
rename to addons/ot/include/include.h

diff --git a/contrib/opentracing/include/opentracing.h b/addons/ot/include/opentracing.h
similarity index 100%
rename from contrib/opentracing/include/opentracing.h
rename to addons/ot/include/opentracing.h

diff --git a/contrib/opentracing/include/parser.h b/addons/ot/include/parser.h
similarity index 100%
rename from contrib/opentracing/include/parser.h
rename to addons/ot/include/parser.h

diff --git a/contrib/opentracing/include/pool.h b/addons/ot/include/pool.h
similarity index 100%
rename from contrib/opentracing/include/pool.h
rename to addons/ot/include/pool.h

diff --git a/contrib/opentracing/include/scope.h b/addons/ot/include/scope.h
similarity index 100%
rename from contrib/opentracing/include/scope.h
rename to addons/ot/include/scope.h

diff --git a/contrib/opentracing/include/util.h b/addons/ot/include/util.h
similarity index 100%
rename from contrib/opentracing/include/util.h
rename to addons/ot/include/util.h

diff --git a/contrib/opentracing/include/vars.h b/addons/ot/include/vars.h
similarity index 100%
rename from contrib/opentracing/include/vars.h
rename to addons/ot/include/vars.h

diff --git a/contrib/opentracing/src/cli.c b/addons/ot/src/cli.c
similarity index 100%
rename from contrib/opentracing/src/cli.c
rename to addons/ot/src/cli.c

diff --git a/contrib/opentracing/src/conf.c b/addons/ot/src/conf.c
similarity index 100%
rename from contrib/opentracing/src/conf.c
rename to addons/ot/src/conf.c

diff --git a/contrib/opentracing/src/event.c b/addons/ot/src/event.c
similarity index 100%
rename from contrib/opentracing/src/event.c
rename to addons/ot/src/event.c

diff --git a/contrib/opentracing/src/filter.c b/addons/ot/src/filter.c
similarity index 100%
rename from contrib/opentracing/src/filter.c
rename to addons/ot/src/filter.c

diff --git a/contrib/opentracing/src/group.c b/addons/ot/src/group.c
similarity index 100%
rename from contrib/opentracing/src/group.c
rename to addons/ot/src/group.c

diff --git a/contrib/opentracing/src/http.c b/addons/ot/src/http.c
similarity index 100%
rename from contrib/opentracing/src/http.c
rename to addons/ot/src/http.c

diff --git a/contrib/opentracing/src/opentracing.c b/addons/ot/src/opentracing.c
similarity index 100%
rename from contrib/opentracing/src/opentracing.c
rename to addons/ot/src/opentracing.c

diff --git a/contrib/opentracing/src/parser.c b/addons/ot/src/parser.c
similarity index 100%
rename from contrib/opentracing/src/parser.c
rename to addons/ot/src/parser.c

diff --git a/contrib/opentracing/src/pool.c b/addons/ot/src/pool.c
similarity index 100%
rename from contrib/opentracing/src/pool.c
rename to addons/ot/src/pool.c

diff --git a/contrib/opentracing/src/scope.c b/addons/ot/src/scope.c
similarity index 100%
rename from contrib/opentracing/src/scope.c
rename to addons/ot/src/scope.c

diff --git a/contrib/opentracing/src/util.c b/addons/ot/src/util.c
similarity index 100%
rename from contrib/opentracing/src/util.c
rename to addons/ot/src/util.c

diff --git a/contrib/opentracing/src/vars.c b/addons/ot/src/vars.c
similarity index 100%
rename from contrib/opentracing/src/vars.c
rename to addons/ot/src/vars.c

diff --git a/contrib/opentracing/test/README-speed-cmp b/addons/ot/test/README-speed-cmp
similarity index 100%
rename from contrib/opentracing/test/README-speed-cmp
rename to addons/ot/test/README-speed-cmp

diff --git a/contrib/opentracing/test/README-speed-ctx b/addons/ot/test/README-speed-ctx
similarity index 100%
rename from contrib/opentracing/test/README-speed-ctx
rename to addons/ot/test/README-speed-ctx

diff --git a/contrib/opentracing/test/README-speed-fe-be b/addons/ot/test/README-speed-fe-be
similarity index 100%
rename from contrib/opentracing/test/README-speed-fe-be
rename to addons/ot/test/README-speed-fe-be

diff --git a/contrib/opentracing/test/README-speed-sa b/addons/ot/test/README-speed-sa
similarity index 100%
rename from contrib/opentracing/test/README-speed-sa
rename to addons/ot/test/README-speed-sa

diff --git a/contrib/opentracing/test/be/cfg-dd.json b/addons/ot/test/be/cfg-dd.json
similarity index 100%
rename from contrib/opentracing/test/be/cfg-dd.json
rename to 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
similarity index 100%
rename from contrib/opentracing/test/be/cfg-jaeger.yml
rename to 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
similarity index 100%
rename from contrib/opentracing/test/be/cfg-zipkin.json
rename to addons/ot/test/be/cfg-zipkin.json

diff --git a/contrib/opentracing/test/be/haproxy.cfg b/addons/ot/test/be/haproxy.cfg
similarity index 100%
rename from contrib/opentracing/test/be/haproxy.cfg
rename to addons/ot/test/be/haproxy.cfg

diff --git a/contrib/opentracing/test/be/ot.cfg b/addons/ot/test/be/ot.cfg
similarity index 100%
rename from contrib/opentracing/test/be/ot.cfg
rename to addons/ot/test/be/ot.cfg

diff --git a/contrib/opentracing/test/cmp/cfg-dd.json b/addons/ot/test/cmp/cfg-dd.json
similarity index 100%
rename from contrib/opentracing/test/cmp/cfg-dd.json
rename to 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
similarity index 100%
rename from contrib/opentracing/test/cmp/cfg-jaeger.yml
rename to 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
similarity index 100%
rename from contrib/opentracing/test/cmp/cfg-zipkin.json
rename to addons/ot/test/cmp/cfg-zipkin.json

diff --git a/contrib/opentracing/test/cmp/haproxy.cfg b/addons/ot/test/cmp/haproxy.cfg
similarity index 100%
rename from contrib/opentracing/test/cmp/haproxy.cfg
rename to addons/ot/test/cmp/haproxy.cfg

diff --git a/contrib/opentracing/test/cmp/ot.cfg b/addons/ot/test/cmp/ot.cfg
similarity index 100%
rename from contrib/opentracing/test/cmp/ot.cfg
rename to addons/ot/test/cmp/ot.cfg

diff --git a/contrib/opentracing/test/ctx/cfg-dd.json b/addons/ot/test/ctx/cfg-dd.json
similarity index 100%
rename from contrib/opentracing/test/ctx/cfg-dd.json
rename to 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
similarity index 100%
rename from contrib/opentracing/test/ctx/cfg-jaeger.yml
rename to 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
similarity index 100%
rename from contrib/opentracing/test/ctx/cfg-zipkin.json
rename to addons/ot/test/ctx/cfg-zipkin.json

diff --git a/contrib/opentracing/test/ctx/haproxy.cfg b/addons/ot/test/ctx/haproxy.cfg
similarity index 100%
rename from contrib/opentracing/test/ctx/haproxy.cfg
rename to addons/ot/test/ctx/haproxy.cfg

diff --git a/contrib/opentracing/test/ctx/ot.cfg b/addons/ot/test/ctx/ot.cfg
similarity index 100%
rename from contrib/opentracing/test/ctx/ot.cfg
rename to addons/ot/test/ctx/ot.cfg

diff --git a/contrib/opentracing/test/empty/cfg-dd.json b/addons/ot/test/empty/cfg-dd.json
similarity index 100%
rename from contrib/opentracing/test/empty/cfg-dd.json
rename to 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
similarity index 100%
rename from contrib/opentracing/test/empty/cfg-jaeger.yml
rename to 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
similarity index 100%
rename from contrib/opentracing/test/empty/cfg-zipkin.json
rename to addons/ot/test/empty/cfg-zipkin.json

diff --git a/contrib/opentracing/test/empty/haproxy.cfg b/addons/ot/test/empty/haproxy.cfg
similarity index 100%
rename from contrib/opentracing/test/empty/haproxy.cfg
rename to addons/ot/test/empty/haproxy.cfg

diff --git a/contrib/opentracing/test/empty/ot.cfg b/addons/ot/test/empty/ot.cfg
similarity index 100%
rename from contrib/opentracing/test/empty/ot.cfg
rename to addons/ot/test/empty/ot.cfg

diff --git a/contrib/opentracing/test/fe/cfg-dd.json b/addons/ot/test/fe/cfg-dd.json
similarity index 100%
rename from contrib/opentracing/test/fe/cfg-dd.json
rename to 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
similarity index 100%
rename from contrib/opentracing/test/fe/cfg-jaeger.yml
rename to 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
similarity index 100%
rename from contrib/opentracing/test/fe/cfg-zipkin.json
rename to addons/ot/test/fe/cfg-zipkin.json

diff --git a/contrib/opentracing/test/fe/haproxy.cfg b/addons/ot/test/fe/haproxy.cfg
similarity index 100%
rename from contrib/opentracing/test/fe/haproxy.cfg
rename to addons/ot/test/fe/haproxy.cfg

diff --git a/contrib/opentracing/test/fe/ot.cfg b/addons/ot/test/fe/ot.cfg
similarity index 100%
rename from contrib/opentracing/test/fe/ot.cfg
rename to addons/ot/test/fe/ot.cfg

diff --git a/contrib/opentracing/test/func-stat.sh b/addons/ot/test/func-stat.sh
similarity index 100%
rename from contrib/opentracing/test/func-stat.sh
rename to addons/ot/test/func-stat.sh

diff --git a/contrib/opentracing/test/get-opentracing-plugins.sh b/addons/ot/test/get-opentracing-plugins.sh
similarity index 100%
rename from contrib/opentracing/test/get-opentracing-plugins.sh
rename to addons/ot/test/get-opentracing-plugins.sh

diff --git a/contrib/opentracing/test/index.html b/addons/ot/test/index.html
similarity index 100%
rename from contrib/opentracing/test/index.html
rename to addons/ot/test/index.html

diff --git a/contrib/opentracing/test/run-cmp.sh b/addons/ot/test/run-cmp.sh
similarity index 100%
rename from contrib/opentracing/test/run-cmp.sh
rename to addons/ot/test/run-cmp.sh

diff --git a/contrib/opentracing/test/run-ctx.sh b/addons/ot/test/run-ctx.sh
similarity index 100%
rename from contrib/opentracing/test/run-ctx.sh
rename to addons/ot/test/run-ctx.sh

diff --git a/contrib/opentracing/test/run-fe-be.sh b/addons/ot/test/run-fe-be.sh
similarity index 100%
rename from contrib/opentracing/test/run-fe-be.sh
rename to addons/ot/test/run-fe-be.sh

diff --git a/contrib/opentracing/test/run-sa.sh b/addons/ot/test/run-sa.sh
similarity index 100%
rename from contrib/opentracing/test/run-sa.sh
rename to addons/ot/test/run-sa.sh

diff --git a/contrib/opentracing/test/sa/cfg-dd.json b/addons/ot/test/sa/cfg-dd.json
similarity index 100%
rename from contrib/opentracing/test/sa/cfg-dd.json
rename to 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
similarity index 100%
rename from contrib/opentracing/test/sa/cfg-jaeger.yml
rename to 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
similarity index 100%
rename from contrib/opentracing/test/sa/cfg-zipkin.json
rename to addons/ot/test/sa/cfg-zipkin.json

diff --git a/contrib/opentracing/test/sa/haproxy.cfg b/addons/ot/test/sa/haproxy.cfg
similarity index 100%
rename from contrib/opentracing/test/sa/haproxy.cfg
rename to addons/ot/test/sa/haproxy.cfg

diff --git a/contrib/opentracing/test/sa/ot.cfg b/addons/ot/test/sa/ot.cfg
similarity index 100%
rename from contrib/opentracing/test/sa/ot.cfg
rename to addons/ot/test/sa/ot.cfg

diff --git a/contrib/opentracing/test/test-speed.sh b/addons/ot/test/test-speed.sh
similarity index 100%
rename from contrib/opentracing/test/test-speed.sh
rename to addons/ot/test/test-speed.sh

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 565582ccb1b287c8314f322d34b9623ef7d5187e..edf7c54af27498349318f946200ff161dcc1c91c 100644 (file)
--- 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