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.

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

addons/ot/Makefile

@@ -43,19 +43,19 @@ $(error OpenTracing C wrapper : can't find library)
 endif
 
 OPTIONS_OBJS += \
-	contrib/opentracing/src/cli.o         \
+	addons/ot/src/cli.o         \
-	contrib/opentracing/src/conf.o        \
+	addons/ot/src/conf.o        \
-	contrib/opentracing/src/event.o       \
+	addons/ot/src/event.o       \
-	contrib/opentracing/src/filter.o      \
+	addons/ot/src/filter.o      \
-	contrib/opentracing/src/group.o       \
+	addons/ot/src/group.o       \
-	contrib/opentracing/src/http.o        \
+	addons/ot/src/http.o        \
-	contrib/opentracing/src/opentracing.o \
+	addons/ot/src/opentracing.o \
-	contrib/opentracing/src/parser.o      \
+	addons/ot/src/parser.o      \
-	contrib/opentracing/src/pool.o        \
+	addons/ot/src/pool.o        \
-	contrib/opentracing/src/scope.o       \
+	addons/ot/src/scope.o       \
-	contrib/opentracing/src/util.o        \
+	addons/ot/src/util.o        \
-	contrib/opentracing/src/vars.o
+	addons/ot/src/vars.o
 
-OPTIONS_CFLAGS  += $(OT_CFLAGS) -Icontrib/opentracing/include
+OPTIONS_CFLAGS  += $(OT_CFLAGS) -Iaddons/ot/include
 OPTIONS_LDFLAGS += $(OT_LDFLAGS)
 OPTIONS_CFLAGS  += $(OT_DEFINE)

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