Removed opentracing module and its dependencies.

nginx · Nov 26, 2024 · 68a346a · 68a346a
1 parent 7f99f6a
commit 68a346a
Show file tree

Hide file tree

Showing 31 changed files with 1 addition and 1,553 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ BASE_MAKEFILES=	alpine/Makefile \
 		rpm/SPECS/Makefile
 
 MODULES=	geoip image-filter perl xslt
-EXTERNAL_MODULES=	auth-spnego brotli encrypted-session fips-check geoip2 headers-more lua ndk njs opentracing otel passenger rtmp set-misc subs-filter
+EXTERNAL_MODULES=	auth-spnego brotli encrypted-session fips-check geoip2 headers-more lua ndk njs otel passenger rtmp set-misc subs-filter
 
 ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
 SHA512SUM = sha512sum

diff --git a/alpine/Makefile b/alpine/Makefile
@@ -279,9 +279,6 @@ test: base nginx-tests
 	if [ -d $$pwd/module-perl ]; then \
 		globals="$$globals env PERL5LIB=$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl:$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl/blib/arch;" ; \
 	fi ; \
-	if [ -d $$pwd/module-opentracing ]; then \
-		export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$pwd/abuild-module-opentracing/src/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \
-	fi ; \
 	if [ -d $$pwd/module-lua ]; then \
 		globals_http="lua_package_path '$$pwd/abuild-module-lua/src/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/abuild-module-lua/src/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \
 		globals_stream="$$globals_http" ; \
@@ -302,9 +299,6 @@ test-debug: base nginx-tests
 	if [ -d $$pwd/module-perl ]; then \
 		globals="$$globals env PERL5LIB=$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl:$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl/blib/arch;" ; \
 	fi ; \
-	if [ -d $$pwd/module-opentracing ]; then \
-		export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$pwd/abuild-module-opentracing/src/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \
-	fi ; \
 	if [ -d $$pwd/module-lua -a ! -e nginx-module-lua.skip ]; then \
 		globals_http="lua_package_path '$$pwd/abuild-module-lua/src/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/abuild-module-lua/src/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \
 		globals_stream="$$globals_http" ; \

diff --git a/alpine/Makefile.module-opentracing b/alpine/Makefile.module-opentracing
diff --git a/contrib/src/jaeger-client-cpp/CMakeLists.txt.patch b/contrib/src/jaeger-client-cpp/CMakeLists.txt.patch
diff --git a/contrib/src/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch b/contrib/src/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch
diff --git a/contrib/src/jaeger-client-cpp/Makefile b/contrib/src/jaeger-client-cpp/Makefile
diff --git a/contrib/src/jaeger-client-cpp/SHA512SUMS b/contrib/src/jaeger-client-cpp/SHA512SUMS
diff --git a/contrib/src/jaeger-client-cpp/version b/contrib/src/jaeger-client-cpp/version
diff --git a/contrib/src/json/Makefile b/contrib/src/json/Makefile
diff --git a/contrib/src/json/SHA512SUMS b/contrib/src/json/SHA512SUMS
diff --git a/contrib/src/json/version b/contrib/src/json/version
diff --git a/contrib/src/nginx-opentracing/Makefile b/contrib/src/nginx-opentracing/Makefile
diff --git a/contrib/src/nginx-opentracing/SHA512SUMS b/contrib/src/nginx-opentracing/SHA512SUMS
diff --git a/contrib/src/nginx-opentracing/version b/contrib/src/nginx-opentracing/version
diff --git a/contrib/src/opentracing-cpp/CMakeLists.txt.patch b/contrib/src/opentracing-cpp/CMakeLists.txt.patch