test/apisix
1
0
Fork 0
mirror of https://gitee.com/iresty/apisix.git synced 2024-12-02 03:58:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support skywalking 8.7 (#5139)

Browse Source
This commit is contained in:
罗泽轩 2021-09-27 21:07:31 +08:00 committed by GitHub
parent cc84b3c16b
commit 7d7dfdd22e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/install-ext-services-via-docker.sh
View File

@ -33,7 +33,7 @@ docker exec -i kafka-server1 /opt/bitnami/kafka/bin/kafka-topics.sh --create --z
docker exec -i kafka-server2 /opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper zookeeper-server2:2181 --replication-factor 1 --partitions 1 --topic test4
# start skywalking
docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 12800:12800 apache/skywalking-oap-server:8.3.0-es6
docker run --rm --name skywalking -d -p 1234:1234 -p 11800:11800 -p 12800:12800 apache/skywalking-oap-server:8.7.0-es6
# start consul servers
docker run --rm --name consul_1 -d -p 8500:8500 consul:1.7 consul agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info -data-dir=/consul/data
docker run --rm --name consul_2 -d -p 8600:8500 consul:1.7 consul agent -server -bootstrap-expect=1 -client 0.0.0.0 -log-level info -data-dir=/consul/data

2
rockspec/apisix-master-0.rockspec
View File

@ -55,7 +55,7 @@ dependencies = {
"lua-resty-ipmatcher = 0.6.1",
"lua-resty-kafka = 0.07",
"lua-resty-logger-socket = 2.0-0",
"skywalking-nginx-lua = 0.4-1",
"skywalking-nginx-lua = 0.5.0",
"base64 = 1.5-2",
"binaryheap = 0.4",
"dkjson = 2.5-2",

22
t/plugin/skywalking.t vendored
View File

@ -474,3 +474,25 @@ qr/skywalking run \w+/
skywalking run start
skywalking run finish
skywalking run prepareForReport
=== TEST 13: delete global rule
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/global_rules/1', ngx.HTTP_DELETE)
if code >= 300 then
ngx.status = code
end
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]