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.

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

fix: adjust the execution priority of request-id to fix opentelemetry has no request id #7281

Merged
merged 7 commits into from
Jun 22, 2022
Merged

fix: adjust the execution priority of request-id to fix opentelemetry has no request id #7281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b30150
feat: adjust the execution priority after the request-id
Jun 20, 2022
061e917
feat: adjust the execution priority after the request-id
Jun 20, 2022
f8fa0a9
feat: adjust the execution priority after the request-id
Jun 21, 2022
9bcdec0
Merge branch 'apache:master' into master
jagerzhang Jun 21, 2022
9480a3c
fix: adjust the execution priority of request-id to fix opentelemetry…
Jun 21, 2022
31e45c7
Merge branch 'master' of https://github.com/jagerzhang/apisix
Jun 21, 2022
4c07de9
fix: adjust the execution priority of request-id to fix opentelemetry…
Jun 22, 2022
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
2 changes: 1 addition & 1 deletion apisix/plugins/request-id.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ local attr_schema = {

local _M = {
version = 0.1,
priority = 11010,
priority = 12015,
name = plugin_name,
schema = schema
}
Expand Down
2 changes: 1 addition & 1 deletion conf/config-default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,11 @@ plugins: # plugin list (sorted by priority)
- real-ip # priority: 23000
- client-control # priority: 22000
- proxy-control # priority: 21990
- request-id # priority: 12015
- zipkin # priority: 12011
#- skywalking # priority: 12010
#- opentelemetry # priority: 12009
- ext-plugin-pre-req # priority: 12000
- request-id # priority: 11010
- fault-injection # priority: 11000
- mocking # priority: 10900
- serverless-pre-function # priority: 10000
Expand Down
2 changes: 1 addition & 1 deletion t/admin/plugins.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ __DATA__
real-ip
client-control
proxy-control
request-id
zipkin
ext-plugin-pre-req
request-id
fault-injection
mocking
serverless-pre-function
Expand Down
2 changes: 1 addition & 1 deletion t/debug/debug-mode.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ done
--- error_log
loaded plugin and sort by priority: 23000 name: real-ip
loaded plugin and sort by priority: 22000 name: client-control
loaded plugin and sort by priority: 12015 name: request-id
loaded plugin and sort by priority: 12011 name: zipkin
loaded plugin and sort by priority: 12000 name: ext-plugin-pre-req
loaded plugin and sort by priority: 11010 name: request-id
loaded plugin and sort by priority: 11000 name: fault-injection
loaded plugin and sort by priority: 10000 name: serverless-pre-function
loaded plugin and sort by priority: 4000 name: cors
Expand Down