chore: compatible with Apache APISIX 2.6 (#1940)

Author: nic-chen

api/conf/schema.json

@@ -2701,6 +2701,84 @@
 			},
 			"version": 0.1
 		},
+		"ext-plugin-post-req": {
+			"priority": -3000,
+			"schema": {
+				"$comment": "this is a mark for our injected plugin schema",
+				"properties": {
+					"conf": {
+						"items": {
+							"properties": {
+								"name": {
+									"maxLength": 128,
+									"minLength": 1,
+									"type": "string"
+								},
+								"value": {
+									"type": "string"
+								}
+							},
+							"type": "object"
+						},
+						"minItems": 1,
+						"type": "array"
+					},
+					"disable": {
+						"type": "boolean"
+					},
+					"extra_info": {
+						"items": {
+							"maxLength": 64,
+							"minLength": 1,
+							"type": "string"
+						},
+						"minItems": 1,
+						"type": "array"
+					}
+				},
+				"type": "object"
+			},
+			"version": 0.1
+		},
+		"ext-plugin-pre-req": {
+			"priority": 12000,
+			"schema": {
+				"$comment": "this is a mark for our injected plugin schema",
+				"properties": {
+					"conf": {
+						"items": {
+							"properties": {
+								"name": {
+									"maxLength": 128,
+									"minLength": 1,
+									"type": "string"
+								},
+								"value": {
+									"type": "string"
+								}
+							},
+							"type": "object"
+						},
+						"minItems": 1,
+						"type": "array"
+					},
+					"disable": {
+						"type": "boolean"
+					},
+					"extra_info": {
+						"items": {
+							"maxLength": 64,
+							"minLength": 1,
+							"type": "string"
+						},
+						"minItems": 1,
+						"type": "array"
+					}
+				},
+				"type": "object"
+			},
+			"version": 0.1
+		},
 		"fault-injection": {
 			"priority": 11000,
 			"schema": {

api/test/docker/apisix_config.yaml

@@ -96,7 +96,12 @@ plugin_attr:
     service_name: APISIX
     service_instance_name: "APISIX Instance Name"
     endpoint_addr: http://172.16.238.50:12800
-
   server-info:
     report_interval: 60
     report_ttl: 3600
+  prometheus:
+    export_uri: /apisix/prometheus/metrics
+    enable_export_server: true
+    export_addr:
+      ip: "0.0.0.0"
+      port: 9091

api/test/docker/docker-compose.yaml

@@ -127,7 +127,7 @@ services:
 
   apisix:
     hostname: apisix_server1
-    image: apache/apisix:2.5-alpine
+    image: apache/apisix:2.6-alpine
     restart: always
     volumes:
       - ./apisix_config.yaml:/usr/local/apisix/conf/config.yaml:ro
@@ -141,14 +141,15 @@ services:
     ports:
       - '9080:9080/tcp'
       - '9090:9090/tcp'
+      - '9091:9091/tcp'
       - '9443:9443/tcp'
     networks:
       apisix_dashboard_e2e:
         ipv4_address: 172.16.238.30
 
   apisix2:
     hostname: apisix_server2
-    image: apache/apisix:2.5-alpine
+    image: apache/apisix:2.6-alpine
     restart: always
     volumes:
       - ./apisix_config2.yaml:/usr/local/apisix/conf/config.yaml:ro

api/test/e2enew/base/base.go

@@ -41,6 +41,7 @@ var (
 	APISIXInternalUrl      = "http://172.16.238.30:9080"
 	APISIXSingleWorkerHost = "http://127.0.0.1:9081"
 	ManagerAPIHost         = "http://127.0.0.1:9000"
+	PrometheusExporter     = "http://127.0.0.1:9091"
 )
 
 func GetToken() string {
@@ -79,6 +80,11 @@ func APISIXExpect() *httpexpect.Expect {
 	return httpexpect.New(t, APISIXHost)
 }
 
+func PrometheusExporterExpect() *httpexpect.Expect {
+	t := getTestingHandle()
+	return httpexpect.New(t, PrometheusExporter)
+}
+
 func APISIXHTTPSExpect() *httpexpect.Expect {
 	t := getTestingHandle()
 	e := httpexpect.WithConfig(httpexpect.Config{

api/test/e2enew/route/route_with_plugin_prometheus_test.go

@@ -18,6 +18,7 @@ package route
 
 import (
 	"net/http"
+	"time"
 
 	"github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/extensions/table"
@@ -60,7 +61,7 @@ var _ = ginkgo.Describe("route with plugin prometheus", func() {
 			ExpectStatus: http.StatusOK,
 		}),
 		table.Entry("fetch the prometheus metric data", base.HttpTestCase{
-			Object:       base.APISIXExpect(),
+			Object:       base.PrometheusExporterExpect(),
 			Method:       http.MethodGet,
 			Path:         "/apisix/prometheus/metrics",
 			ExpectStatus: http.StatusOK,
@@ -102,15 +103,15 @@ var _ = ginkgo.Describe("route with plugin prometheus", func() {
 			Sleep:        base.SleepTime,
 		}),
 		table.Entry("verify the prometheus metric data (apisix_http_status 200)", base.HttpTestCase{
-			Object:       base.APISIXExpect(),
+			Object:       base.PrometheusExporterExpect(),
 			Method:       http.MethodGet,
 			Path:         "/apisix/prometheus/metrics",
 			ExpectStatus: http.StatusOK,
 			ExpectBody:   `apisix_http_status{code="200",route="r1",matched_uri="/hello",matched_host="",service="",consumer=""`,
-			Sleep:        base.SleepTime,
+			Sleep:        1 * time.Second,
 		}),
 		table.Entry("verify the prometheus metric data (apisix_http_status 404)", base.HttpTestCase{
-			Object:       base.APISIXExpect(),
+			Object:       base.PrometheusExporterExpect(),
 			Method:       http.MethodGet,
 			Path:         "/apisix/prometheus/metrics",
 			ExpectStatus: http.StatusOK,