Skip to content

feat: add additional handling of prometheus-cache in ngx_tpl.lua (#1212703) #12706

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+4 −1
Open

feat: add additional handling of prometheus-cache in ngx_tpl.lua (#1212703) #12706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02197b8
feat: add additional handling of prometheus-cache in ngx_tpl.lua (#12…
Oct 28, 2025
d22b2fe
fix ut
Oct 30, 2025
7fae114
fix ut
Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apisix/cli/ngx_tpl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ http {

{% if enabled_plugins["prometheus"] and not enabled_stream_plugins["prometheus"] then %}
lua_shared_dict prometheus-metrics {* http.lua_shared_dict["prometheus-metrics"] *};
{% if not use_apisix_base then %}
lua_shared_dict prometheus-cache {* meta.lua_shared_dict["prometheus-cache"] *};
{% end %}
{% end %}

{% if enabled_plugins["skywalking"] then %}
Expand Down
2 changes: 1 addition & 1 deletion t/cli/test_prometheus_stream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ sleep 1 # wait for sync

out="$(curl http://127.0.0.1:9091/apisix/prometheus/metrics)"
if ! echo "$out" | grep "apisix_stream_connection_total{route=\"1\"} 1" > /dev/null; then
echo "failed: prometheus can't work in stream subsystem"
echo "failed: prometheus can't work in both http & stream subsystem"
Copy link
Contributor

@Baoyuantop Baoyuantop Nov 21, 2025

Choose a reason for hiding this comment

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

Additional testing is needed; the existing tests cannot verify whether prometheus-cache is correctly generated when use_apisix_base=false.

Copy link
Contributor Author

@qihaiyan qihaiyan Nov 21, 2025

Choose a reason for hiding this comment

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

I didn't find out how to set use_apisix_base=false in ut environment, it's setted in env.lua:

    local use_apisix_base = true
    if not or_info:find("apisix-nginx-module", 1, true) then
        use_apisix_base = false
    end

Copy link
Contributor

@Baoyuantop Baoyuantop Nov 26, 2025

Choose a reason for hiding this comment

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

I checked the existing tests and didn't find anything related to use_apisix_base=false, so I think this is acceptable. Let's see what other maintainers think.

exit 1
fi

Expand Down
Loading