Add nginx-otel module

.gitmodules

@@ -164,3 +164,6 @@
 [submodule "modules/ngx_mruby"]
 	path = modules/ngx_mruby
 	url = https://github.com/matsumotory/ngx_mruby
+[submodule "modules/nginx-otel"]
+	path = modules/nginx-otel
+	url = https://github.com/nginxinc/nginx-otel

Dockerfile

@@ -28,7 +28,9 @@ RUN apt-get update && \
     opensc \
     uwsgi \
     uwsgi-plugin-python3 \
-    rake
+    rake \
+    # for nginx-otel module
+    git cmake libpcre3-dev pkg-config libc-ares-dev libre2-dev
 
 # create symbolic links for nginx-tests
 RUN mkdir -p /usr/local/lib/engines

Makefile

@@ -1,4 +1,4 @@
-PKG_VERSION=1.26.2+mod.3
+PKG_VERSION=1.26.2+mod.4
 PKG_REL_PREFIX=1hn1
 ifdef NO_CACHE
 DOCKER_NO_CACHE=--no-cache

add_submodules.sh

@@ -53,3 +53,4 @@ git submodule add https://github.com/nginx/njs
 git submodule add https://github.com/owasp-modsecurity/ModSecurity-nginx
 git submodule add https://github.com/fffonion/lua-resty-openssl
 git submodule add https://github.com/matsumotory/ngx_mruby
+git submodule add https://github.com/nginxinc/nginx-otel

debian/changelog

@@ -1,3 +1,10 @@
+nginx (1.26.2+mod.4-1hn1DebRelDistrib) UNRELEASED; urgency=medium
+
+  * Add NGINX Native OpenTelemetry (OTel) Module
+  * 6c1659a20ba946cdde21e9dbc52e7c740b06d968 modules/nginx-otel (v0.1.1-18-g6c1659a)
+
+ -- Hiroaki Nakamura <[email protected]>  Sat, 14 Dec 2024 03:10:59 +0900
+
 nginx (1.26.2+mod.3-1hn1DebRelDistrib) UNRELEASED; urgency=medium
 
   * add module

debian/control

@@ -17,7 +17,13 @@ Build-Depends: debhelper (>= 9~),
                libmhash-dev,
                libmaxminddb-dev,
                libperl-dev,
-               rake
+               rake,
+               git,
+               cmake,
+               libpcre3-dev,
+               pkg-config,
+               libc-ares-dev,
+               libre2-dev
 Standards-Version: 3.9.8.0
 Homepage: http://nginx.org
 

debian/rules

@@ -58,6 +58,7 @@ config.env.%:
 	cp -Pa $(CURDIR)/ngx_mruby $(BUILDDIR_$*)/
 	sed 's/@MRUBY_ROOT@//;s/@MRUBY_INCDIR@//;s/@MRUBY_LIBDIR@//' \
 		$(BUILDDIR_$*)/ngx_mruby/config.in > $(BUILDDIR_$*)/ngx_mruby/config
+	cp -Pa $(CURDIR)/nginx-otel $(BUILDDIR_$*)/
 	touch $@
 
 config.status.nginx: config.env.nginx
@@ -128,6 +129,7 @@ config.status.nginx: config.env.nginx
 		--add-dynamic-module=./njs/nginx \
 		--add-dynamic-module=./ModSecurity-nginx \
 		--add-dynamic-module=./ngx_mruby \
+		--add-dynamic-module=./nginx-otel \
 		--without-pcre2 \
 		--with-cc-opt="$(CFLAGS)" \
 		--with-ld-opt="$(LDFLAGS)"
@@ -202,6 +204,7 @@ config.status.nginx_debug: config.env.nginx_debug
 		--add-dynamic-module=./njs/nginx \
 		--add-dynamic-module=./ModSecurity-nginx \
 		--add-dynamic-module=./ngx_mruby \
+		--add-dynamic-module=./nginx-otel \
 		--without-pcre2 \
 		--with-cc-opt="$(CFLAGS)" \
 		--with-ld-opt="$(LDFLAGS)" \