Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NGINX: Bump OpenTelemetry. #12371

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

matthias-haase
Copy link

@matthias-haase matthias-haase commented Nov 15, 2024

i did:

OPENTELEMETRY_CPP_VERSION="v1.17.0"
perl -pi -e "s/(OPENTELEMETRY_CPP_VERSION=)(.)/\1"$OPENTELEMETRY_CPP_VERSION"/g;" images/nginx/rootfs/build.sh 
OPENTELEMETRY_PROTO_VERSION="v1.3.2" 
perl -pi -e "s/(OPENTELEMETRY_PROTO_VERSION=)(.)/\1"$OPENTELEMETRY_PROTO_VERSION"/g;" images/nginx/rootfs/build.sh 
OPENTELEMETRY_CONTRIB_COMMIT=f6d29426ee9b4d6b476c09ca3cb9bed3cf23906f 
perl -pi -e "s/(OPENTELEMETRY_CONTRIB_COMMIT=)(.)/\1"$OPENTELEMETRY_CONTRIB_COMMIT"/g;" images/nginx/rootfs/build.sh 
perl -pi -e "s/(libprotobuf.)/\1\n abseil-cpp-crc-cpu-detect \/g;" images/nginx/rootfs/Dockerfile

Ingress-NGINX 1.10.0 has dropped support for OpenTracing and Zipkin, favoring OpenTelemetry instead.

The OpenTelemetry module used by Ingress-NGINX is based on a old commit, and has received updates since then.

The correct value is not set according "span->SetStatus(trace::StatusCode::kError);".

Per default it's not correct set with "span->SetStatus(trace::StatusCode::kOk);" if there a trace with error (>=http_code 500).

(in Datadog it's metric trace.nginx.server.errors.)

The changes according Ingress-NGINX 1.11.2 with my branch solved the problem according trace error status: https://github.com/tsimonitoring/ingress-nginx/tree/release-1.11.3-patch-opentelemetry-cpp-and-contrib-and-proto

As example tested on my side in Datadog.

There are correct OPENTELEMETRY_CPP_VERSION, OPENTELEMETRY_PROTO_VERSION, OPENTELEMETRY_CONTRIB_COMMIT in build.sh incl. apk upgrade abseil-cpp-crc-cpu-detect (add) in Dockerfile NGINX.

Before (https://i.imgur.com/LpvotMx.png) there was no shipped metric according error_status per OpenTelemetry Module.

After (https://i.imgur.com/xvz6b05.png) you can see the shipped error metric also in trace view or see diag example (https://i.imgur.com/xEEY2Ep.png).

What this PR does / why we need it:

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

fixes # The correct value is not set according "span->SetStatus(trace::StatusCode::kError);".

How Has This Been Tested?

in azure kubernetes with test metric in datadog

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

…rfile-apk-abseil-cpp-crc-cpu-detect

OPENTELEMETRY_CPP_VERSION="v1.17.0"
perl -pi -e "s/(OPENTELEMETRY_CPP_VERSION=)(.)/\1"$OPENTELEMETRY_CPP_VERSION"/g;" images/nginx/rootfs/build.sh OPENTELEMETRY_PROTO_VERSION="v1.3.2"
perl -pi -e "s/(OPENTELEMETRY_PROTO_VERSION=)(.)/\1"$OPENTELEMETRY_PROTO_VERSION"/g;" images/nginx/rootfs/build.sh OPENTELEMETRY_CONTRIB_COMMIT=f6d29426ee9b4d6b476c09ca3cb9bed3cf23906f perl -pi -e "s/(OPENTELEMETRY_CONTRIB_COMMIT=)(.)/\1"$OPENTELEMETRY_CONTRIB_COMMIT"/g;" images/nginx/rootfs/build.sh perl -pi -e "s/(libprotobuf.)/\1\n abseil-cpp-crc-cpu-detect \/g;" images/nginx/rootfs/Dockerfile

Ingress-NGINX 1.10.0 has dropped support for OpenTracing and Zipkin, favoring OpenTelemetry instead.

The OpenTelemetry module used by Ingress-NGINX is based on a old commit, and has received updates since then.

The correct value is not set according "span->SetStatus(trace::StatusCode::kError);".

Per default it's not correct set with "span->SetStatus(trace::StatusCode::kOk);" if there a trace with error (>=http_code 500).

(in Datadog it's metric trace.nginx.server.errors.)

The changes according Ingress-NGINX 1.11.2 with my branch solved the problem according trace error status: https://github.com/tsimonitoring/ingress-nginx/tree/release-1.11.3-patch-opentelemetry-cpp-and-contrib-and-proto

As example tested on my side in Datadog.

There are correct OPENTELEMETRY_CPP_VERSION, OPENTELEMETRY_PROTO_VERSION, OPENTELEMETRY_CONTRIB_COMMIT in build.sh incl. apk upgrade abseil-cpp-crc-cpu-detect (add) in Dockerfile NGINX.

Before (https://i.imgur.com/LpvotMx.png) there was no shipped metric according error_status per OpenTelemetry Module.

After (https://i.imgur.com/xvz6b05.png) you can see the shipped error metric also in trace view or see diag example (https://i.imgur.com/xEEY2Ep.png).
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: matthias-haase
Once this PR has been reviewed and has the lgtm label, please assign cpanato for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 15, 2024
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot
Copy link
Contributor

Hi @matthias-haase. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 15, 2024
Copy link

netlify bot commented Nov 15, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit dadb602
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/673746d71497ca0008f83be5

@strongjz
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 15, 2024
@strongjz
Copy link
Member

/kind feature
/priority backlog

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Nov 15, 2024
@strongjz
Copy link
Member

Why is abseil-cpp-crc-cpu-detect needed?

@matthias-haase
Copy link
Author

matthias-haase commented Nov 15, 2024

@strongjz abseil-cpp-crc-cpu-detect in Dockerfile needed by shared object.

otel_ngx_module.so -> libopentelemetry_exporter_otlp_grpc.so -> libabsl_crc_cpu_detect.so.2308.0.0

Error message clearify this - without libabsl_crc_cpu_detect.so.2308.0.0 you get the errormessage:

│ -------------------------------------------------------------------------------                                                                                         │
│   Warning  RELOAD  14s (x16 over 64s)  nginx-ingress-controller  (combined from similar events): Error reloading NGINX:                                                 │
│ -------------------------------------------------------------------------------                                                                                         │
│ Error: exit status 1                                                                                                                                                    │
│ 2024/10/17 13:38:37 [emerg] 49#49: dlopen() "/etc/nginx/modules/otel_ngx_module.so" failed (Error loading shared library libabsl_crc_cpu_detect.so.2308.0.0: No such fi │
│ le or directory (needed by /usr/local/lib/libopentelemetry_exporter_otlp_grpc.so)) in /tmp/nginx/nginx-cfg3367704967:7                                                  │
│ nginx: [emerg] dlopen() "/etc/nginx/modules/otel_ngx_module.so" failed (Error loading shared library libabsl_crc_cpu_detect.so.2308.0.0: No such file or directory (nee │
│ ded by /usr/local/lib/libopentelemetry_exporter_otlp_grpc.so)) in /tmp/nginx/nginx-cfg3367704967:7                                                                      │
│ nginx: configuration file /tmp/nginx/nginx-cfg3367704967 test failed                                                                                                    │
│                                                                                                                                                                         │
│ -------------------------------------------------------------------------------     

here are the repos, which work "together"
OPENTELEMETRY_CPP_VERSION -> https://github.com/open-telemetry/opentelemetry-cpp/releases
#+export OPENTELEMETRY_CPP_VERSION="v1.17.0"

OPENTELEMETRY_PROTO_VERSION -> https://github.com/open-telemetry/opentelemetry-proto/releases
#+export OPENTELEMETRY_PROTO_VERSION="v1.3.2"

OPENTELEMETRY_CONTRIB_VERSION -> https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases
#+export OPENTELEMETRY_CONTRIB_COMMIT=f6d29426ee9b4d6b476c09ca3cb9bed3cf23906f
OPENTELEMETRY_CONTRIB_COMMIT is the newest commit - an no new version tag is established here. :(

Answer: OPENTELEMETRY_CONTRIB_COMMIT creates libopentelemetry_exporter_otlp_grpc.so, which needs abseil-cpp-crc-cpu-detect.
abseil-cpp-crc-cpu-detect installs the needed libabsl_crc_cpu_detect.so.2308.0.0

Proof:

src|opentelemetry-cpp-contrib.git $ find . -type f|xargs grep libopentelemetry_exporter_otlp_grpc
./opentelemetry-cpp-contrib.git/instrumentation/otel-webserver-module/build.gradle:    from("${modDepDir}/opentelemetry/${cppSDKVersion}/lib/libopentelemetry_exporter_otlp_grpc.so") { it.into "sdk_lib/lib" }
./opentelemetry-cpp-contrib.git/instrumentation/otel-webserver-module/opentelemetry_module.conf:LoadFile /opt/opentelemetry-webserver-sdk/sdk_lib/lib/libopentelemetry_exporter_otlp_grpc.so

The other repos do not have a entry like "libopentelemetry_exporter_otlp_grpc".

@strongjz in hope this helps push a faster commit, because:

With azure kubernetes version 1.31 there is a needed pressure using newsest nginx.

Problem: newest nginx uses opentelemetry instead opentracing, but trace status error is not shipping in a correct way.

Due to need use correct monitoring with tracing there's a stop according go to newer versions with nginx.

An this stopps using next kubernetes version 1.31, which makes the pressure from azure.

That's why i created the pull request: #12371

How can someone push and go to a faster with minimal time delay integrate such a change of 3 lines in build.sh and 1 in Dockerfile in images/nginx/rootfs/ ?
Can you help?
THX a lot all for help!

Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please come up with a more descriptive PR title? This goes into the commit message on main branch and the changelog on release. Also we prefer tagged releases over just picking latest.

@Gacko
Copy link
Member

Gacko commented Nov 15, 2024

Also we are currently in the process of releasing v1.12. This change won't make it in there and will earliest be included in v1.13. Additionally we are currently working on bumping the NGINX to OpenResty v1.27, so let's just postpone this here until we bumped NGINX itself and try to integrate it based on that.

@matthias-haase
Copy link
Author

matthias-haase commented Nov 15, 2024

Can you please come up with a more descriptive PR title? This goes into the commit message on main branch and the changelog on release. Also we prefer tagged releases over just picking latest.

Hello,
i'm a newbie.
This is my first PR. But not my last. I'm open source fan and will give further more PR's, if i can help.
can you help me and suggest a better title incl. info what i must do for change PR title - bot message or what ever, i do not know , what i can do :( ?
THX a lot !
I suggest another title like this: 'This fix resolves shipping correct value in traces according "span->SetStatus(trace::StatusCode::kError);".'
Ok or any hint ?

@matthias-haase
Copy link
Author

Also we are currently in the process of releasing v1.12. This change won't make it in there and will earliest be included in v1.13. Additionally we are currently working on bumping the NGINX to OpenResty v1.27, so let's just postpone this here until we bumped NGINX itself and try to integrate it based on that.

Is there a way also update release v1.10 and v1.11 and 1.12, because there are a lot of deployments using a "buggy" opentelemetry module with not correct shipped trace error status?
Can i create new PR's on every v1.10 and v1.11 and 1.12 like i did on main branch ?

Background:

This would helps test with current deploments in current kubernetes deployments and help go forward to new versions without risk in e2e-tests, incl. possibility if there's a "go back", you cab use the patch with older versions.

Hint:
With azure kubernetes version 1.31 there is a needed pressure using newest nginx.
Problem: newest nginx uses opentelemetry instead opentracing, but trace status error is not shipping in a correct way.
Due to need use correct monitoring with tracing there's a stop according go to newer versions with nginx.
That's why i created the pull request: #12371

How can someone push and go to a faster with minimal time delay integrate such a change of 3 lines in build.sh and 1 in Dockerfile in images/nginx/rootfs/ incl. the v1.10 and v1.11 and 1.12 ?

THX for hint according older and current versions. You are the best!

@Gacko
Copy link
Member

Gacko commented Nov 15, 2024

Please do not file separate PRs on different branches. Back-porting changes is up to the maintainers of this project.

Also I'd like to note that at least I'm feeling a little pushed by you. I understand this might be urgent to you (or your employer), but still we are all doing this in our free time and are responsible for maintaining changes brought to us by contributors. So I'd like to ask you for patience while we are reviewing your proposal thoroughly.

@Gacko
Copy link
Member

Gacko commented Nov 15, 2024

One additional note, also to other maintainers: The compilation of the NGINX base image is still broken at the moment. I'd highly appreciate not merging any changes to it as long as it hasn't been fixed. This just makes it more complicated.

@matthias-haase
Copy link
Author

Please do not file separate PRs on different branches. Back-porting changes is up to the maintainers of this project.

Also I'd like to note that at least I'm feeling a little pushed by you. I understand this might be urgent to you (or your employer), but still we are all doing this in our free time and are responsible for maintaining changes brought to us by contributors. So I'd like to ask you for patience while we are reviewing your proposal thoroughly.

Yes of course. You're right. Thank you review the pull request.

@matthias-haase matthias-haase changed the title main-patch-opentelemetry-cpp-and-contrib-and-proto--and--add-in-Docke… Fix resolves shipping correct value in traces according "span->SetStatus(trace::StatusCode::kError);" Nov 19, 2024
@tsimonitoring
Copy link

tsimonitoring commented Nov 19, 2024

@Gacko

This fix resolves shipping correct value in traces according "span->SetStatus(trace::StatusCode::kError);"

Fix renamed. Ok ?

@Gacko
Copy link
Member

Gacko commented Nov 19, 2024

Yes, sure. As already mentioned we cannot merge this for now as we still have some other changes on the NGINX base image in the pipeline. Thank you for your contribution so far!

@matthias-haase matthias-haase changed the title Fix resolves shipping correct value in traces according "span->SetStatus(trace::StatusCode::kError);" OpenTelemetry fix: Setting correct statuscode value (OK or Error) in traces Nov 19, 2024
@Gacko Gacko changed the title OpenTelemetry fix: Setting correct statuscode value (OK or Error) in traces NGINX: Bump OpenTelemetry. Nov 19, 2024
@Gacko
Copy link
Member

Gacko commented Nov 19, 2024

I updated the title as this is what you're actually doing. The exact intention can be found in the details, but the effect to users is literally just the bump.

@matthias-haase
Copy link
Author

matthias-haase commented Nov 19, 2024

@Gacko

I updated the title as this is what you're actually doing. The exact intention can be found in the details, but the effect to users is literally just the bump.

Thank you. Do i have to do now everything ?
...or all just fine and commit will merged wihtout any doing from my side ?
Sorry, i'm a newbie.

I ask, because i see a line:
1 change requested
Gacko requested changes

@Gacko
Copy link
Member

Gacko commented Nov 19, 2024

We will take care from here. As stated earlier we first need to fix the NGINX compilation anyway.

@matthias-haase
Copy link
Author

@Gacko

We will take care from here. As stated earlier we first need to fix the NGINX compilation anyway.

is there a link to a log? can i help according the problem?

@Gacko
Copy link
Member

Gacko commented Nov 19, 2024

There's a log, sure, but it's basically just an architecture / cross-compiling issue we need to figure out. Already had this in the past.

Anyway, just for clarification and to not disappoint any expectations: Our current roadmap and priorities look as follows:

  1. Fix NGINX build.
  2. Get v1.12 released.
  3. Merge other PRs related to the NGINX base image itself (like bumping it to v1.27.1).
  4. Rebase & merge this PR on it.
  5. Somewhen in the future: Release a v1.13 which also includes this.

So there is currently no hurry to get this PR merged as we have other priorities for now and probably won't have in v1.12.

@Gacko
Copy link
Member

Gacko commented Nov 23, 2024

Hello @matthias-haase!

Well, it seeeeeeems like we could actually need this change in v1.12.0 already. 😅

I was just working on the before mentioned fix of the NGINX base image. Bumping the LuaJIT dependency (not related to this PR) made it work... until the whole process tries to compile OpenTelemetry stuff:

https://storage.googleapis.com/kubernetes-ci-logs/logs/post-ingress-nginx-nginx/1860323495271993344/artifacts/build.log

#13 388.1 ninja: job terminated due to signal 11: /usr/bin/c++ -DHAVE_ABSEIL -DHAVE_CPP_STDLIB -Dopentelemetry_logs_EXPORTS -I/tmp/build/opentelemetry-cpp/build/generated/third_party/opentelemetry-proto -I/tmp/build/opentelemetry-cpp/api/include -I/tmp/build/opentelemetry-cpp/sdk/include -I/tmp/build/opentelemetry-cpp/sdk -I/tmp/build/opentelemetry-cpp/ext/include -DBENCHMARK_HAS_NO_INLINE_ASSEMBLY -std=gnu++20 -fPIC -Wno-error=deprecated-declarations -MD -MT sdk/src/logs/CMakeFiles/opentelemetry_logs.dir/simple_log_record_processor.cc.o -MF sdk/src/logs/CMakeFiles/opentelemetry_logs.dir/simple_log_record_processor.cc.o.d -o sdk/src/logs/CMakeFiles/opentelemetry_logs.dir/simple_log_record_processor.cc.o -c /tmp/build/opentelemetry-cpp/sdk/src/logs/simple_log_record_processor.cc

I will now try to compile the NGINX base image with your changes included. If this works, I'll try to get both our changes in one PR (probably this one) without changing the authors, so it's getting to main in a single collaborative contribution which then can be cherry-picked to the other branches.

Important to note: We cannot have these changes merged to main in separate commits as we need both of them for a working NGINX base image build.

Does this sound good to you?

Regards
Marco

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants