git: e178c2a8374a - main - www/nginx-devel: add NGINX Open Telemetry module (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Sep 2023 17:41:10 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e178c2a8374a288a218f618ba5bc7446738067d2
commit e178c2a8374a288a218f618ba5bc7446738067d2
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-09-16 17:40:14 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-09-16 17:41:06 +0000
www/nginx-devel: add NGINX Open Telemetry module (+)
Bump PORTREVISON.
---
www/nginx-devel/Makefile | 4 ++--
www/nginx-devel/Makefile.extmod | 11 +++++++++++
www/nginx-devel/Makefile.options.desc | 1 +
www/nginx-devel/distinfo | 4 +++-
www/nginx-devel/pkg-plist | 1 +
5 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 8e618fec4100..a89a55c942d8 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.25.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -78,7 +78,7 @@ OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \
STREAM_SSL_PREREAD
-OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML THREADS WWW
+OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML OTEL THREADS WWW
OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index e85b69df0873..cc07a20f6508 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -248,6 +248,17 @@ OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing
OPENTRACING_VARS= DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing
OPENTRACING_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-opentracing-opentracing-config
+OTEL_GH_TUPLE= osokin:nginx-otel:f58abc0:otel
+OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/
+OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
+ libcares.so:dns/c-ares \
+ libgrpc.so:devel/grpc \
+ libopentelemetry_common.so:devel/opentelemetry-cpp \
+ libprotobuf.so:devel/protobuf \
+ libre2.so:devel/re2
+OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto
+OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include
+
PASSENGER_NGINX_VER= 6.0.18
PASSENGER_CATEGORIES= ruby
PASSENGER_USES= ruby
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index ac2bad570e17..9bdf6684892b 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -92,6 +92,7 @@ NAXSI_DESC= 3rd party naxsi module
NJS_DESC= Enable javascript (NJS) module
NJS_XML_DESC= Enable XML functionality in NJS module
OPENTRACING_DESC= 3rd party opentracing module
+OTEL_DESC= Enable OpenTELemetry module
PASSENGER_DESC= 3rd party passenger module
POSTGRES_DESC= 3rd party postgres module
RDS_CSV_DESC= 3rd party rds_csv module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index bc8ae7f1c093..75a5a3f1346e 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1694884488
+TIMESTAMP = 1694883296
SHA256 (nginx-1.25.2.tar.gz) = 05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711
SIZE (nginx-1.25.2.tar.gz) = 1214903
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -109,6 +109,8 @@ SHA256 (nginx-njs-0.8.1_GH0.tar.gz) = 0450d9652d3cfe7dd9f802d6f790a3616e1612eef4
SIZE (nginx-njs-0.8.1_GH0.tar.gz) = 729780
SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280
SIZE (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 679417
+SHA256 (osokin-nginx-otel-f58abc0_GH0.tar.gz) = 38cf4ce454fccf174cfabf655861cda6e5aced593dad46b0f2894fb7c664d3b2
+SIZE (osokin-nginx-otel-f58abc0_GH0.tar.gz) = 30364
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544
SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 34f95ca3218d..015cc60e4d7e 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -67,6 +67,7 @@
%%DSO%%%%MODSECURITY3%%libexec/nginx/ngx_http_modsecurity_module.so
%%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
%%DSO%%%%OPENTRACING%%libexec/nginx/ngx_http_opentracing_module.so
+%%DSO%%%%OTEL%%libexec/nginx/ngx_otel_module.so
%%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
%%DSO%%%%POSTGRES%%libexec/nginx/ngx_postgres_module.so
%%DSO%%%%RDS_CSV%%libexec/nginx/ngx_http_rds_csv_filter_module.so