This is an automated email from the ASF dual-hosted git repository.
xiaoliu pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git
The following commit(s) were added to refs/heads/develop by this push:
new da732e8 test add integrate test (#183)
da732e8 is described below
commit da732e81d90d43d25f2e659d747ac8a2acec2797
Author: zhangxun <[email protected]>
AuthorDate: Thu Jul 1 17:10:53 2021 +0800
test add integrate test (#183)
* test add integrate test
* add license checker
* add license checker
* add license checker
* chmod sh
* chmod +X sh
* fix config path
* fix config path
* fix config path
* fix config path
* fix config path
* modify travis path
* split import
---
.github/workflows/github-actions.yml | 7 +-
.travis.yml | 2 +-
build/Makefile | 152 ++++++++++++
integrate_test.sh | 39 +++
.../dubbogo/simple/body/docker/docker-compose.yml | 27 +++
.../simple/body/{ => pixiu}/api_config.yaml | 0
samples/dubbogo/simple/body/{ => pixiu}/conf.yaml | 0
samples/dubbogo/simple/body/server/app/server.go | 74 ++++++
samples/dubbogo/simple/body/server/app/user.go | 270 +++++++++++++++++++++
samples/dubbogo/simple/body/server/app/version.go | 21 ++
.../{conf.yaml => server/profiles/dev/log.yml} | 56 +++--
.../simple/body/server/profiles/dev/server.yml | 73 ++++++
.../{conf.yaml => server/profiles/release/log.yml} | 56 +++--
.../simple/body/server/profiles/release/server.yml | 77 ++++++
.../{conf.yaml => server/profiles/test/log.yml} | 56 +++--
.../simple/body/server/profiles/test/server.yml | 76 ++++++
samples/dubbogo/simple/body/test/pixiu_test.go | 40 +++
start_integrate_test.sh | 35 +++
18 files changed, 971 insertions(+), 90 deletions(-)
diff --git a/.github/workflows/github-actions.yml
b/.github/workflows/github-actions.yml
index 7eb0dea..2327a6e 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -93,8 +93,11 @@ jobs:
- name: Go Test
run: |
chmod u+x before_ut.sh && ./before_ut.sh
- go mod vendor && go test ./... -coverprofile=coverage.txt
-covermode=atomic
-# chmod +x integrate_test.sh && ./integrate_test.sh
+ go mod vendor && go test ./pkg/... -coverprofile=coverage.txt
-covermode=atomic
+ # integration test
+ - name: Integration Test
+ run: |
+ chmod +x start_integrate_test.sh && chmod +x integrate_test.sh &&
./start_integrate_test.sh
- name: Coverage
run: bash <(curl -s https://codecov.io/bash)
diff --git a/.travis.yml b/.travis.yml
index 118731a..74a6d48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
# unit-test
- echo 'start unit-test'
- chmod u+x before_ut.sh && ./before_ut.sh
- - go mod vendor && go test ./... -coverprofile=coverage.txt -covermode=atomic
+ - go mod vendor && go test ./pkg/... -coverprofile=coverage.txt
-covermode=atomic
after_success:
- bash <(curl -s https://codecov.io/bash)
diff --git a/build/Makefile b/build/Makefile
new file mode 100644
index 0000000..c27129c
--- /dev/null
+++ b/build/Makefile
@@ -0,0 +1,152 @@
+#
+# Licensed to Apache Software Foundation (ASF) under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Apache Software Foundation (ASF) licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+PROJECT_NAME = $(shell basename "$(PWD)")
+PID = /tmp/.$(PROJECT_NAME).pid
+PROJECT_DIR=$(shell pwd)
+BASE_DIR := $(PROJECT_DIR)/dist
+PIXIU_DIR := $(PIXIU_DIR)
+PIXIU_PID = /tmp/.pixiu.pid
+
+SOURCES = $(wildcard $(PROJECT_DIR)/server/app/*.go)
+pixiuSources = $(wildcard $(PIXIU_DIR)/cmd/pixiu/*.go)
+
+export GO111MODULE ?= on
+export GOPROXY ?= https://goproxy.io,direct
+export GOSUMDB ?= sum.golang.org
+export GOARCH ?= amd64
+
+export DOCKER_HOST_IP = $(shell ifconfig en0 | grep inet | grep -v inet6 | awk
'{print $$2}')
+
+OS := $(shell uname)
+ifeq ($(OS), Linux)
+ export GOOS ?= linux
+else ifeq ($(OS), Darwin)
+ export GOOS ?= darwin
+else
+ export GOOS ?= windows
+endif
+
+ifeq ($(GOOS), windows)
+ export EXT_NAME ?= .exe
+else
+ export EXT_NAME ?=
+endif
+
+CGO ?= 0
+ifeq ($(DEBUG), true)
+ BUILD_TYPE := debug
+ GCFLAGS := -gcflags="all=-N -l"
+ LCFLAGS :=
+else
+ BUILD_TYPE := release
+ LDFLAGS := "-s -w"
+endif
+
+OUT_DIR := $(BASE_DIR)/$(GOOS)_$(GOARCH)/$(rtfg8u7)
+LOG_FILE := $(OUT_DIR)/$(PROJECT_NAME).log
+API_CONFIG_PATH := $(OUT_DIR)/pixiuconf/api_config.yaml
+CONFIG_PATH := $(OUT_DIR)/pixiuconf/conf.yaml
+
+export APP_LOG_CONF_FILE ?= $(OUT_DIR)/conf/log.yml
+
+.PHONY: all
+all: help
+help: $(realpath $(firstword $(MAKEFILE_LIST)))
+ @echo
+ @echo " Choose a command run in "$(PROJECT_NAME)":"
+ @echo
+ @sed -n 's/^##//p' $< | column -t -s ':' | sed -e 's/^/ /'
+ @echo
+
+## build: Build application's binaries
+.PHONY: build
+build: $(OUT_DIR)/$(PROJECT_NAME)$(EXT_NAME) config
+
+.PHONY: $(OUT_DIR)/$(PROJECT_NAME)$(EXT_NAME)
+$(OUT_DIR)/$(PROJECT_NAME)$(EXT_NAME):
+ $(info > Buiding application binary:
$(OUT_DIR)/$(PROJECT_NAME)$(EXT_NAME))
+ @CGO_ENABLED=$(CGO) GOOS=$(GOOS) GOARCH=$(GOARCH) go build $(GCFLAGS)
-ldflags=$(LDFLAGS) -i -o $(OUT_DIR)/server/$(PROJECT_NAME)$(EXT_NAME)
$(SOURCES)
+
+
+## config: Setup config files
+.PHONY: config
+config:
+ $(info > Setting up config files)
+ @mkdir -p $(OUT_DIR)/server
+ @mkdir -p $(OUT_DIR)/pixiuconf
+ @-test -f $(PROJECT_DIR)/server/profiles/dev/log.yml && cat
$(PROJECT_DIR)/server/profiles/dev/log.yml | sed
"s#\$$HOST_IP#$(DOCKER_HOST_IP)#g" > $(OUT_DIR)/server/log.yml && echo " >
$(OUT_DIR)/conf/log.yml"
+ @-test -f $(PROJECT_DIR)/server/profiles/dev/server.yml && cat
$(PROJECT_DIR)/server/profiles/dev/server.yml | sed
"s#\$$HOST_IP#$(DOCKER_HOST_IP)#g" > $(OUT_DIR)/server/server.yml && echo " >
$(OUT_DIR)/conf/server.yml"
+ @-test -f $(PROJECT_DIR)/pixiu/api_config.yaml && cat
$(PROJECT_DIR)/pixiu/api_config.yaml | sed "s#\$$HOST_IP#$(DOCKER_HOST_IP)#g" >
$(OUT_DIR)/pixiuconf/api_config.yaml && echo " >
$(OUT_DIR)/pixiuconf/api_config.yaml"
+ @-test -f $(PROJECT_DIR)/pixiu/conf.yaml && cat
$(PROJECT_DIR)/pixiu/conf.yaml | sed "s#\$$HOST_IP#$(DOCKER_HOST_IP)#g" >
$(OUT_DIR)/pixiuconf/conf.yaml && echo " > $(OUT_DIR)/pixiuconf/conf.yaml"
+
+## docker-up: Shutdown dependency services on docker
+.PHONY: docker-up
+docker-up:
+ $(info > Starting dependency services with
$(PROJECT_DIR)/docker/docker-compose.yml)
+ @docker-compose -f $(PROJECT_DIR)/docker/docker-compose.yml up -d
+
+## docker-down: Shutdown dependency services on docker
+.PHONY: docker-down
+docker-down:
+ $(info > Stopping dependency services with
$(PROJECT_DIR)/docker/docker-compose.yml)
+ @docker-compose -f $(PROJECT_DIR)/docker/docker-compose.yml down
+
+## clean: Clean up the output and the binary of the application
+.PHONY: clean
+clean: stop
+ $(info > Cleanning up $(OUT_DIR))
+ @-rm -rf $(OUT_DIR)
+ @-cat $(PID) | awk '{print $1}' | xargs kill -9
+ @-cat $(PIXIU_PID) | awk '{print $1}' | xargs kill -9
+
+## start: Start the application (for server)
+.PHONY: start
+start: export CONF_PROVIDER_FILE_PATH ?= $(OUT_DIR)/server/server.yml
+start: build
+ $(info > Starting application $(PROJECT_NAME), output is redirected
to $(LOG_FILE))
+ @-$(OUT_DIR)/server/$(PROJECT_NAME)$(EXT_NAME) > $(LOG_FILE) 2>&1 &
echo $$! > $(PID)
+ @cat $(PID) | sed "/^/s/^/ \> PID: /"
+
+## run: Run the application (for client)
+.PHONY: run
+run: buildPixiu
+ $(info > Running application PIXIU, output is redirected to
$(LOG_FILE))
+
+## buildPixiu: start pixiu
+.PHONY: buildPixiu
+buildPixiu:
+ @CGO_ENABLED=$(CGO) GOOS=$(GOOS) GOARCH=$(GOARCH) go build $(GCFLAGS)
-ldflags=$(LDFLAGS) -i -o $(OUT_DIR)/pixiu$(EXT_NAME) $(pixiuSources)
+ @-$(OUT_DIR)/pixiu$(EXT_NAME) -a $(API_CONFIG_PATH) -c $(CONFIG_PATH) &
echo $$! > $(PIXIU_PID)
+ @cat $(PIXIU_PID) | sed "/^/s/^/ \> PIXIU_PID: /"
+## stop: Stop running the application (for server)
+.PHONY: stop
+stop:
+ $(info > Stopping the application $(PROJECT_NAME))
+ @cat $(PID) | sed "/^/s/^/ \> Killing PID: /"
+ @-kill `cat $(PID)` 2>/dev/null || true
+
+## integration: Run integration test for this application
+.PHONY: integration
+integration: export CONF_CONSUMER_FILE_PATH ?= $(OUT_DIR)/conf/client.yml
+integration: export CONF_ROUTER_FILE_PATH ?= $(OUT_DIR)/conf/router_config.yml
+integration:
+ $(info > Running integration test for application $(PROJECT_NAME))
+ @go clean -testcache
+ @go test -tags integration -v $(PROJECT_DIR)/test/...
diff --git a/integrate_test.sh b/integrate_test.sh
new file mode 100644
index 0000000..e7bb017
--- /dev/null
+++ b/integrate_test.sh
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ -z "$1" ]; then
+ echo 'Provide test directory please, like : ./integrate_test.sh
$(pwd)/samples/simple/server .'
+ exit
+fi
+
+P_DIR=$(pwd)/$1
+PIXIU_DIR=$(pwd)
+
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f build/Makefile docker-up
+
+# start server
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f build/Makefile start
+# start pixiu
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f build/Makefile buildPixiu
+# start integration
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f build/Makefile integration
+result=$?
+# stop server
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f build/Makefile clean
+
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f build/Makefile docker-down
+
+exit $((result))
diff --git a/samples/dubbogo/simple/body/docker/docker-compose.yml
b/samples/dubbogo/simple/body/docker/docker-compose.yml
new file mode 100644
index 0000000..7ca8ee5
--- /dev/null
+++ b/samples/dubbogo/simple/body/docker/docker-compose.yml
@@ -0,0 +1,27 @@
+#
+# Licensed to Apache Software Foundation (ASF) under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Apache Software Foundation (ASF) licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version: '3'
+
+services:
+ zookeeper:
+ image: zookeeper
+ ports:
+ - 2181:2181
+ restart: on-failure
diff --git a/samples/dubbogo/simple/body/api_config.yaml
b/samples/dubbogo/simple/body/pixiu/api_config.yaml
similarity index 100%
rename from samples/dubbogo/simple/body/api_config.yaml
rename to samples/dubbogo/simple/body/pixiu/api_config.yaml
diff --git a/samples/dubbogo/simple/body/conf.yaml
b/samples/dubbogo/simple/body/pixiu/conf.yaml
similarity index 100%
copy from samples/dubbogo/simple/body/conf.yaml
copy to samples/dubbogo/simple/body/pixiu/conf.yaml
diff --git a/samples/dubbogo/simple/body/server/app/server.go
b/samples/dubbogo/simple/body/server/app/server.go
new file mode 100644
index 0000000..87ab762
--- /dev/null
+++ b/samples/dubbogo/simple/body/server/app/server.go
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+ "fmt"
+ "os"
+ "os/signal"
+ "syscall"
+ "time"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ _ "github.com/apache/dubbo-go/filter/filter_impl"
+
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
+)
+
+var survivalTimeout = int(3e9)
+
+// they are necessary:
+// export CONF_PROVIDER_FILE_PATH="xxx"
+// export APP_LOG_CONF_FILE="xxx"
+func main() {
+ config.Load()
+ logger.Info("dubbo version is: %s", Version)
+ initSignal()
+}
+
+func initSignal() {
+ signals := make(chan os.Signal, 1)
+ // It is not possible to block SIGKILL or syscall.SIGSTOP
+ signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGQUIT,
syscall.SIGTERM, syscall.SIGINT)
+ for {
+ sig := <-signals
+ logger.Infof("get signal %s", sig.String())
+ switch sig {
+ case syscall.SIGHUP:
+ // reload()
+ default:
+ time.AfterFunc(time.Duration(survivalTimeout), func() {
+ logger.Warnf("app exit now by force...")
+ os.Exit(1)
+ })
+
+ // The program exits normally or timeout forcibly exits.
+ fmt.Println("provider app exit now...")
+ return
+ }
+ }
+}
diff --git a/samples/dubbogo/simple/body/server/app/user.go
b/samples/dubbogo/simple/body/server/app/user.go
new file mode 100644
index 0000000..e0f2b7d
--- /dev/null
+++ b/samples/dubbogo/simple/body/server/app/user.go
@@ -0,0 +1,270 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+ "context"
+ "errors"
+ "fmt"
+ "sync"
+ "time"
+)
+
+import (
+ hessian "github.com/apache/dubbo-go-hessian2"
+ "github.com/apache/dubbo-go/config"
+)
+
+func init() {
+ config.SetProviderService(new(UserProvider))
+ // ------for hessian2------
+ hessian.RegisterPOJO(&User{})
+
+ cache = &UserDB{
+ nameIndex: make(map[string]*User, 16),
+ codeIndex: make(map[int64]*User, 16),
+ lock: sync.Mutex{},
+ }
+
+ cache.Add(&User{ID: "0001", Code: 1, Name: "tc", Age: 18, Time:
time.Now()})
+ cache.Add(&User{ID: "0002", Code: 2, Name: "ic", Age: 88, Time:
time.Now()})
+}
+
+var cache *UserDB
+
+// UserDB cache user.
+type UserDB struct {
+ // key is name, value is user obj
+ nameIndex map[string]*User
+ // key is code, value is user obj
+ codeIndex map[int64]*User
+ lock sync.Mutex
+}
+
+// nolint
+func (db *UserDB) Add(u *User) bool {
+ db.lock.Lock()
+ defer db.lock.Unlock()
+
+ if u.Name == "" || u.Code <= 0 {
+ return false
+ }
+
+ if !db.existName(u.Name) && !db.existCode(u.Code) {
+ return db.AddForName(u) && db.AddForCode(u)
+ }
+
+ return false
+}
+
+// nolint
+func (db *UserDB) AddForName(u *User) bool {
+ if len(u.Name) == 0 {
+ return false
+ }
+
+ if _, ok := db.nameIndex[u.Name]; ok {
+ return false
+ }
+
+ db.nameIndex[u.Name] = u
+ return true
+}
+
+// nolint
+func (db *UserDB) AddForCode(u *User) bool {
+ if u.Code <= 0 {
+ return false
+ }
+
+ if _, ok := db.codeIndex[u.Code]; ok {
+ return false
+ }
+
+ db.codeIndex[u.Code] = u
+ return true
+}
+
+// nolint
+func (db *UserDB) GetByName(n string) (*User, bool) {
+ db.lock.Lock()
+ defer db.lock.Unlock()
+
+ r, ok := db.nameIndex[n]
+ return r, ok
+}
+
+// nolint
+func (db *UserDB) GetByCode(n int64) (*User, bool) {
+ db.lock.Lock()
+ defer db.lock.Unlock()
+
+ r, ok := db.codeIndex[n]
+ return r, ok
+}
+
+func (db *UserDB) existName(name string) bool {
+ if len(name) <= 0 {
+ return false
+ }
+
+ _, ok := db.nameIndex[name]
+ if ok {
+ return true
+ }
+
+ return false
+}
+
+func (db *UserDB) existCode(code int64) bool {
+ if code <= 0 {
+ return false
+ }
+
+ _, ok := db.codeIndex[code]
+ if ok {
+ return true
+ }
+
+ return false
+}
+
+// User user obj.
+type User struct {
+ ID string `json:"id,omitempty"`
+ Code int64 `json:"code,omitempty"`
+ Name string `json:"name,omitempty"`
+ Age int32 `json:"age,omitempty"`
+ Time time.Time `json:"time,omitempty"`
+}
+
+// UserProvider the dubbo provider.
+// like: version: 1.0.0 group: test
+type UserProvider struct{}
+
+// CreateUser new user, PX config POST.
+func (u *UserProvider) CreateUser(ctx context.Context, user *User) (*User,
error) {
+ outLn("Req CreateUser data:%#v", user)
+ if user == nil {
+ return nil, errors.New("not found")
+ }
+ _, ok := cache.GetByName(user.Name)
+ if ok {
+ return nil, errors.New("data is exist")
+ }
+
+ b := cache.Add(user)
+ if b {
+ return user, nil
+ }
+
+ return nil, errors.New("add error")
+}
+
+// GetUserByName query by name, single param, PX config GET.
+func (u *UserProvider) GetUserByName(ctx context.Context, name string) (*User,
error) {
+ outLn("Req GetUserByName name:%#v", name)
+ r, ok := cache.GetByName(name)
+ if ok {
+ outLn("Req GetUserByName result:%#v", r)
+ return r, nil
+ }
+ return nil, nil
+}
+
+// GetUserByCode query by code, single param, PX config GET.
+func (u *UserProvider) GetUserByCode(ctx context.Context, code int64) (*User,
error) {
+ outLn("Req GetUserByCode name:%#v", code)
+ r, ok := cache.GetByCode(code)
+ if ok {
+ outLn("Req GetUserByCode result:%#v", r)
+ return r, nil
+ }
+ return nil, nil
+}
+
+// GetUserTimeout query by name, will timeout for pixiu.
+func (u *UserProvider) GetUserTimeout(ctx context.Context, name string)
(*User, error) {
+ outLn("Req GetUserByName name:%#v", name)
+ // sleep 10s, pixiu config less than 10s.
+ time.Sleep(10 * time.Second)
+ r, ok := cache.GetByName(name)
+ if ok {
+ outLn("Req GetUserByName result:%#v", r)
+ return r, nil
+ }
+ return nil, nil
+}
+
+// GetUserByNameAndAge query by name and age, two params, PX config GET.
+func (u *UserProvider) GetUserByNameAndAge(ctx context.Context, name string,
age int32) (*User, error) {
+ outLn("Req GetUserByNameAndAge name:%s, age:%d", name, age)
+ r, ok := cache.GetByName(name)
+ if ok && r.Age == age {
+ outLn("Req GetUserByNameAndAge result:%#v", r)
+ return r, nil
+ }
+ return r, nil
+}
+
+// UpdateUser update by user struct, my be another struct, PX config POST or
PUT.
+func (u *UserProvider) UpdateUser(ctx context.Context, user *User) (bool,
error) {
+ outLn("Req UpdateUser data:%#v", user)
+ r, ok := cache.GetByName(user.Name)
+ if ok {
+ if user.ID != "" {
+ r.ID = user.ID
+ }
+ if user.Age >= 0 {
+ r.Age = user.Age
+ }
+ return true, nil
+ }
+ return false, errors.New("not found")
+}
+
+// UpdateUserByName update by user struct, my be another struct, PX config
POST or PUT.
+func (u *UserProvider) UpdateUserByName(ctx context.Context, name string, user
*User) (bool, error) {
+ outLn("Req UpdateUserByName data:%#v", user)
+ r, ok := cache.GetByName(name)
+ if ok {
+ if user.ID != "" {
+ r.ID = user.ID
+ }
+ if user.Age >= 0 {
+ r.Age = user.Age
+ }
+ return true, nil
+ }
+ return false, errors.New("not found")
+}
+
+// nolint
+func (u *UserProvider) Reference() string {
+ return "UserProvider"
+}
+
+// nolint
+func (u User) JavaClassName() string {
+ return "com.dubbogo.pixiu.User"
+}
+
+// nolint
+func outLn(format string, args ...interface{}) {
+ fmt.Printf("\033[32;40m"+format+"\033[0m\n", args...)
+}
diff --git a/samples/dubbogo/simple/body/server/app/version.go
b/samples/dubbogo/simple/body/server/app/version.go
new file mode 100644
index 0000000..04a3f78
--- /dev/null
+++ b/samples/dubbogo/simple/body/server/app/version.go
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+// Version dubbo version
+const Version = "2.7.5"
diff --git a/samples/dubbogo/simple/body/conf.yaml
b/samples/dubbogo/simple/body/server/profiles/dev/log.yml
similarity index 55%
copy from samples/dubbogo/simple/body/conf.yaml
copy to samples/dubbogo/simple/body/server/profiles/dev/log.yml
index 6e65bf5..9330cda 100644
--- a/samples/dubbogo/simple/body/conf.yaml
+++ b/samples/dubbogo/simple/body/server/profiles/dev/log.yml
@@ -16,32 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
----
-static_resources:
- listeners:
- - name: "net/http"
- address:
- socket_address:
- protocol_type: "HTTP"
- address: "0.0.0.0"
- port: 8881
- config:
- idle_timeout: 5s
- read_timeout: 5s
- write_timeout: 5s
- clusters:
- - name: "test_dubbo"
- lb_policy: "RoundRobin"
- registries:
- "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"
- reject_policy: "immediacy"
\ No newline at end of file
+level: "debug"
+development: true
+disableCaller: false
+disableStacktrace: false
+sampling:
+encoding: "console"
+
+# encoder
+encoderConfig:
+ messageKey: "message"
+ levelKey: "level"
+ timeKey: "time"
+ nameKey: "logger"
+ callerKey: "caller"
+ stacktraceKey: "stacktrace"
+ lineEnding: ""
+ levelEncoder: "capitalColor"
+ timeEncoder: "iso8601"
+ durationEncoder: "seconds"
+ callerEncoder: "short"
+ nameEncoder: ""
+
+outputPaths:
+ - "stderr"
+errorOutputPaths:
+ - "stderr"
+initialFields:
diff --git a/samples/dubbogo/simple/body/server/profiles/dev/server.yml
b/samples/dubbogo/simple/body/server/profiles/dev/server.yml
new file mode 100644
index 0000000..66d8f94
--- /dev/null
+++ b/samples/dubbogo/simple/body/server/profiles/dev/server.yml
@@ -0,0 +1,73 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# dubbo server yaml configure file
+# application config
+application:
+ organization: "dubbogopixiu.com"
+ name: "BDTService"
+ module: "dubbogo user-info server"
+ version: "0.0.1"
+ owner: "ZX"
+ environment: "dev"
+
+registries:
+ "demoZk":
+ protocol: "zookeeper"
+ timeout: "3s"
+ address: "127.0.0.1:2181"
+
+services:
+ "UserProvider":
+ registry: "demoZk"
+ protocol: "dubbo"
+ # Equivalent to the interface in the dubbo.xml file
+ interface: "com.dubbogo.pixiu.UserService"
+ loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ group: test
+ version: 1.0.0
+ methods:
+ - name: "CreateUser"
+ retries: 1
+ loadbalance: "random"
+
+protocols:
+ "dubbo":
+ name: "dubbo"
+ port: 20000
+
+protocol_conf:
+ dubbo:
+ session_number: 700
+ session_timeout: "20s"
+ getty_session_param:
+ compress_encoding: false
+ tcp_no_delay: true
+ tcp_keep_alive: true
+ keep_alive_period: "120s"
+ tcp_r_buf_size: 262144
+ tcp_w_buf_size: 65536
+ pkg_rq_size: 1024
+ pkg_wq_size: 512
+ tcp_read_timeout: "1s"
+ tcp_write_timeout: "5s"
+ wait_timeout: "1s"
+ max_msg_len: 1024
+ session_name: "server"
\ No newline at end of file
diff --git a/samples/dubbogo/simple/body/conf.yaml
b/samples/dubbogo/simple/body/server/profiles/release/log.yml
similarity index 55%
copy from samples/dubbogo/simple/body/conf.yaml
copy to samples/dubbogo/simple/body/server/profiles/release/log.yml
index 6e65bf5..e2835d8 100644
--- a/samples/dubbogo/simple/body/conf.yaml
+++ b/samples/dubbogo/simple/body/server/profiles/release/log.yml
@@ -16,32 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
----
-static_resources:
- listeners:
- - name: "net/http"
- address:
- socket_address:
- protocol_type: "HTTP"
- address: "0.0.0.0"
- port: 8881
- config:
- idle_timeout: 5s
- read_timeout: 5s
- write_timeout: 5s
- clusters:
- - name: "test_dubbo"
- lb_policy: "RoundRobin"
- registries:
- "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"
- reject_policy: "immediacy"
\ No newline at end of file
+level: "warn"
+development: true
+disableCaller: true
+disableStacktrace: true
+sampling:
+encoding: "console"
+
+# encoder
+encoderConfig:
+ messageKey: "message"
+ levelKey: "level"
+ timeKey: "time"
+ nameKey: "logger"
+ callerKey: "caller"
+ stacktraceKey: "stacktrace"
+ lineEnding: ""
+ levelEncoder: "capitalColor"
+ timeEncoder: "iso8601"
+ durationEncoder: "seconds"
+ callerEncoder: "short"
+ nameEncoder: ""
+
+outputPaths:
+ - "stderr"
+errorOutputPaths:
+ - "stderr"
+initialFields:
diff --git a/samples/dubbogo/simple/body/server/profiles/release/server.yml
b/samples/dubbogo/simple/body/server/profiles/release/server.yml
new file mode 100644
index 0000000..e4ebf01
--- /dev/null
+++ b/samples/dubbogo/simple/body/server/profiles/release/server.yml
@@ -0,0 +1,77 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# dubbo server yaml configure file
+
+
+# application config
+application:
+ organization: "dubbogopixiu.com"
+ name: "BDTService"
+ module: "dubbogo user-info server"
+ version: "0.0.1"
+ owner: "ZX"
+ environment: "release"
+
+registries:
+ "hangzhouzk":
+ protocol: "zookeeper"
+ timeout: "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
+
+services:
+ "UserProvider":
+ protocol: "dubbo"
+ # Equivalent to the interface in the dubbo.xml file
+ interface: "com.dubbogo.UserService"
+ loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
+
+
+protocols:
+ "dubbo":
+ name: "dubbo"
+ # ip : "127.0.0.1"
+ port: 20000
+
+
+protocol_conf:
+ dubbo:
+ session_number: 700
+ session_timeout: "20s"
+ getty_session_param:
+ compress_encoding: false
+ tcp_no_delay: true
+ tcp_keep_alive: true
+ keep_alive_period: "120s"
+ tcp_r_buf_size: 262144
+ tcp_w_buf_size: 65536
+ pkg_rq_size: 1024
+ pkg_wq_size: 512
+ tcp_read_timeout: "1s"
+ tcp_write_timeout: "5s"
+ wait_timeout: "1s"
+ max_msg_len: 1024
+ session_name: "server"
\ No newline at end of file
diff --git a/samples/dubbogo/simple/body/conf.yaml
b/samples/dubbogo/simple/body/server/profiles/test/log.yml
similarity index 55%
rename from samples/dubbogo/simple/body/conf.yaml
rename to samples/dubbogo/simple/body/server/profiles/test/log.yml
index 6e65bf5..26d0a76 100644
--- a/samples/dubbogo/simple/body/conf.yaml
+++ b/samples/dubbogo/simple/body/server/profiles/test/log.yml
@@ -16,32 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
----
-static_resources:
- listeners:
- - name: "net/http"
- address:
- socket_address:
- protocol_type: "HTTP"
- address: "0.0.0.0"
- port: 8881
- config:
- idle_timeout: 5s
- read_timeout: 5s
- write_timeout: 5s
- clusters:
- - name: "test_dubbo"
- lb_policy: "RoundRobin"
- registries:
- "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"
- reject_policy: "immediacy"
\ No newline at end of file
+level: "info"
+development: false
+disableCaller: false
+disableStacktrace: true
+sampling:
+encoding: "console"
+
+# encoder
+encoderConfig:
+ messageKey: "message"
+ levelKey: "level"
+ timeKey: "time"
+ nameKey: "logger"
+ callerKey: "caller"
+ stacktraceKey: "stacktrace"
+ lineEnding: ""
+ levelEncoder: "capitalColor"
+ timeEncoder: "iso8601"
+ durationEncoder: "seconds"
+ callerEncoder: "short"
+ nameEncoder: ""
+
+outputPaths:
+ - "stderr"
+errorOutputPaths:
+ - "stderr"
+initialFields:
diff --git a/samples/dubbogo/simple/body/server/profiles/test/server.yml
b/samples/dubbogo/simple/body/server/profiles/test/server.yml
new file mode 100644
index 0000000..cba0212
--- /dev/null
+++ b/samples/dubbogo/simple/body/server/profiles/test/server.yml
@@ -0,0 +1,76 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# dubbo server yaml configure file
+
+
+# application config
+application:
+ organization: "dubbogopixiu.com"
+ name: "BDTService"
+ module: "dubbogo user-info server"
+ version: "0.0.1"
+ owner: "ZX"
+ environment: "test"
+
+registries:
+ "hangzhouzk":
+ protocol: "zookeeper"
+ timeout: "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
+
+services:
+ "UserProvider":
+ protocol: "dubbo"
+ # Equivalent to the interface in the dubbo.xml file
+ interface: "com.dubbogo.UserService"
+ loadbalance: "random"
+ warmup: "100"
+ cluster: "failover"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
+
+protocols:
+ "dubbo":
+ name: "dubbo"
+ # ip : "127.0.0.1"
+ port: 20000
+
+
+protocol_conf:
+ dubbo:
+ session_number: 700
+ session_timeout: "20s"
+ getty_session_param:
+ compress_encoding: false
+ tcp_no_delay: true
+ tcp_keep_alive: true
+ keep_alive_period: "120s"
+ tcp_r_buf_size: 262144
+ tcp_w_buf_size: 65536
+ pkg_rq_size: 1024
+ pkg_wq_size: 512
+ tcp_read_timeout: "1s"
+ tcp_write_timeout: "5s"
+ wait_timeout: "1s"
+ max_msg_len: 1024
+ session_name: "server"
\ No newline at end of file
diff --git a/samples/dubbogo/simple/body/test/pixiu_test.go
b/samples/dubbogo/simple/body/test/pixiu_test.go
new file mode 100644
index 0000000..67469fa
--- /dev/null
+++ b/samples/dubbogo/simple/body/test/pixiu_test.go
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package test
+
+import (
+ "bytes"
+ "net/http"
+ "testing"
+ "time"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+func TestPost(t *testing.T) {
+ var url = "http://localhost:8881/api/v1/test-dubbo/user";
+ data := "{\"id\":\"0003\",\"code\":3,\"name\":\"dubbogo\",\"age\":99}"
+ contentType := "application/json"
+ client := &http.Client{Timeout: 5 * time.Second}
+ resp, err := client.Post(url, contentType, bytes.NewBufferString(data))
+ assert.NoError(t, err)
+ assert.NotNil(t, resp)
+ assert.Equal(t, 200, resp.StatusCode)
+}
diff --git a/start_integrate_test.sh b/start_integrate_test.sh
new file mode 100644
index 0000000..625b653
--- /dev/null
+++ b/start_integrate_test.sh
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+array=("samples/dubbogo/simple/body")
+#array+=("samples/dubbogo/simple/mix")
+#array+=("samples/dubbogo/simple/proxy")
+#array+=("samples/dubbogo/simple/query")
+#array+=("samples/dubbogo/simple/server")
+#array+=("samples/dubbogo/simple/uri")
+
+#http
+
+
+
+for((i=0;i<${#array[*]};i++))
+do
+ ./integrate_test.sh ${array[i]}
+ result=$?
+ if [ $result -gt 0 ]; then
+ exit $result
+ fi
+done
