You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by la...@apache.org on 2021/11/12 08:53:51 UTC
[dubbo-go-samples] branch master updated: Fix: add some samples
(#295)
This is an automated email from the ASF dual-hosted git repository.
laurence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/master by this push:
new aed967e Fix: add some samples (#295)
aed967e is described below
commit aed967ecb5991d8cca55b135970e42e0c30b44a6
Author: Laurence <45...@users.noreply.github.com>
AuthorDate: Fri Nov 12 16:53:46 2021 +0800
Fix: add some samples (#295)
* Fix: add some samples
* fix: fmt
* Fix: update tag
---
.run/error-triple-hessian-client.run.xml | 14 +++++++
.run/error-triple-hessian-server.run.xml | 14 +++++++
.run/error-triple-pb-client.run.xml | 14 +++++++
.run/error-triple-pb-server.run.xml | 14 +++++++
api/generate.sh | 2 +-
api/samples_api.pb.go | 9 +++-
api/samples_api_triple.pb.go | 17 ++++++--
context/triple/go-client/cmd/client.go | 12 ++++--
context/triple/go-server/cmd/server.go | 24 +++++++++--
.../triple/hessian2}/go-client/cmd/client.go | 48 ++++++++++------------
.../hessian2/go-client/cmd/error_response.go | 25 +++++------
error/triple/hessian2/go-client/conf/dubbogo.yml | 12 ++++++
.../hessian2/go-server/cmd/error_response.go | 46 ++++++++-------------
.../triple/hessian2}/go-server/cmd/server.go | 30 ++------------
error/triple/hessian2/go-server/conf/dubbogo.yml | 14 +++++++
.../triple/pb}/go-client/cmd/client.go | 24 +++++------
error/triple/pb/go-client/conf/dubbogo.yml | 9 ++++
.../triple/pb/go-server/cmd/error_reponse.go | 27 +++++-------
.../triple/pb}/go-server/cmd/server.go | 26 +++---------
error/triple/pb/go-server/conf/dubbogo.yml | 12 ++++++
filter/custom/go-client/cmd/myfilter.go | 3 ++
filter/custom/go-server/cmd/myfilter.go | 5 +++
generic/default/go-client/cmd/client.go | 2 -
go.mod | 6 +--
go.sum | 14 +++----
.../triple}/tests/integration/main_test.go | 4 +-
.../triple/tests/integration/userprovider_test.go} | 25 +++++++----
.../hessian2}/tests/integration/main_test.go | 10 ++---
.../tests/integration/userprovider_test.go | 15 ++++---
.../triple/pb}/tests/integration/main_test.go | 4 +-
.../pb/tests/integration/userprovider_test.go} | 22 +++++-----
.../default/tests/integration/userprovider_test.go | 1 -
.../registry/nacos/tests/integration/main_test.go | 6 +++
.../nacos/tests/integration/userprovider_test.go | 9 ++++
.../zookeeper/tests/integration/helloworld_test.go | 15 +++++++
.../zookeeper/tests/integration/main_test.go | 6 +++
.../codec-extension/tests/integration/codec.go | 3 +-
registry/nacos/go-client/cmd/client.go | 14 +++++++
registry/nacos/go-client/conf/dubbogo.yml | 13 ++++--
registry/nacos/go-server/cmd/server.go | 11 +++++
registry/nacos/go-server/conf/dubbogo.yml | 8 +++-
registry/zookeeper/go-client/cmd/client.go | 12 ++++++
registry/zookeeper/go-client/conf/dubbogo.yml | 8 +++-
registry/zookeeper/go-server/cmd/server.go | 10 +++++
registry/zookeeper/go-server/conf/dubbogo.yml | 7 +++-
rpc/triple/codec-extension/codec/codec.go | 3 +-
start_integrate_test.sh | 5 +++
47 files changed, 421 insertions(+), 213 deletions(-)
diff --git a/.run/error-triple-hessian-client.run.xml b/.run/error-triple-hessian-client.run.xml
new file mode 100644
index 0000000..a19c156
--- /dev/null
+++ b/.run/error-triple-hessian-client.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="error-triple-hessian-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="error">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/error/triple/hessian2/go-client/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package value="github.com/apache/dubbo-go-samples/error/triple/hessian2/go-client/cmd" />
+ <directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/rpc/triple/pb/dubbogo-grpc/grpc-client/main.go" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/error-triple-hessian-server.run.xml b/.run/error-triple-hessian-server.run.xml
new file mode 100644
index 0000000..8350dda
--- /dev/null
+++ b/.run/error-triple-hessian-server.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="error-triple-hessian-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="error">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/error/triple/hessian2/go-server/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package value="github.com/apache/dubbo-go-samples/error/triple/hessian2/go-server/cmd" />
+ <directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/rpc/triple/pb/dubbogo-grpc/grpc-server/main.go" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/error-triple-pb-client.run.xml b/.run/error-triple-pb-client.run.xml
new file mode 100644
index 0000000..0cce92f
--- /dev/null
+++ b/.run/error-triple-pb-client.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="error-triple-pb-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="error">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/error/triple/pb/go-client/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package value="github.com/apache/dubbo-go-samples/error/triple/pb/go-client/cmd" />
+ <directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/rpc/triple/pb/dubbogo-grpc/grpc-client/main.go" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/error-triple-pb-server.run.xml b/.run/error-triple-pb-server.run.xml
new file mode 100644
index 0000000..2e03a05
--- /dev/null
+++ b/.run/error-triple-pb-server.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="error-triple-pb-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="error">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/error/triple/pb/go-server/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package value="github.com/apache/dubbo-go-samples/error/triple/pb/go-server/cmd" />
+ <directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/rpc/triple/pb/dubbogo-grpc/grpc-server/main.go" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/api/generate.sh b/api/generate.sh
index 58fcf01..cda223b 100755
--- a/api/generate.sh
+++ b/api/generate.sh
@@ -1,4 +1,4 @@
export GO111MODULE="on"
export GOPROXY="http://goproxy.io"
-go get -u github.com/dubbogo/tools/cmd/protoc-gen-go-triple
+go install github.com/dubbogo/tools/cmd/protoc-gen-go-triple@v1.0.2
protoc --go_out=. --go-triple_out=. samples_api.proto
\ No newline at end of file
diff --git a/api/samples_api.pb.go b/api/samples_api.pb.go
index 2885f95..2c1449e 100644
--- a/api/samples_api.pb.go
+++ b/api/samples_api.pb.go
@@ -24,11 +24,16 @@
package api
import (
+ reflect "reflect"
+ sync "sync"
+)
+
+import (
proto "github.com/golang/protobuf/proto"
+
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
- reflect "reflect"
- sync "sync"
)
const (
diff --git a/api/samples_api_triple.pb.go b/api/samples_api_triple.pb.go
index 50f6402..afa35d0 100644
--- a/api/samples_api_triple.pb.go
+++ b/api/samples_api_triple.pb.go
@@ -17,7 +17,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions:
-// - protoc-gen-go-triple v1.0.1
+// - protoc-gen-go-triple v1.0.2
// - protoc v3.14.0
// source: samples_api.proto
@@ -25,13 +25,19 @@ package api
import (
context "context"
+ fmt "fmt"
+)
+
+import (
protocol "dubbo.apache.org/dubbo-go/v3/protocol"
dubbo3 "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3"
invocation "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
- fmt "fmt"
+
grpc_go "github.com/dubbogo/grpc-go"
codes "github.com/dubbogo/grpc-go/codes"
+ metadata "github.com/dubbogo/grpc-go/metadata"
status "github.com/dubbogo/grpc-go/status"
+
common "github.com/dubbogo/triple/pkg/common"
constant "github.com/dubbogo/triple/pkg/common/constant"
triple "github.com/dubbogo/triple/pkg/triple"
@@ -160,7 +166,12 @@ func _Greeter_SayHello_Handler(srv interface{}, ctx context.Context, dec func(in
base := srv.(dubbo3.Dubbo3GrpcService)
args := []interface{}{}
args = append(args, in)
- invo := invocation.NewRPCInvocation("SayHello", args, nil)
+ md, _ := metadata.FromIncomingContext(ctx)
+ invAttachment := make(map[string]interface{}, len(md))
+ for k, v := range md {
+ invAttachment[k] = v
+ }
+ invo := invocation.NewRPCInvocation("SayHello", args, invAttachment)
if interceptor == nil {
result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
return result, result.Error()
diff --git a/context/triple/go-client/cmd/client.go b/context/triple/go-client/cmd/client.go
index af3601a..afd5c1f 100644
--- a/context/triple/go-client/cmd/client.go
+++ b/context/triple/go-client/cmd/client.go
@@ -22,11 +22,10 @@ import (
)
import (
+ "dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
-
- tripleConstant "github.com/dubbogo/triple/pkg/common/constant"
)
import (
@@ -51,8 +50,13 @@ func main() {
Name: "laurence",
}
ctx := context.Background()
- // set user defined context attachment
- ctx = context.WithValue(ctx, tripleConstant.CtxAttachmentKey, "user-defined-value")
+ // set user defined context attachment, map value can be string or []string, otherwise it is not to be transferred
+ userDefinedValueMap := make(map[string]interface{})
+ userDefinedValueMap["key1"] = "user defined value 1"
+ userDefinedValueMap["key2"] = "user defined value 2"
+ userDefinedValueMap["key3"] = []string{"user defined value 3.1", "user defined value 3.2"}
+ userDefinedValueMap["key4"] = []string{"user defined value 4.1", "user defined value 4.2"}
+ ctx = context.WithValue(ctx, constant.AttachmentKey, userDefinedValueMap)
reply, err := grpcGreeterImpl.SayHello(ctx, req)
if err != nil {
logger.Error(err)
diff --git a/context/triple/go-server/cmd/server.go b/context/triple/go-server/cmd/server.go
index ee4a811..9549945 100644
--- a/context/triple/go-server/cmd/server.go
+++ b/context/triple/go-server/cmd/server.go
@@ -19,14 +19,15 @@ package main
import (
"context"
+ "fmt"
+ "strings"
)
import (
+ "dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
-
- tripleConstant "github.com/dubbogo/triple/pkg/common/constant"
)
import (
@@ -38,9 +39,24 @@ type GreeterProvider struct {
}
func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*api.User, error) {
- logger.Infof("get triple user attachment = %s", ctx.Value(tripleConstant.CtxAttachmentKey))
+ // map must be assert to map[string]interface, because of dubbo limitation
+ attachments := ctx.Value(constant.AttachmentKey).(map[string]interface{})
+
+ // value must be assert to []string[0], because of http2 header limitation
+ logger.Infof("get triple attachment key1 = %s", attachments["key1"].([]string)[0])
+ logger.Infof("get triple attachment key2 = %s", attachments["key2"].([]string)[0])
+ logger.Infof("get triple attachment key3 = %s and %s", attachments["key3"].([]string)[0],
+ attachments["key3"].([]string)[1])
+ logger.Infof("get triple attachment key4 = %s and %s", attachments["key4"].([]string)[0],
+ attachments["key4"].([]string)[1])
logger.Infof("Dubbo3 GreeterProvider get user name = %s\n", in.Name)
- return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
+ rspAttachment := make(map[string]interface{})
+ for k, v := range attachments {
+ if strings.HasPrefix(k, "key") {
+ rspAttachment[k] = v
+ }
+ }
+ return &api.User{Name: fmt.Sprintf("%s", rspAttachment), Id: "12345", Age: 21}, nil
}
func main() {
diff --git a/registry/nacos/go-client/cmd/client.go b/error/triple/hessian2/go-client/cmd/client.go
similarity index 55%
copy from registry/nacos/go-client/cmd/client.go
copy to error/triple/hessian2/go-client/cmd/client.go
index 9e17587..74618e8 100644
--- a/registry/nacos/go-client/cmd/client.go
+++ b/error/triple/hessian2/go-client/cmd/client.go
@@ -19,8 +19,6 @@ package main
import (
"context"
- "os"
- "time"
)
import (
@@ -29,38 +27,36 @@ import (
_ "dubbo.apache.org/dubbo-go/v3/imports"
hessian "github.com/apache/dubbo-go-hessian2"
+
+ tripleCommon "github.com/dubbogo/triple/pkg/common"
)
-type UserProvider struct {
- GetUser func(ctx context.Context, req *User) (rsp *User, err error)
-}
+var errorResponseProvider = new(ErrorResponseProvider)
-type User struct {
- ID string
- Name string
- Age int32
- Time time.Time
-}
-
-func (u *User) JavaClassName() string {
- return "org.apache.dubbo.User"
+func init() {
+ config.SetConsumerService(errorResponseProvider)
+ hessian.RegisterPOJO(&User{})
}
+// need to setup environment variable "CONF_CONSUMER_FILE_PATH" to "conf/client.yml" before run
func main() {
- var userProvider = &UserProvider{}
- config.SetConsumerService(userProvider)
- hessian.RegisterPOJO(&User{})
- err := config.Load()
- if err != nil {
+ if err := config.Load(); err != nil {
panic(err)
}
+ testErrorService()
+ testService()
+}
+
+func testErrorService() {
+ if user, err := errorResponseProvider.GetUser(context.TODO(), &User{Name: "laurence"}); err != nil {
+ logger.Infof("response result: %v, error = %s", user, err)
+ logger.Infof("error details = %+v", err.(tripleCommon.TripleError).Stacks())
+ }
+}
- logger.Infof("\n\n\nstart to test dubbo")
- user, err := userProvider.GetUser(context.TODO(), &User{Name: "Alex001"})
- if err != nil {
- logger.Errorf("error: %v\n", err)
- os.Exit(1)
- return
+func testService() {
+ if user, err := errorResponseProvider.GetUserWithoutError(context.TODO(), &User{Name: "laurence"}); err != nil {
+ logger.Infof("response result: %v, error = %s", user, err)
+ logger.Infof("error details = %+v", err.(tripleCommon.TripleError).Stacks())
}
- logger.Infof("response result: %v\n", user)
}
diff --git a/integrate_test/registry/nacos/tests/integration/userprovider_test.go b/error/triple/hessian2/go-client/cmd/error_response.go
similarity index 70%
copy from integrate_test/registry/nacos/tests/integration/userprovider_test.go
copy to error/triple/hessian2/go-client/cmd/error_response.go
index fbb9061..13691b2 100644
--- a/integrate_test/registry/nacos/tests/integration/userprovider_test.go
+++ b/error/triple/hessian2/go-client/cmd/error_response.go
@@ -15,22 +15,23 @@
* limitations under the License.
*/
-package integration
+package main
import (
"context"
- "testing"
)
-import (
- "github.com/stretchr/testify/assert"
-)
+type User struct {
+ Id string
+ Name string
+ Age int32
+}
+
+type ErrorResponseProvider struct {
+ GetUser func(ctx context.Context, req *User) (*User, error)
+ GetUserWithoutError func(ctx context.Context, req *User) (*User, error)
+}
-func TestGetUser(t *testing.T) {
- user, err := userProvider.GetUser(context.TODO(), &User{ID: "A001"})
- assert.Nil(t, err)
- assert.Equal(t, "A001", user.ID)
- assert.Equal(t, "Alex Stocks", user.Name)
- assert.Equal(t, int32(18), user.Age)
- assert.NotNil(t, user.Time)
+func (u *User) JavaClassName() string {
+ return "com.apache.dubbo.sample.basic.User"
}
diff --git a/error/triple/hessian2/go-client/conf/dubbogo.yml b/error/triple/hessian2/go-client/conf/dubbogo.yml
new file mode 100644
index 0000000..3a33c73
--- /dev/null
+++ b/error/triple/hessian2/go-client/conf/dubbogo.yml
@@ -0,0 +1,12 @@
+dubbo:
+ registries:
+ demoZK:
+ protocol: zookeeper
+ timeout: 3s
+ address: 127.0.0.1:2181
+ consumer:
+ references:
+ ErrorResponseProvider:
+ protocol: tri
+ serialization: hessian2
+ interface: com.apache.dubbo.sample.basic.ErrorResponseProvider # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/registry/nacos/go-client/cmd/client.go b/error/triple/hessian2/go-server/cmd/error_response.go
similarity index 58%
copy from registry/nacos/go-client/cmd/client.go
copy to error/triple/hessian2/go-server/cmd/error_response.go
index 9e17587..d95d204 100644
--- a/registry/nacos/go-client/cmd/client.go
+++ b/error/triple/hessian2/go-server/cmd/error_response.go
@@ -19,48 +19,38 @@ package main
import (
"context"
- "os"
- "time"
)
import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
- "dubbo.apache.org/dubbo-go/v3/config"
- _ "dubbo.apache.org/dubbo-go/v3/imports"
- hessian "github.com/apache/dubbo-go-hessian2"
+ "github.com/pkg/errors"
)
-type UserProvider struct {
- GetUser func(ctx context.Context, req *User) (rsp *User, err error)
-}
-
type User struct {
- ID string
+ Id string
Name string
Age int32
- Time time.Time
}
func (u *User) JavaClassName() string {
- return "org.apache.dubbo.User"
+ return "com.apache.dubbo.sample.basic.User"
}
-func main() {
- var userProvider = &UserProvider{}
- config.SetConsumerService(userProvider)
- hessian.RegisterPOJO(&User{})
- err := config.Load()
- if err != nil {
- panic(err)
- }
+type ErrorResponseProvider struct {
+}
+
+func (u *ErrorResponseProvider) GetUser(ctx context.Context, usr *User) (*User, error) {
+ logger.Infof("req:%#v", usr)
+ rsp := User{"12345", "Hello " + usr.Name, 18}
+ myError := errors.Errorf("user defined error")
+ logger.Infof("rsp:%#v, err = %s", rsp, myError)
+ return &rsp, myError
+}
- logger.Infof("\n\n\nstart to test dubbo")
- user, err := userProvider.GetUser(context.TODO(), &User{Name: "Alex001"})
- if err != nil {
- logger.Errorf("error: %v\n", err)
- os.Exit(1)
- return
- }
- logger.Infof("response result: %v\n", user)
+func (u *ErrorResponseProvider) GetUserWithoutError(ctx context.Context, usr *User) (*User, error) {
+ logger.Infof("req:%#v", usr)
+ rsp := User{"12345", "Hello " + usr.Name, 18}
+ logger.Infof("rsp:%#v, err = %s", rsp, nil)
+ return &rsp, nil
}
diff --git a/registry/nacos/go-server/cmd/server.go b/error/triple/hessian2/go-server/cmd/server.go
similarity index 76%
copy from registry/nacos/go-server/cmd/server.go
copy to error/triple/hessian2/go-server/cmd/server.go
index 35d9294..5af19b7 100644
--- a/registry/nacos/go-server/cmd/server.go
+++ b/error/triple/hessian2/go-server/cmd/server.go
@@ -18,7 +18,6 @@
package main
import (
- "context"
"fmt"
"os"
"os/signal"
@@ -35,42 +34,20 @@ import (
)
var (
- survivalTimeout = int(3e9)
+ survivalTimeout = int(3 * time.Second)
)
func init() {
- config.SetProviderService(&UserProvider{})
// ------for hessian2------
hessian.RegisterPOJO(&User{})
+ config.SetProviderService(&ErrorResponseProvider{})
}
-type User struct {
- ID string
- Name string
- Age int32
- Time time.Time
-}
-
-type UserProvider struct {
-}
-
-func (u *UserProvider) GetUser(ctx context.Context, req *User) (*User, error) {
- logger.Infof("req:%#v", req)
- rsp := User{"A001", "Alex Stocks", 18, time.Now()}
- logger.Infof("rsp:%#v", rsp)
- return &rsp, nil
-}
-
-func (u *User) JavaClassName() string {
- return "org.apache.dubbo.User"
-}
-
-// need to setup environment variable "CONF_PROVIDER_FILE_PATH" to "conf/server.yml" before run
+// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/rpc/triple/hessian2/go-server/conf/dubbogo.yml
func main() {
if err := config.Load(); err != nil {
panic(err)
}
-
initSignal()
}
@@ -85,6 +62,7 @@ func initSignal() {
case syscall.SIGHUP:
// reload()
default:
+ time.Sleep(time.Second * 5)
time.AfterFunc(time.Duration(survivalTimeout), func() {
logger.Warnf("app exit now by force...")
os.Exit(1)
diff --git a/error/triple/hessian2/go-server/conf/dubbogo.yml b/error/triple/hessian2/go-server/conf/dubbogo.yml
new file mode 100644
index 0000000..ce0ab31
--- /dev/null
+++ b/error/triple/hessian2/go-server/conf/dubbogo.yml
@@ -0,0 +1,14 @@
+dubbo:
+ registries:
+ demoZK:
+ protocol: zookeeper
+ address: 127.0.0.1:2181
+ protocols:
+ triple:
+ name: tri
+ port: 20000
+ provider:
+ services:
+ ErrorResponseProvider:
+ serialization: hessian2
+ interface: com.apache.dubbo.sample.basic.ErrorResponseProvider # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/registry/zookeeper/go-client/cmd/client.go b/error/triple/pb/go-client/cmd/client.go
similarity index 63%
copy from registry/zookeeper/go-client/cmd/client.go
copy to error/triple/pb/go-client/cmd/client.go
index f3731c2..2ae3ee4 100644
--- a/registry/zookeeper/go-client/cmd/client.go
+++ b/error/triple/pb/go-client/cmd/client.go
@@ -25,32 +25,32 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
+
+ tripleCommon "github.com/dubbogo/triple/pkg/common"
)
import (
- "github.com/apache/dubbo-go-samples/api"
+ triplepb "github.com/apache/dubbo-go-samples/api"
)
-var grpcGreeterImpl = new(api.GreeterClientImpl)
+var greeterProvider = new(triplepb.GreeterClientImpl)
func init() {
- config.SetConsumerService(grpcGreeterImpl)
+ config.SetConsumerService(greeterProvider)
}
-// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml if needed
+// export DUBBO_GO_CONFIG_PATH=$PATH_TO_SAMPLES/rpc/triple/pb/dubbogo-grpc/stream-client/go-client/conf/dubbogo.yml
func main() {
- path := "./registry/zookeeper/go-client/conf/dubbogo.yml"
- if err := config.Load(config.WithPath(path)); err != nil {
+ if err := config.Load(); err != nil {
panic(err)
}
- logger.Info("start to test dubbo")
- req := &api.HelloRequest{
+ req := triplepb.HelloRequest{
Name: "laurence",
}
- reply, err := grpcGreeterImpl.SayHello(context.Background(), req)
- if err != nil {
- logger.Error(err)
+
+ if user, err := greeterProvider.SayHello(context.TODO(), &req); err != nil {
+ logger.Infof("response result: %v, error = %s", user, err)
+ logger.Infof("error details = %+v", err.(tripleCommon.TripleError).Stacks())
}
- logger.Infof("client response result: %v\n", reply)
}
diff --git a/error/triple/pb/go-client/conf/dubbogo.yml b/error/triple/pb/go-client/conf/dubbogo.yml
new file mode 100644
index 0000000..aef6529
--- /dev/null
+++ b/error/triple/pb/go-client/conf/dubbogo.yml
@@ -0,0 +1,9 @@
+dubbo:
+ registries:
+ zk:
+ address: zookeeper://127.0.0.1:2181
+ consumer:
+ references:
+ GreeterClientImpl:
+ protocol: tri
+ interface: org.apache.dubbo.demo.Greeter
\ No newline at end of file
diff --git a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go b/error/triple/pb/go-server/cmd/error_reponse.go
similarity index 63%
copy from integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
copy to error/triple/pb/go-server/cmd/error_reponse.go
index 0a186a4..a77d7ec 100644
--- a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
+++ b/error/triple/pb/go-server/cmd/error_reponse.go
@@ -15,32 +15,27 @@
* limitations under the License.
*/
-package integration
+package main
import (
"context"
- "testing"
)
import (
- "github.com/stretchr/testify/assert"
+ "dubbo.apache.org/dubbo-go/v3/common/logger"
+
+ "github.com/pkg/errors"
)
import (
- dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ triplepb "github.com/apache/dubbo-go-samples/api"
)
-func TestSayHello(t *testing.T) {
- req := &dubbo3pb.HelloRequest{
- Name: "laurence",
- }
-
- ctx := context.Background()
-
- reply, err := greeterProvider.SayHello(ctx, req)
+type ErrorResponseProvider struct {
+ triplepb.UnimplementedGreeterServer
+}
- assert.Nil(t, err)
- assert.Equal(t, "Hello laurence", reply.Name)
- assert.Equal(t, "12345", reply.Id)
- assert.Equal(t, int32(21), reply.Age)
+func (s *ErrorResponseProvider) SayHello(ctx context.Context, in *triplepb.HelloRequest) (*triplepb.User, error) {
+ logger.Infof("Dubbo3 GreeterProvider get user name = %s\n" + in.Name)
+ return &triplepb.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, errors.New("user defined error")
}
diff --git a/registry/zookeeper/go-server/cmd/server.go b/error/triple/pb/go-server/cmd/server.go
similarity index 74%
copy from registry/zookeeper/go-server/cmd/server.go
copy to error/triple/pb/go-server/cmd/server.go
index 5783e67..52cb829 100644
--- a/registry/zookeeper/go-server/cmd/server.go
+++ b/error/triple/pb/go-server/cmd/server.go
@@ -18,7 +18,6 @@
package main
import (
- "context"
"fmt"
"os"
"os/signal"
@@ -30,34 +29,20 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
-)
-import (
- "github.com/apache/dubbo-go-samples/api"
+ _ "github.com/dubbogo/triple/pkg/triple"
)
var (
- survivalTimeout = int(3e9)
+ survivalTimeout = int(3 * time.Second)
)
-type GreeterProvider struct {
- api.UnimplementedGreeterServer
-}
-
-func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*api.User, error) {
- logger.Infof("Dubbo3 GreeterProvider get user name = %s\n", in.Name)
- return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
-}
-
+// export DUBBO_GO_CONFIG_PATH=$PATH_TO_SAMPLES/rpc/triple/pb/dubbogo-grpc/server/dubbogo-server/conf/dubbogo.yml
func main() {
- config.SetProviderService(&GreeterProvider{})
-
- path := "./registry/zookeeper/go-server/conf/dubbogo.yml"
-
- if err := config.Load(config.WithPath(path)); err != nil {
+ config.SetProviderService(&ErrorResponseProvider{})
+ if err := config.Load(); err != nil {
panic(err)
}
-
initSignal()
}
@@ -72,6 +57,7 @@ func initSignal() {
case syscall.SIGHUP:
// reload()
default:
+ time.Sleep(time.Second * 5)
time.AfterFunc(time.Duration(survivalTimeout), func() {
logger.Warnf("app exit now by force...")
os.Exit(1)
diff --git a/error/triple/pb/go-server/conf/dubbogo.yml b/error/triple/pb/go-server/conf/dubbogo.yml
new file mode 100644
index 0000000..fd01a0c
--- /dev/null
+++ b/error/triple/pb/go-server/conf/dubbogo.yml
@@ -0,0 +1,12 @@
+dubbo:
+ registries:
+ zk:
+ address: zookeeper://127.0.0.1:2181
+ protocols:
+ triple:
+ name: tri
+ port: 20000
+ provider:
+ services:
+ ErrorResponseProvider:
+ interface: org.apache.dubbo.demo.Greeter
\ No newline at end of file
diff --git a/filter/custom/go-client/cmd/myfilter.go b/filter/custom/go-client/cmd/myfilter.go
index a3f59e0..3151475 100644
--- a/filter/custom/go-client/cmd/myfilter.go
+++ b/filter/custom/go-client/cmd/myfilter.go
@@ -41,9 +41,12 @@ type MyClientFilter struct {
func (f *MyClientFilter) Invoke(ctx context.Context, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
fmt.Println("MyClientFilter Invoke is called, method Name = ", invocation.MethodName())
+ invocation.SetAttachments("request-key1", "request-value1")
+ invocation.SetAttachments("request-key2", []string{"request-value2.1", "request-value2.2"})
return invoker.Invoke(ctx, invocation)
}
func (f *MyClientFilter) OnResponse(ctx context.Context, result protocol.Result, invoker protocol.Invoker, protocol protocol.Invocation) protocol.Result {
fmt.Println("MyClientFilter OnResponse is called")
+ fmt.Println("result attachment = ", result.Attachments())
return result
}
diff --git a/filter/custom/go-server/cmd/myfilter.go b/filter/custom/go-server/cmd/myfilter.go
index 261884a..b047275 100644
--- a/filter/custom/go-server/cmd/myfilter.go
+++ b/filter/custom/go-server/cmd/myfilter.go
@@ -41,9 +41,14 @@ type MyServerFilter struct {
func (f *MyServerFilter) Invoke(ctx context.Context, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
fmt.Println("MyServerFilter Invoke is called, method Name = ", invocation.MethodName())
+ fmt.Printf("request attachments = %s\n", invocation.Attachments())
return invoker.Invoke(ctx, invocation)
}
func (f *MyServerFilter) OnResponse(ctx context.Context, result protocol.Result, invoker protocol.Invoker, protocol protocol.Invocation) protocol.Result {
fmt.Println("MyServerFilter OnResponse is called")
+ myAttachmentMap := make(map[string]interface{})
+ myAttachmentMap["key1"] = "value1"
+ myAttachmentMap["key2"] = []string{"value1", "value2"}
+ result.SetAttachments(myAttachmentMap)
return result
}
diff --git a/generic/default/go-client/cmd/client.go b/generic/default/go-client/cmd/client.go
index 1061bac..0416c25 100644
--- a/generic/default/go-client/cmd/client.go
+++ b/generic/default/go-client/cmd/client.go
@@ -22,11 +22,9 @@ import (
"time"
)
-// nolint
import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
- // nolint
"dubbo.apache.org/dubbo-go/v3/config/generic"
_ "dubbo.apache.org/dubbo-go/v3/imports"
"dubbo.apache.org/dubbo-go/v3/protocol/dubbo"
diff --git a/go.mod b/go.mod
index 920840a..f66bacf 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,11 @@
module github.com/apache/dubbo-go-samples
require (
- dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211109121610-2ebc38bed562
+ dubbo.apache.org/dubbo-go/v3 v3.0.0-rc4-1
github.com/apache/dubbo-go-hessian2 v1.9.4-0.20210917102639-74a8ece5f3cb
github.com/dubbogo/gost v1.11.19
- github.com/dubbogo/grpc-go v1.42.4-triple
- github.com/dubbogo/triple v1.1.2
+ github.com/dubbogo/grpc-go v1.42.5-triple
+ github.com/dubbogo/triple v1.1.3
github.com/golang/protobuf v1.5.2
github.com/opentracing/opentracing-go v1.2.0
github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5
diff --git a/go.sum b/go.sum
index c789454..6dfa2eb 100644
--- a/go.sum
+++ b/go.sum
@@ -34,8 +34,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
contrib.go.opencensus.io/exporter/prometheus v0.4.0 h1:0QfIkj9z/iVZgK31D9H9ohjjIDApI2GOPScCKwxedbs=
contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211109121610-2ebc38bed562 h1:+vuEbhMZtBSGsQ+iP0lJIwBO94ZINqNEELopDWyqaa4=
-dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211109121610-2ebc38bed562/go.mod h1:0d5jvZPxUJTLL4FlnL11yydXwX0lAthj+VAopu+kZqE=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-rc4-1 h1:vfe836CEwoG5riqdOfAZnbK8jQRKJ9Rr97AC3ID2Rnk=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-rc4-1/go.mod h1:nk5n161RX1hycUaLsLgZi7Gar41J+4srY4ysp0yW2PI=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
@@ -181,13 +181,13 @@ github.com/dubbogo/gost v1.11.12/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZT
github.com/dubbogo/gost v1.11.18/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
github.com/dubbogo/gost v1.11.19 h1:R1rZ3TNJKV9W5XHLMv+GDO2Wy6UDnwGQtVWbsWYvo0A=
github.com/dubbogo/gost v1.11.19/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
-github.com/dubbogo/grpc-go v1.42.4-triple h1:ysiabUrEGcaeXgnjSBT0bB1M7EexSJFiO0Mebg/Iqa4=
-github.com/dubbogo/grpc-go v1.42.4-triple/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovPzLkk6zHM=
+github.com/dubbogo/grpc-go v1.42.5-triple h1:Ed5z/ikkpdZHBMA4mTEthQFTQeKlHtkdAsQrZjTbFk8=
+github.com/dubbogo/grpc-go v1.42.5-triple/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovPzLkk6zHM=
github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU=
github.com/dubbogo/net v0.0.4/go.mod h1:1CGOnM7X3he+qgGNqjeADuE5vKZQx/eMSeUkpU3ujIc=
github.com/dubbogo/triple v1.0.9/go.mod h1:1t9me4j4CTvNDcsMZy6/OGarbRyAUSY0tFXGXHCp7Iw=
-github.com/dubbogo/triple v1.1.2 h1:7lmQ0uNvcIYlMj5gNwPQadFx8w8UDEtcYl4DL6X+idM=
-github.com/dubbogo/triple v1.1.2/go.mod h1:x+H41M5yP1ULnJu4b+o8VrgsIKdTPslTum2yUqA9N1I=
+github.com/dubbogo/triple v1.1.3 h1:XKSh42lE2HLud++g4Fif7XY2hSMEsohFpegZPvsNXVQ=
+github.com/dubbogo/triple v1.1.3/go.mod h1:suMeAfZliq0p/lWIytgEdiuKcRlmeJC9pYeNHVE7FWU=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -587,11 +587,9 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU=
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
diff --git a/integrate_test/registry/zookeeper/tests/integration/main_test.go b/integrate_test/context/triple/tests/integration/main_test.go
similarity index 91%
copy from integrate_test/registry/zookeeper/tests/integration/main_test.go
copy to integrate_test/context/triple/tests/integration/main_test.go
index b2ce294..b19c54e 100644
--- a/integrate_test/registry/zookeeper/tests/integration/main_test.go
+++ b/integrate_test/context/triple/tests/integration/main_test.go
@@ -28,10 +28,10 @@ import (
)
import (
- dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ triplepb "github.com/apache/dubbo-go-samples/api"
)
-var greeterProvider = &dubbo3pb.GreeterClientImpl{}
+var greeterProvider = new(triplepb.GreeterClientImpl)
func TestMain(m *testing.M) {
config.SetConsumerService(greeterProvider)
diff --git a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go b/integrate_test/context/triple/tests/integration/userprovider_test.go
similarity index 51%
copy from integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
copy to integrate_test/context/triple/tests/integration/userprovider_test.go
index 0a186a4..647e240 100644
--- a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
+++ b/integrate_test/context/triple/tests/integration/userprovider_test.go
@@ -23,24 +23,33 @@ import (
)
import (
+ "dubbo.apache.org/dubbo-go/v3/common/constant"
+
"github.com/stretchr/testify/assert"
)
import (
- dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ triplepb "github.com/apache/dubbo-go-samples/api"
)
func TestSayHello(t *testing.T) {
- req := &dubbo3pb.HelloRequest{
+ ctx := context.Background()
+ // set user defined context attachment, map value can be string or []string, otherwise it is not to be transferred
+ userDefinedValueMap := make(map[string]interface{})
+ userDefinedValueMap["key1"] = "user defined value 1"
+ userDefinedValueMap["key2"] = "user defined value 2"
+ userDefinedValueMap["key3"] = []string{"user defined value 3.1", "user defined value 3.2"}
+ userDefinedValueMap["key4"] = []string{"user defined value 4.1", "user defined value 4.2"}
+ ctx = context.WithValue(ctx, constant.AttachmentKey, userDefinedValueMap)
+
+ req := triplepb.HelloRequest{
Name: "laurence",
}
- ctx := context.Background()
-
- reply, err := greeterProvider.SayHello(ctx, req)
+ user, err := greeterProvider.SayHello(ctx, &req)
assert.Nil(t, err)
- assert.Equal(t, "Hello laurence", reply.Name)
- assert.Equal(t, "12345", reply.Id)
- assert.Equal(t, int32(21), reply.Age)
+ assert.Equal(t, "map[key1:[user defined value 1] key2:[user defined value 2] key3:[user defined value 3.1 user defined value 3.2] key4:[user defined value 4.1 user defined value 4.2]]", user.Name)
+ assert.Equal(t, "12345", user.Id)
+ assert.Equal(t, int32(21), user.Age)
}
diff --git a/integrate_test/registry/nacos/tests/integration/main_test.go b/integrate_test/error/triple/hessian2/tests/integration/main_test.go
similarity index 87%
copy from integrate_test/registry/nacos/tests/integration/main_test.go
copy to integrate_test/error/triple/hessian2/tests/integration/main_test.go
index db24576..177d2a3 100644
--- a/integrate_test/registry/nacos/tests/integration/main_test.go
+++ b/integrate_test/error/triple/hessian2/tests/integration/main_test.go
@@ -21,7 +21,6 @@ import (
"context"
"os"
"testing"
- "time"
)
import (
@@ -31,7 +30,7 @@ import (
hessian "github.com/apache/dubbo-go-hessian2"
)
-var userProvider = &UserProvider{}
+var userProvider = new(ErrorResponseProvider)
func TestMain(m *testing.M) {
config.SetConsumerService(userProvider)
@@ -47,13 +46,12 @@ type User struct {
ID string
Name string
Age int32
- Time time.Time
}
-type UserProvider struct {
- GetUser func(ctx context.Context, req *User) (rsp *User, err error)
+type ErrorResponseProvider struct {
+ GetUser func(ctx context.Context, usr *User) (*User, error)
}
func (u *User) JavaClassName() string {
- return "org.apache.dubbo.User"
+ return "com.apache.dubbo.sample.basic.User"
}
diff --git a/integrate_test/registry/nacos/tests/integration/userprovider_test.go b/integrate_test/error/triple/hessian2/tests/integration/userprovider_test.go
similarity index 75%
copy from integrate_test/registry/nacos/tests/integration/userprovider_test.go
copy to integrate_test/error/triple/hessian2/tests/integration/userprovider_test.go
index fbb9061..faffaf7 100644
--- a/integrate_test/registry/nacos/tests/integration/userprovider_test.go
+++ b/integrate_test/error/triple/hessian2/tests/integration/userprovider_test.go
@@ -19,18 +19,21 @@ package integration
import (
"context"
+ "fmt"
"testing"
)
import (
+ "github.com/dubbogo/triple/pkg/common"
+
"github.com/stretchr/testify/assert"
)
func TestGetUser(t *testing.T) {
- user, err := userProvider.GetUser(context.TODO(), &User{ID: "A001"})
- assert.Nil(t, err)
- assert.Equal(t, "A001", user.ID)
- assert.Equal(t, "Alex Stocks", user.Name)
- assert.Equal(t, int32(18), user.Age)
- assert.NotNil(t, user.Time)
+ _, err := userProvider.GetUser(context.TODO(), &User{Name: "laurence"})
+ assert.NotNil(t, err)
+ assert.Equal(t, "user defined error", fmt.Sprintf("%s", err))
+ stacks, ok := err.(common.TripleError)
+ assert.True(t, ok)
+ assert.NotEqual(t, "", stacks)
}
diff --git a/integrate_test/registry/zookeeper/tests/integration/main_test.go b/integrate_test/error/triple/pb/tests/integration/main_test.go
similarity index 91%
copy from integrate_test/registry/zookeeper/tests/integration/main_test.go
copy to integrate_test/error/triple/pb/tests/integration/main_test.go
index b2ce294..b19c54e 100644
--- a/integrate_test/registry/zookeeper/tests/integration/main_test.go
+++ b/integrate_test/error/triple/pb/tests/integration/main_test.go
@@ -28,10 +28,10 @@ import (
)
import (
- dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ triplepb "github.com/apache/dubbo-go-samples/api"
)
-var greeterProvider = &dubbo3pb.GreeterClientImpl{}
+var greeterProvider = new(triplepb.GreeterClientImpl)
func TestMain(m *testing.M) {
config.SetConsumerService(greeterProvider)
diff --git a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go b/integrate_test/error/triple/pb/tests/integration/userprovider_test.go
similarity index 75%
copy from integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
copy to integrate_test/error/triple/pb/tests/integration/userprovider_test.go
index 0a186a4..a4b0592 100644
--- a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
+++ b/integrate_test/error/triple/pb/tests/integration/userprovider_test.go
@@ -19,28 +19,28 @@ package integration
import (
"context"
+ "fmt"
"testing"
)
import (
+ "github.com/dubbogo/triple/pkg/common"
+
"github.com/stretchr/testify/assert"
)
import (
- dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ triplepb "github.com/apache/dubbo-go-samples/api"
)
func TestSayHello(t *testing.T) {
- req := &dubbo3pb.HelloRequest{
+ ctx := context.Background()
+ req := triplepb.HelloRequest{
Name: "laurence",
}
-
- ctx := context.Background()
-
- reply, err := greeterProvider.SayHello(ctx, req)
-
- assert.Nil(t, err)
- assert.Equal(t, "Hello laurence", reply.Name)
- assert.Equal(t, "12345", reply.Id)
- assert.Equal(t, int32(21), reply.Age)
+ _, err := greeterProvider.SayHello(ctx, &req)
+ assert.Equal(t, "user defined error", fmt.Sprintf("%s", err))
+ stacks, ok := err.(common.TripleError)
+ assert.True(t, ok)
+ assert.NotEqual(t, "", stacks)
}
diff --git a/integrate_test/generic/default/tests/integration/userprovider_test.go b/integrate_test/generic/default/tests/integration/userprovider_test.go
index ff2f31d..0ce0103 100644
--- a/integrate_test/generic/default/tests/integration/userprovider_test.go
+++ b/integrate_test/generic/default/tests/integration/userprovider_test.go
@@ -23,7 +23,6 @@ import (
"time"
)
-// nolint
import (
"dubbo.apache.org/dubbo-go/v3/config/generic"
diff --git a/integrate_test/registry/nacos/tests/integration/main_test.go b/integrate_test/registry/nacos/tests/integration/main_test.go
index db24576..45e5741 100644
--- a/integrate_test/registry/nacos/tests/integration/main_test.go
+++ b/integrate_test/registry/nacos/tests/integration/main_test.go
@@ -31,10 +31,12 @@ import (
hessian "github.com/apache/dubbo-go-hessian2"
)
+var userProviderWithCustomRegistryGroupAndVersion = &UserProviderWithCustomGroupAndVersion{}
var userProvider = &UserProvider{}
func TestMain(m *testing.M) {
config.SetConsumerService(userProvider)
+ config.SetConsumerService(userProviderWithCustomRegistryGroupAndVersion)
hessian.RegisterPOJO(&User{})
if err := config.Load(); err != nil {
panic(err)
@@ -50,6 +52,10 @@ type User struct {
Time time.Time
}
+type UserProviderWithCustomGroupAndVersion struct {
+ GetUser func(ctx context.Context, req *User) (rsp *User, err error)
+}
+
type UserProvider struct {
GetUser func(ctx context.Context, req *User) (rsp *User, err error)
}
diff --git a/integrate_test/registry/nacos/tests/integration/userprovider_test.go b/integrate_test/registry/nacos/tests/integration/userprovider_test.go
index fbb9061..41a23f2 100644
--- a/integrate_test/registry/nacos/tests/integration/userprovider_test.go
+++ b/integrate_test/registry/nacos/tests/integration/userprovider_test.go
@@ -34,3 +34,12 @@ func TestGetUser(t *testing.T) {
assert.Equal(t, int32(18), user.Age)
assert.NotNil(t, user.Time)
}
+
+func TestGetUserWithCustomGroupAndVersion(t *testing.T) {
+ user, err := userProviderWithCustomRegistryGroupAndVersion.GetUser(context.TODO(), &User{ID: "A001"})
+ assert.Nil(t, err)
+ assert.Equal(t, "A001", user.ID)
+ assert.Equal(t, "Alex Stocks from UserProviderWithCustomGroupAndVersion", user.Name)
+ assert.Equal(t, int32(18), user.Age)
+ assert.NotNil(t, user.Time)
+}
diff --git a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go b/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
index 0a186a4..7d06b99 100644
--- a/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
+++ b/integrate_test/registry/zookeeper/tests/integration/helloworld_test.go
@@ -44,3 +44,18 @@ func TestSayHello(t *testing.T) {
assert.Equal(t, "12345", reply.Id)
assert.Equal(t, int32(21), reply.Age)
}
+
+func TestGetUserWithCustomRegistryGroupAndVersion(t *testing.T) {
+ req := &dubbo3pb.HelloRequest{
+ Name: "laurence",
+ }
+
+ ctx := context.Background()
+
+ reply, err := userProviderWithCustomRegistryGroupAndVersion.SayHello(ctx, req)
+
+ assert.Nil(t, err)
+ assert.Equal(t, "Hello laurence from UserProviderWithCustomRegistryGroupAndVersion", reply.Name)
+ assert.Equal(t, "12345", reply.Id)
+ assert.Equal(t, int32(21), reply.Age)
+}
diff --git a/integrate_test/registry/zookeeper/tests/integration/main_test.go b/integrate_test/registry/zookeeper/tests/integration/main_test.go
index b2ce294..f6fdfc4 100644
--- a/integrate_test/registry/zookeeper/tests/integration/main_test.go
+++ b/integrate_test/registry/zookeeper/tests/integration/main_test.go
@@ -32,9 +32,15 @@ import (
)
var greeterProvider = &dubbo3pb.GreeterClientImpl{}
+var userProviderWithCustomRegistryGroupAndVersion = &UserProviderWithCustomGroupAndVersion{GreeterClientImpl: dubbo3pb.GreeterClientImpl{}}
+
+type UserProviderWithCustomGroupAndVersion struct {
+ dubbo3pb.GreeterClientImpl
+}
func TestMain(m *testing.M) {
config.SetConsumerService(greeterProvider)
+ config.SetConsumerService(userProviderWithCustomRegistryGroupAndVersion)
if err := config.Load(); err != nil {
panic(err)
}
diff --git a/integrate_test/rpc/triple/codec-extension/tests/integration/codec.go b/integrate_test/rpc/triple/codec-extension/tests/integration/codec.go
index d340ad7..fbe8164 100644
--- a/integrate_test/rpc/triple/codec-extension/tests/integration/codec.go
+++ b/integrate_test/rpc/triple/codec-extension/tests/integration/codec.go
@@ -19,11 +19,12 @@ package integration
import (
"encoding/json"
- triCommon "github.com/dubbogo/triple/pkg/common"
)
import (
"github.com/dubbogo/grpc-go/encoding"
+
+ triCommon "github.com/dubbogo/triple/pkg/common"
)
func init() {
diff --git a/registry/nacos/go-client/cmd/client.go b/registry/nacos/go-client/cmd/client.go
index 9e17587..5a1b4fc 100644
--- a/registry/nacos/go-client/cmd/client.go
+++ b/registry/nacos/go-client/cmd/client.go
@@ -31,6 +31,10 @@ import (
hessian "github.com/apache/dubbo-go-hessian2"
)
+type UserProviderWithCustomGroupAndVersion struct {
+ GetUser func(ctx context.Context, req *User) (rsp *User, err error)
+}
+
type UserProvider struct {
GetUser func(ctx context.Context, req *User) (rsp *User, err error)
}
@@ -48,7 +52,9 @@ func (u *User) JavaClassName() string {
func main() {
var userProvider = &UserProvider{}
+ var userProviderWithCustomRegistryGroupAndVersion = &UserProviderWithCustomGroupAndVersion{}
config.SetConsumerService(userProvider)
+ config.SetConsumerService(userProviderWithCustomRegistryGroupAndVersion)
hessian.RegisterPOJO(&User{})
err := config.Load()
if err != nil {
@@ -63,4 +69,12 @@ func main() {
return
}
logger.Infof("response result: %v\n", user)
+
+ user, err = userProviderWithCustomRegistryGroupAndVersion.GetUser(context.TODO(), &User{Name: "Alex001"})
+ if err != nil {
+ logger.Errorf("error: %v\n", err)
+ os.Exit(1)
+ return
+ }
+ logger.Infof("response result: %v\n", user)
}
diff --git a/registry/nacos/go-client/conf/dubbogo.yml b/registry/nacos/go-client/conf/dubbogo.yml
index ae5d57b..707f559 100644
--- a/registry/nacos/go-client/conf/dubbogo.yml
+++ b/registry/nacos/go-client/conf/dubbogo.yml
@@ -1,12 +1,17 @@
dubbo:
registries:
- demoNacos:
+ nacosWithCustomGroup:
protocol: nacos
address: 127.0.0.1:8848
- group: myGroup
-# namespace: 9fb00abb-278d-42fc-96bf-e0151601e4a1
+ group: myGroup # default is DEFAULT_GROUP
+# namespace: 9fb00abb-278d-42fc-96bf-e0151601e4a1 # default is public
consumer:
references:
UserProvider:
protocol: dubbo
- interface: org.apache.dubbo.UserProvider.Test
\ No newline at end of file
+ interface: org.apache.dubbo.UserProvider.Test
+ UserProviderWithCustomGroupAndVersion:
+ protocol: dubbo
+ interface: org.apache.dubbo.UserProvider.Test2
+ group: myInterfaceGroup # dubbo interface group must be same with server
+ version: myInterfaceVersion # dubbo interface version must be same with server
\ No newline at end of file
diff --git a/registry/nacos/go-server/cmd/server.go b/registry/nacos/go-server/cmd/server.go
index 35d9294..1da04ab 100644
--- a/registry/nacos/go-server/cmd/server.go
+++ b/registry/nacos/go-server/cmd/server.go
@@ -40,6 +40,7 @@ var (
func init() {
config.SetProviderService(&UserProvider{})
+ config.SetProviderService(&UserProviderWithCustomGroupAndVersion{})
// ------for hessian2------
hessian.RegisterPOJO(&User{})
}
@@ -65,6 +66,16 @@ func (u *User) JavaClassName() string {
return "org.apache.dubbo.User"
}
+type UserProviderWithCustomGroupAndVersion struct {
+}
+
+func (u *UserProviderWithCustomGroupAndVersion) GetUser(ctx context.Context, req *User) (*User, error) {
+ logger.Infof("req:%#v", req)
+ rsp := User{"A001", "Alex Stocks from UserProviderWithCustomGroupAndVersion", 18, time.Now()}
+ logger.Infof("rsp:%#v", rsp)
+ return &rsp, nil
+}
+
// need to setup environment variable "CONF_PROVIDER_FILE_PATH" to "conf/server.yml" before run
func main() {
if err := config.Load(); err != nil {
diff --git a/registry/nacos/go-server/conf/dubbogo.yml b/registry/nacos/go-server/conf/dubbogo.yml
index 1d34a6c..446f5e3 100644
--- a/registry/nacos/go-server/conf/dubbogo.yml
+++ b/registry/nacos/go-server/conf/dubbogo.yml
@@ -8,7 +8,7 @@ dubbo:
version: myversion # metadata: app.version=myversion
environment: pro # metadata: environment=pro
registries:
- demoNacos:
+ nacosWithCustomGroup:
protocol: nacos
address: 127.0.0.1:8848
group: myGroup # nacos group, default is DEFAULT_GROUP
@@ -20,4 +20,8 @@ dubbo:
provider:
services:
UserProvider:
- interface: org.apache.dubbo.UserProvider.Test
\ No newline at end of file
+ interface: org.apache.dubbo.UserProvider.Test
+ UserProviderWithCustomGroupAndVersion:
+ interface: org.apache.dubbo.UserProvider.Test2
+ version: myInterfaceVersion # dubbo interface version must be same with client
+ group: myInterfaceGroup # dubbo interface group must be same with client
\ No newline at end of file
diff --git a/registry/zookeeper/go-client/cmd/client.go b/registry/zookeeper/go-client/cmd/client.go
index f3731c2..0a26bb2 100644
--- a/registry/zookeeper/go-client/cmd/client.go
+++ b/registry/zookeeper/go-client/cmd/client.go
@@ -31,10 +31,16 @@ import (
"github.com/apache/dubbo-go-samples/api"
)
+var grpcGreeterImplWithCustomGroupAndVersion = &UserProviderWithCustomGroupAndVersion{GreeterClientImpl: api.GreeterClientImpl{}}
var grpcGreeterImpl = new(api.GreeterClientImpl)
+type UserProviderWithCustomGroupAndVersion struct {
+ api.GreeterClientImpl
+}
+
func init() {
config.SetConsumerService(grpcGreeterImpl)
+ config.SetConsumerService(grpcGreeterImplWithCustomGroupAndVersion)
}
// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml if needed
@@ -53,4 +59,10 @@ func main() {
logger.Error(err)
}
logger.Infof("client response result: %v\n", reply)
+
+ reply, err = grpcGreeterImplWithCustomGroupAndVersion.SayHello(context.Background(), req)
+ if err != nil {
+ logger.Error(err)
+ }
+ logger.Infof("client response result: %v\n", reply)
}
diff --git a/registry/zookeeper/go-client/conf/dubbogo.yml b/registry/zookeeper/go-client/conf/dubbogo.yml
index a005269..d088eb6 100644
--- a/registry/zookeeper/go-client/conf/dubbogo.yml
+++ b/registry/zookeeper/go-client/conf/dubbogo.yml
@@ -4,8 +4,14 @@ dubbo:
protocol: zookeeper
timeout: 3s
address: 127.0.0.1:2181
+ group: myGroup
consumer:
references:
GreeterClientImpl:
protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
+ UserProviderWithCustomGroupAndVersion:
+ protocol: tri
+ interface: com.apache.dubbo.sample.basic.IGreeter2 # must be compatible with grpc or dubbo-java
+ group: myInterfaceGroup # dubbo interface group must be same with server
+ version: myInterfaceVersion # dubbo interface version must be same with server
\ No newline at end of file
diff --git a/registry/zookeeper/go-server/cmd/server.go b/registry/zookeeper/go-server/cmd/server.go
index 5783e67..f0efc1e 100644
--- a/registry/zookeeper/go-server/cmd/server.go
+++ b/registry/zookeeper/go-server/cmd/server.go
@@ -44,6 +44,15 @@ type GreeterProvider struct {
api.UnimplementedGreeterServer
}
+type UserProviderWithCustomGroupAndVersion struct {
+ api.UnimplementedGreeterServer
+}
+
+func (s *UserProviderWithCustomGroupAndVersion) SayHello(ctx context.Context, in *api.HelloRequest) (*api.User, error) {
+ logger.Infof("Dubbo3 GreeterProvider get user name = %s\n", in.Name)
+ return &api.User{Name: "Hello " + in.Name + " from UserProviderWithCustomRegistryGroupAndVersion", Id: "12345", Age: 21}, nil
+}
+
func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*api.User, error) {
logger.Infof("Dubbo3 GreeterProvider get user name = %s\n", in.Name)
return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
@@ -51,6 +60,7 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*
func main() {
config.SetProviderService(&GreeterProvider{})
+ config.SetProviderService(&UserProviderWithCustomGroupAndVersion{})
path := "./registry/zookeeper/go-server/conf/dubbogo.yml"
diff --git a/registry/zookeeper/go-server/conf/dubbogo.yml b/registry/zookeeper/go-server/conf/dubbogo.yml
index cce6e7e..6e57750 100644
--- a/registry/zookeeper/go-server/conf/dubbogo.yml
+++ b/registry/zookeeper/go-server/conf/dubbogo.yml
@@ -4,6 +4,7 @@ dubbo:
protocol: zookeeper
timeout: 3s
address: 127.0.0.1:2181
+ group: myGroup # defualt is dubbo
protocols:
triple:
name: tri
@@ -11,4 +12,8 @@ dubbo:
provider:
services:
GreeterProvider:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
+ UserProviderWithCustomGroupAndVersion:
+ interface: com.apache.dubbo.sample.basic.IGreeter2
+ version: myInterfaceVersion # dubbo interface version must be same with client
+ group: myInterfaceGroup # dubbo interface group must be same with client
\ No newline at end of file
diff --git a/rpc/triple/codec-extension/codec/codec.go b/rpc/triple/codec-extension/codec/codec.go
index d9e7344..a006219 100644
--- a/rpc/triple/codec-extension/codec/codec.go
+++ b/rpc/triple/codec-extension/codec/codec.go
@@ -19,11 +19,12 @@ package codec
import (
"encoding/json"
- triCommon "github.com/dubbogo/triple/pkg/common"
)
import (
"github.com/dubbogo/grpc-go/encoding"
+
+ triCommon "github.com/dubbogo/triple/pkg/common"
)
func init() {
diff --git a/start_integrate_test.sh b/start_integrate_test.sh
index de0034c..4aa75f9 100755
--- a/start_integrate_test.sh
+++ b/start_integrate_test.sh
@@ -22,6 +22,10 @@ array+=("game/go-server-gate")
# route
array=("route/meshroute")
+# error
+array+=("error/triple/hessian2")
+array+=("error/triple/pb")
+
# metrics
array+=("metrics")
@@ -36,6 +40,7 @@ array+=("filter/custom")
# context
array+=("context/dubbo")
+array+=("context/triple")
# config-api
array+=("config-api/rpc/triple")