Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.

Merge 1.34.1 to packaging branch#1540

Merged
thresheek merged 15 commits intonginx:packagingfrom
thresheek:packaging-1.34
Jan 10, 2025
Merged

Merge 1.34.1 to packaging branch#1540
thresheek merged 15 commits intonginx:packagingfrom
thresheek:packaging-1.34

Conversation

@thresheek
Copy link
Member

@thresheek thresheek commented Jan 10, 2025

This was easy, no conflicts or anything.

Packaging tag (1.34.1-1) will follow once this is merged.

ac000 and others added 15 commits January 10, 2025 16:33
@ac000
Version bump
3f11669 
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@avahahn @ac000
otel: fix segfaults when otel not configured
2dc9a4e 
This commit adds NULL checks for the request->otel object that
were missed in the Traceparent and Tracestate routines.

Closes: nginx#1523
Closes: nginx#1526
Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
Signed-off-by: Ava Hahn <a.hahn@f5.com>
@avahahn @ac000
otel: remove deadcode
b5db001 
The superfluous else condition in nxt_otel_propagate_header was dead code.
This commit removes it.

Signed-off-by: Ava Hahn <a.hahn@f5.com>
@ac000
auto/otel: Make use of nxt_feature_name
8803a2b 
When building with --otel on macOS for example I was seeing compile
failures with the cpu_set_t stuff which should only be used under Linux.

It turned out that despite

  checking for Linux sched_getaffinity() ... not found

we were getting

  #ifndef NXT_HAVE_LINUX_SCHED_GETAFFINITY
  #define NXT_HAVE_LINUX_SCHED_GETAFFINITY  1
  #endif

in build/include/nxt_auto_config.h

It seems this was due to the

    . auto/feature

in auto/otel, this check happens right after the above. Without having

    nxt_feature_name=NXT_HAVE_OTEL

set.

Instead we were adding the define for that manually.

Doing auto/feature without having a nxt_feature_name must have used the
last set one and enabled it.

Set nxt_feature_name and remove the manual editing of nxt_auto_config.h

Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
auto/make: s/NXT_OTEL_LIB_LOC/NXT_OTEL_LIB_STATIC/
1175e40 
This better matches existing naming convention, e.g NXT_LIB_STATIC

Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@thresheek @ac000
auto/make, otel: fix linking on macOS and Ubuntu
92c0d34 
The static library is supposed to be specified prior to its
dependencies.
Also, no need to put an otel static library inside libnxt static
library, as we explicitely link unit binary with otel static library
anyway.

This fixes the following build problems:

- macOS:

      Finished `release` profile [optimized] target(s) in 58.07s
    AR     build/lib/libnxt.a
    LD     build/sbin/unitd
  ld: archive member 'libotel.a' not a mach-o file in '/private/tmp/unit-20241219-8965-yb46xp/build/lib/libnxt.a'
  clang: error: linker command failed with exit code 1 (use -v to see invocation)

- Ubuntu 22 (./configure --otel):

  LD     build/sbin/unitd
cc -Wl,-E  -o build/sbin/unitd -pipe -fPIC -fvisibility=hidden -fno-strict-overflow -funsigned-char -std=gnu11 -O -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -fno-strict-aliasing -Wmissing-prototypes -Werror -g    \
	build/src/nxt_main.o  build/lib/libnxt.a \
	-lm -lrt  -lpthread   \
                      \
                    -lpcre2-8 -lssl -lcrypto src/otel/target/release/libotel.a
/usr/bin/ld: src/otel/target/release/libotel.a(reqwest-97d1376dfb77d784.reqwest.cb371ce8e1e3945e-cgu.04.rcgu.o): in function `core::ptr::drop_in_place<alloc::vec::Vec<reqwest::tls::Certificate>>':
reqwest.cb371ce8e1e3945e-cgu.04:(.text._ZN4core3ptr69drop_in_place$LT$alloc..vec..Vec$LT$reqwest..tls..Certificate$GT$$GT$17h9b62679cc7161be5E+0x30): undefined reference to `X509_free'

Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
[ Tweaked subject prefix. s/NXT_OTEL_LIB_LOC/NXT_OTEL_LIB_STATIC/ - Andrew ]
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@remicollet @ac000
auto/make: Add missing NXT_OTEL_LIB_STATIC to some C tests
f1cf5fe 
Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
[ Commit subject, s/NXT_OTEL_LIB_LOC/NXT_OTEL_LIB_STATIC/ and placement
  of NXT_OTEL_LIB_STATIC tweaked as per @thresheek - Andrew ]
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@thresheek @ac000
auto/otel: don't look for OpenSSL on Darwin
035b523 
Rust code relies on macOS-provided frameworks for TLS.

Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
[ Tweaked subject prefix. Some minor tweaks for current changes. -
  Andrew ]
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
auto/make: Fix various issues with building OTEL
0b39cba 
There were at least a couple of issues with building OTEL support.

It only worked with GNU make due to the use of ifeq, even gmake had some
issues.

Debug builds were broken due to trying to pass --debug to cargo which is
the default and isn't a valid option.

This 'fixes' things by doing 'release' builds of OTEL by default.

Passing D=1 to make will generate 'debug' builds but this as previously
with D= etc, only works with GNU make.

We make use of the '--emit link=' rustc option to place the libotel.a
static library into build/lib

This is good, it consolidates the static libraries into one place and it
simplifies the build scripts.

While we're at it pretty print the cargo command by default.

Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
Link: <nginx#1520 (comment)>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
tools/unitctl: Update for version 1.34.1
2356bd9 
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
docs/unit-openapi.yaml: Update version for 1.34.1
83e1a94 
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
pkg/docker: Update dockerfiles for 1.34.1
e7e3377 
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
docs/changes.xml: Add 1.34.1 changelog entries
87f7edc 
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@ac000
Add 1.34.1 CHANGES
ed6f67d 
This is autogenerated from docs/changes.xml by

  $ make -C docs/ changes && mv build/CHANGES .

Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
@thresheek
Merge tag '1.34.1' into packaging
f313a92 
Unit 1.34.1 release.
@thresheek thresheek merged commit bdc4d30 into nginx:packaging Jan 10, 2025
27 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@ac000 ac000 ac000 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thresheek @ac000 @avahahn @remicollet