fix: replace mock tests with real tests in udp-logger #9506

Revolyssup · 2023-05-18T09:31:34Z

Description

Currently we have mock tests with udp logger. This PR uses vector to replace them with real tests by checking the logs from logging server

Fixes # (issue)

Checklist

I have explained the need for this PR and the problem it solves
I have explained the changes or the new features added to this PR
I have added tests corresponding to this change
I have updated the documentation to reflect this change
I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

ci/pod/vector/vector.toml

jiangfucheng · 2023-05-18T14:11:51Z

t/plugin/udp-logger.t

 --- grep_error_log_out
 sending a batch logs to 127.0.0.1:2000
-sending a batch logs to 127.0.0.1:2001
+sending a batch logs to 127.0.0.1:2002


Maybe we also need replace these ports to real log server port?

@Sn0rt We can let these ones as it is, right?

It’s okay, it’s better if a real udp logger is introduced to replace it

t/plugin/udp-logger.t

jiangfucheng · 2023-05-18T14:26:13Z

Maybe we should add more test cases with batch_max_size > 1

monkeyDluffy6017 · 2023-05-18T14:42:18Z

@Sn0rt please help to review

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

Sn0rt · 2023-05-18T09:34:23Z

ci/pod/docker-compose.plugin.yml

should I set the UDP port by 8125:8125/udp ?

Yep this looks right. I made this change.

Sn0rt · 2023-05-18T09:37:05Z

t/plugin/udp-logger.t

                                    "vip": "$remote_addr"
-                                },
-                                "batch_max_size": 1,
-                                "inactive_timeout": 1


not needed to remove .

it was added back in later commit

Sn0rt · 2023-05-19T01:10:25Z

t/plugin/udp-logger.t

 --- grep_error_log_out
 sending a batch logs to 127.0.0.1:2000
-sending a batch logs to 127.0.0.1:2001
+sending a batch logs to 127.0.0.1:2002


It’s okay, it’s better if a real udp logger is introduced to replace it

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

t/plugin/udp-logger.t

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

Co-authored-by: Tristan <jiangfucheng0914@foxmail.com>

leslie-tsang

LGTM

monkeyDluffy6017 · 2023-05-23T07:10:38Z

t/plugin/udp-logger.t

+            local code, _, _ = t("/hello", "GET")
+            if code >= 300 then
+                ngx.status = code
+                ngx.say("fail")
+                return
+            end


The test case's name is add plugin, but you also access the route in the test case, why not create a new test case to access?

=== TEST 10: access --- request GET /hello --- response_body passed

@monkeyDluffy6017 renamed the tests appropriately.

monkeyDluffy6017 · 2023-05-23T07:12:19Z

t/plugin/udp-logger.t

+            local code, _, _ = t("/hello", "GET")
+            if code >= 300 then
+                ngx.status = code
+                ngx.say("fail")
+                return
+            end


ditto, and remember to add a blank between two blocks

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

…PTests

monkeyDluffy6017 · 2023-05-23T07:33:06Z

t/plugin/udp-logger.t

+                return
+            end
            ngx.say(body)
+            local code, _, _ = t("/hello", "GET")


need a blank before this block

oops I had missed it. Added now. @monkeyDluffy6017

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

Revolyssup added 3 commits May 18, 2023 14:59

fix: replace mock tests with real tests in udp-logger

5cc051a

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

send GET requests in tests

a02d966

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

fix merge conflict

4d15417

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

jiangfucheng reviewed May 18, 2023

View reviewed changes

Revolyssup added 2 commits May 18, 2023 21:29

fix failing test due to syntax error

e58d899

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

use port 8127 instead of 8125

6680c69

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

Sn0rt reviewed May 19, 2023

View reviewed changes

Add /udp in docker port mapping

98607f7

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

leslie-tsang reviewed May 19, 2023

View reviewed changes

t/plugin/udp-logger.t Outdated Show resolved Hide resolved

t/plugin/udp-logger.t Outdated Show resolved Hide resolved

Revolyssup and others added 3 commits May 19, 2023 22:30

fix lint tests

e4664f1

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

reindex

e9912ab

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

Update ci/pod/vector/vector.toml

1126eef

Co-authored-by: Tristan <jiangfucheng0914@foxmail.com>

leslie-tsang previously approved these changes May 23, 2023

View reviewed changes

leslie-tsang requested a review from monkeyDluffy6017 May 23, 2023 05:19

Sn0rt previously approved these changes May 23, 2023

View reviewed changes

monkeyDluffy6017 reviewed May 23, 2023

View reviewed changes

monkeyDluffy6017 added the wait for update wait for the author's response in this issue/PR label May 23, 2023

Revolyssup added 2 commits May 23, 2023 13:00

rename tests

6b3caed

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

Merge branch 'addUDPTests' of github.com:Revolyssup/apisix into addUD…

68ac857

…PTests

Revolyssup dismissed stale reviews from Sn0rt and leslie-tsang via 68ac857 May 23, 2023 07:31

monkeyDluffy6017 reviewed May 23, 2023

View reviewed changes

Revolyssup added 2 commits May 23, 2023 13:04

add newline

3b564ec

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

add newline

4a97991

Signed-off-by: revolyssup <ashishjaitiwari15112000@gmail.com>

monkeyDluffy6017 approved these changes May 23, 2023

View reviewed changes

monkeyDluffy6017 requested a review from leslie-tsang May 23, 2023 07:37

monkeyDluffy6017 removed the wait for update wait for the author's response in this issue/PR label May 23, 2023

monkeyDluffy6017 added the approved label May 23, 2023

Sn0rt approved these changes May 23, 2023

View reviewed changes

leslie-tsang approved these changes May 23, 2023

View reviewed changes

monkeyDluffy6017 merged commit eaed6c8 into apache:master May 24, 2023

fix: replace mock tests with real tests in udp-logger #9506

fix: replace mock tests with real tests in udp-logger #9506

Uh oh!

Conversation

Revolyssup commented May 18, 2023

Description

Checklist

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jiangfucheng commented May 18, 2023

Uh oh!

monkeyDluffy6017 commented May 18, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

leslie-tsang left a comment

Choose a reason for hiding this comment

Uh oh!

monkeyDluffy6017 May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Revolyssup May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

monkeyDluffy6017 May 23, 2023 •

edited

Loading

Revolyssup May 23, 2023 •

edited

Loading