From 2b3015049c3ab2433159e9241444fa0eac85c795 Mon Sep 17 00:00:00 2001 From: Jagerzhang Date: Mon, 20 Jun 2022 17:12:07 +0800 Subject: [PATCH 1/5] feat: adjust the execution priority after the request-id --- apisix/plugins/opentelemetry.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apisix/plugins/opentelemetry.lua b/apisix/plugins/opentelemetry.lua index ea05b0a8025b..b3aca1a82431 100644 --- a/apisix/plugins/opentelemetry.lua +++ b/apisix/plugins/opentelemetry.lua @@ -176,7 +176,7 @@ local schema = { local _M = { version = 0.1, - priority = 12009, + priority = 11009, name = plugin_name, schema = schema, attr_schema = attr_schema, From 061e91794b65bd1c01e2e16b1b9b8d7ef53f8d0b Mon Sep 17 00:00:00 2001 From: Jagerzhang Date: Mon, 20 Jun 2022 19:07:12 +0800 Subject: [PATCH 2/5] feat: adjust the execution priority after the request-id --- apisix/plugins/opentelemetry.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apisix/plugins/opentelemetry.lua b/apisix/plugins/opentelemetry.lua index b3aca1a82431..f6022700ccfc 100644 --- a/apisix/plugins/opentelemetry.lua +++ b/apisix/plugins/opentelemetry.lua @@ -176,7 +176,7 @@ local schema = { local _M = { version = 0.1, - priority = 11009, + priority = 11005, name = plugin_name, schema = schema, attr_schema = attr_schema, From f8fa0a90eeaf3e2111b79b16dd45094427030961 Mon Sep 17 00:00:00 2001 From: Jagerzhang Date: Tue, 21 Jun 2022 10:59:40 +0800 Subject: [PATCH 3/5] feat: adjust the execution priority after the request-id --- apisix/plugins/opentelemetry.lua | 2 +- apisix/plugins/request-id.lua | 2 +- conf/config-default.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apisix/plugins/opentelemetry.lua b/apisix/plugins/opentelemetry.lua index f6022700ccfc..ea05b0a8025b 100644 --- a/apisix/plugins/opentelemetry.lua +++ b/apisix/plugins/opentelemetry.lua @@ -176,7 +176,7 @@ local schema = { local _M = { version = 0.1, - priority = 11005, + priority = 12009, name = plugin_name, schema = schema, attr_schema = attr_schema, diff --git a/apisix/plugins/request-id.lua b/apisix/plugins/request-id.lua index 6f1ab7b0cc9e..353bd3f8322e 100644 --- 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 index c33e4a731231..2ed8c7e43657 100644 --- 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 From 9480a3cc05bf994322e1e06623ce41bd9dcf1247 Mon Sep 17 00:00:00 2001 From: Jagerzhang Date: Tue, 21 Jun 2022 20:19:44 +0800 Subject: [PATCH 4/5] fix: adjust the execution priority of request-id to fix opentelemetry has no request id --- t/debug/debug-mode.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/debug/debug-mode.t b/t/debug/debug-mode.t index d2f629d8edff..0fe20a8bb922 100644 --- 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 From 4c07de94c18b13a3752a6d4c98e31b59090fb8c9 Mon Sep 17 00:00:00 2001 From: Jagerzhang Date: Wed, 22 Jun 2022 09:36:39 +0800 Subject: [PATCH 5/5] fix: adjust the execution priority of request-id to fix opentelemetry has no request id --- t/admin/plugins.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/admin/plugins.t b/t/admin/plugins.t index 2bfb5fee30ce..c370c3c512fb 100644 --- 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