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

Jump to bottom

feat(kafka-logger): supports logging request body #5501

Merged
merged 10 commits into from
Nov 18, 2021
Merged

feat(kafka-logger): supports logging request body #5501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
613c19e
feat(kafka-logger) kafka logger supports logging request body (#5343)
Nov 14, 2021
acb54e3
reindex
Nov 14, 2021
fb04109
optimize
Nov 14, 2021
d922ffd
change test kafka topic test2
Nov 14, 2021
3e867ea
optimize
Nov 15, 2021
f691471
optimize test
Nov 16, 2021
d82854c
lint
Nov 16, 2021
a017631
optimize
Nov 16, 2021
7ea1b17
optimize
Nov 17, 2021
d31a5ab
lint
Nov 17, 2021
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
10 changes: 10 additions & 0 deletions apisix/plugins/kafka-logger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ local log_util = require("apisix.utils.log-util")
local producer = require ("resty.kafka.producer")
local batch_processor = require("apisix.utils.batch-processor")
local plugin = require("apisix.plugin")
local expr = require("resty.expr.v1")

local math = math
local pairs = pairs
Expand Down Expand Up @@ -76,6 +77,7 @@ local schema = {
include_req_body = {type = "boolean", default = false},
include_req_body_expr = {
Copy link
Member

Choose a reason for hiding this comment

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

Before we can merge it, could you add a check for the expr in the check_schema? Like:

apisix/apisix/plugins/response-rewrite.lua

Line 111 in 9b355c6

if conf.vars then

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

type = "array",
minItems = 1,
items = {
type = "array",
items = {
Expand Down Expand Up @@ -107,6 +109,14 @@ local _M = {


function _M.check_schema(conf, schema_type)

if conf.vars then
Copy link
Member

Choose a reason for hiding this comment

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

Should be include_req_body_expr

local ok, err = expr.new(conf.vars)
if not ok then
return nil, {error_msg = "failed to validate the 'vars' expression: " .. err}
end
end

if schema_type == core.schema.TYPE_METADATA then
return core.schema.check(metadata_schema, conf)
end
Expand Down
4 changes: 2 additions & 2 deletions t/plugin/kafka-logger.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ qr/failed to send data to Kafka topic: .*, brokers: \{"127.0.0.127":9092}/
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/routes/1',
ngx.HTTP_PUT,
[[{
[=[{
"plugins": {
"kafka-logger": {
"broker_list" :
Expand Down Expand Up @@ -1152,7 +1152,7 @@ qr/failed to send data to Kafka topic: .*, brokers: \{"127.0.0.127":9092}/
"type": "roundrobin"
},
"uri": "/hello"
}]]
}]=]
)
if code >= 300 then
ngx.status = code
Expand Down