fix: adjust the execution priority of request-id to fix opentelemetry…

… has no request id (#7281) Co-authored-by: Jagerzhang <[email protected]>
apache · Jun 30, 2022 · cdee8d7 · cdee8d7
1 parent 0290b30
commit cdee8d7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apisix/plugins/request-id.lua b/apisix/plugins/request-id.lua
@@ -64,7 +64,7 @@ local attr_schema = {
 
 local _M = {
     version = 0.1,
-    priority = 11010,
+    priority = 12015,
     name = plugin_name,
     schema = schema
 }

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
@@ -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

diff --git a/t/admin/plugins.t b/t/admin/plugins.t
@@ -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

diff --git a/t/debug/debug-mode.t b/t/debug/debug-mode.t
@@ -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