Merge pull request apache#7 from apache/develop

Merge dev 20210701

.asf.yaml

@@ -22,7 +22,7 @@ github:
       required_status_checks:
         strict: true
         contexts:
-          - "ubuntu-latest - Go 1.14"
+          - "ubuntu-latest - Go 1.15"
 
 notifications:
      commits:      [email protected]

.github/workflows/github-actions.yml

@@ -35,6 +35,7 @@ jobs:
       # If you want to matrix build , you can append the following list.
       matrix:
         go_version:
+          - 1.15
           - 1.14
         os:
           - ubuntu-latest

.gitignore

@@ -1,5 +1,13 @@
-./dubbo-go-pixiu
+
+# app
+dubbo-go-pixiu
+dubbo-go-pixiu.exe
+dubbgo_server.out
+samples/dubbogo/simple/server/app/app
+
 /logs
 /.idea
 /.vscode
-pkg/registry/zookeeper-4unittest/contrib/fatjar
+pkg/registry/zookeeper-4unittest/contrib/fatjar
+
+

.travis.yml

@@ -19,7 +19,7 @@
 language: go
 
 go:
-  - "1.14"
+  - "1.15"
 env:
   - GO111MODULE=on
 

Makefile

@@ -19,30 +19,31 @@
 
 cur_mkfile := $(abspath $(lastword $(MAKEFILE_LIST)))
 currentPath := $(patsubst %/, %, $(dir $(cur_mkfile)))
-$(info cur_makefile_path1=$(currentPath))
 pixiuPath := /cmd/pixiu/
 mainPath := $(currentPath)$(pixiuPath)
-$(info $(mainPath))
 
 targetName := dubbo-go-pixiu
 
 api-config-path:=${api-config}
-ifeq ("",$(api-config-path))
-        api-config-path = configs/api_config.yaml
+ifeq (,$(api-config-path))
+$(warning api-config-path is nil, default: configs/api_config.yaml)
+api-config-path = configs/api_config.yaml
 endif
 
 config-path:=${config-path}
-ifeq ("",$(config-path))
-        config-path = configs/conf.yaml
+ifeq (,$(config-path))
+$(warning config-path is nil, default: configs/conf.yaml)
+config-path = configs/conf.yaml
 endif
 
+$(info api-config-path = $(api-config-path))
+$(info config-path = $(config-path))
+
 os := $(shell go env GOOS)
-$(info os is $(os))
 ifeq (windows,$(os))
 	targetName = dubbo-go-pixiu.exe
 endif
 exe := $(mainPath)$(targetName)
-$(info path of exe is $(exe))
 build:
 	cd $(mainPath) && go build  -o $(targetName)
 

cmd/pixiu/control.go

@@ -92,7 +92,7 @@ var (
 			initFromRemote := false
 			if bootstrap.GetAPIMetaConfig() != nil {
 				if _, err := config.LoadAPIConfig(bootstrap.GetAPIMetaConfig()); err != nil {
-					logger.Errorf("load api config from etcd error:%+v", err)
+					logger.Warnf("load api config from etcd error:%+v", err)
 				} else {
 					initFromRemote = true
 				}

cmd/pixiu/pixiu.go

@@ -30,15 +30,6 @@ import (
 	"github.com/urfave/cli"
 )
 
-import (
-	_ "github.com/apache/dubbo-go-pixiu/pkg/filter/accesslog"
-	_ "github.com/apache/dubbo-go-pixiu/pkg/filter/logger"
-	_ "github.com/apache/dubbo-go-pixiu/pkg/filter/recovery"
-	_ "github.com/apache/dubbo-go-pixiu/pkg/filter/remote"
-	_ "github.com/apache/dubbo-go-pixiu/pkg/filter/response"
-	_ "github.com/apache/dubbo-go-pixiu/pkg/filter/timeout"
-)
-
 // Version pixiu version
 var Version = "0.3.0"
 

configs/api_config.yaml

@@ -22,6 +22,7 @@ resources:
   - path: '/api/v1/test-dubbo/user'
     type: restful
     description: user
+    timeout: 100ms
     plugins:
       pre:
         pluginNames:
@@ -79,4 +80,34 @@ pluginsGroup:
       - name: "trace"
         version: "0.0.1"
         priority: 1000
-        externalLookupName: "ExternalPluginTrace"
+        externalLookupName: "ExternalPluginTrace"
+rateLimit:
+  resources:
+    - name: test-dubbo
+      items:
+        #Exact
+        - matchStrategy: 0
+          pattern: "/api/v1/test-dubbo/user"
+        #Regex
+        - matchStrategy: 1
+          pattern: "/api/v1/test-dubbo/user/*"
+    - name: test-http
+      items:
+        #Exact
+        - matchStrategy: 0
+          pattern: "/api/v1/http/foo"
+        - matchStrategy: 0
+          pattern: "/api/v1/http/bar"
+        #Regex
+        - matchStrategy: 1
+          pattern: "/api/v1/http/foo/*"
+        - matchStrategy: 1
+          pattern: "/api/v1/http/bar/*"
+
+  rules:
+    #qps sample At most 100 requests can be passed in 1000ms, so qps is 100
+    - resource: "test-dubbo"
+      enable: true
+      flowRule:
+        threshold: 100
+        statintervalinms: 1000

configs/conf.yaml

@@ -75,15 +75,16 @@ static_resources:
   clusters:
     - name: "test_dubbo"
       lb_policy: "RoundRobin"
-      connect_timeout: "5s"
-      request_timeout: "10s"
       registries:
         "zookeeper":
           protocol: "zookeeper"
           timeout: "3s"
           address: "127.0.0.1:2181"
           username: ""
           password: ""
+  timeout_config:
+    connect_timeout: "5s"
+    request_timeout: "10s"
   shutdown_config:
     timeout: "60s"
     step_timeout: "10s"

docs/index.md

@@ -11,6 +11,7 @@
 * [dubbo](sample/dubbo.md)
 * [http](sample/http.md)
 * [mock](sample/mock.md)
+* [plugins](../samples/plugins/index.md)
 
 ## [User Guide](user/README.md)