Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ftr: Add 3.0 metrics basic samples #281

Merged
merged 10 commits into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:
- name: Install go ci lint
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1

# - name: Run Linter
# run: golangci-lint run --timeout=10m -v
- name: Run Linter
run: golangci-lint run --timeout=10m -v

- name: License
run: make -f build/Makefile license
Expand Down
4 changes: 2 additions & 2 deletions .run/filter/filter-tpslimit-client.run.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="filter-tpslimit-client" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="dubbo-go-samples2" />
<configuration default="false" name="filter-tpslimit-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="filter">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
<env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/filter/tpslimit/go-client/conf/dubbogo.yml" />
Expand Down
6 changes: 3 additions & 3 deletions .run/filter/filter-tpslimit-server.run.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="filter-tpslimit-server" type="GoApplicationRunConfiguration" factoryName="Go Application" singleton="false">
<module name="dubbo-go-samples2" />
<configuration default="false" name="filter-tpslimit-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="filter" singleton="true">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
<env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/filter/tpslimit/go-server/conf/dubbogo.yml" />
<env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/../dubbo-go-sample/filter/tpslimit/go-server/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
<package value="github.com/apache/dubbo-go-samples/filter/tpslimit/go-server/cmd" />
Expand Down
14 changes: 14 additions & 0 deletions .run/metrics-client.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="metrics-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="metrics">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
<env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/metrics/go-client/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
<package value="github.com/apache/dubbo-go-samples/metrics/go-client/cmd" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/helloworld/go-client/cmd/client.go" />
<method v="2" />
</configuration>
</component>
14 changes: 14 additions & 0 deletions .run/metrics-go-server.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="metrics-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="metrics">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
<env name="DUBBO_GO_CONFIG_PATH" value="$PROJECT_DIR$/metrics/go-server/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
<package value="github.com/apache/dubbo-go-samples/metrics/go-server/cmd" />
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/helloworld/go-client/cmd/client.go" />
<method v="2" />
</configuration>
</component>
2 changes: 1 addition & 1 deletion .run/route/meshroute/meshroute-go-client.run.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="meshroute-go-client" type="GoApplicationRunConfiguration" factoryName="Go Application">
<configuration default="false" name="meshroute-go-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="router">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion .run/route/meshroute/meshroute-go-server.run.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="meshroute-go-server" type="GoApplicationRunConfiguration" factoryName="Go Application">
<configuration default="false" name="meshroute-go-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="router">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
Expand Down
2 changes: 1 addition & 1 deletion config-api/configcenter/nacos/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
registryIDs:
registry-ids:
- demoZK
references:
GreeterClientImpl:
Expand Down
4 changes: 2 additions & 2 deletions config-api/configcenter/nacos/go-server/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ dubbo:
name: tri
port: 20000
provider:
registryIDs:
registry-ids:
- demoZK
services:
GreeterProvider:
protocolIDs: triple
protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`

type GreeterProvider struct {
Expand Down
5 changes: 4 additions & 1 deletion config-api/configcenter/zookeeper/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:8848
consumer:
registryIDs:
registry-ids:
- demoZK
references:
GreeterClientImpl:
Expand All @@ -54,6 +54,9 @@ func main() {
SetProtocol("zookeeper").
SetAddress("127.0.0.1:2181").
Build().GetDynamicConfiguration()
if err != nil {
panic(err)
}

if err := dynamicConfig.PublishConfig("dubbo-go-samples-configcenter-zookeeper-client", "dubbogo", configCenterZKClientConfig); err != nil {
panic(err)
Expand Down
4 changes: 2 additions & 2 deletions config-api/configcenter/zookeeper/go-server/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ dubbo:
name: tri
port: 20000
provider:
registryIDs:
registry-ids:
- demoZK
services:
GreeterProvider:
protocolIDs: triple
protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`

type GreeterProvider struct {
Expand Down
6 changes: 3 additions & 3 deletions configcenter/apollo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ dubbo:
name: "tri"
port: 20000
provider:
registryIDs:
registry-ids:
- demoZK
services:
"greeterImpl":
protocolIDs: "triple"
protocol-ids: "triple"
interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java
```

Expand All @@ -48,7 +48,7 @@ dubbo:
timeout: "3s"
address: "127.0.0.1:2181"
consumer:
registryIDs:
registry-ids:
- demoZK
references:
"greeterImpl":
Expand Down
6 changes: 3 additions & 3 deletions configcenter/apollo/README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ dubbo:
name: "tri"
port: 20000
provider:
registryIDs:
registry-ids:
- demoZK
services:
"greeterImpl":
protocolIDs: "triple"
protocol-ids: "triple"
interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java
```

Expand All @@ -49,7 +49,7 @@ dubbo:
timeout: "3s"
address: "127.0.0.1:2181"
consumer:
registryIDs:
registry-ids:
- demoZK
references:
"greeterImpl":
Expand Down
4 changes: 3 additions & 1 deletion configcenter/apollo/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ func init() {

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml
func main() {
config.Load()
if err := config.Load(); err != nil {
panic(err)
}

logger.Info("start to test dubbo")
req := &api.HelloRequest{
Expand Down
2 changes: 1 addition & 1 deletion configcenter/apollo/go-server/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func main() {
func initSignal() {
signals := make(chan os.Signal, 1)
// It is not possible to block SIGKILL or syscall.SIGSTOP
signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
for {
sig := <-signals
logger.Infof("get signal %s", sig.String())
Expand Down
4 changes: 3 additions & 1 deletion configcenter/nacos/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ func init() {

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml
func main() {
config.Load()
if err := config.Load(); err != nil {
panic(err)
}

logger.Info("start to test dubbo")
req := &api.HelloRequest{
Expand Down
2 changes: 1 addition & 1 deletion configcenter/nacos/go-client/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dubbo:
# timeout: 3s
# address: 127.0.0.1:2181
# consumer:
# registryIDs:
# registry-ids:
# - demoZK
# references:
# GreeterClientImpl:
Expand Down
2 changes: 1 addition & 1 deletion configcenter/nacos/go-server/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dubbo:
# name: "tri"
# port: 20000
# provider:
# registryIDs:
# registry-ids:
# - demoZK
# services:
# GreeterProvider:
Expand Down
4 changes: 3 additions & 1 deletion configcenter/zookeeper/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ func init() {

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml
func main() {
config.Load()
if err := config.Load(); err != nil {
panic(err)
}

logger.Info("start to test dubbo")
req := &api.HelloRequest{
Expand Down
2 changes: 1 addition & 1 deletion configcenter/zookeeper/go-client/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dubbo:
# timeout: 3s
# address: 127.0.0.1:2181
# consumer:
# registryIDs:
# registry-ids:
# - demoZK
# references:
# GreeterClientImpl:
Expand Down
2 changes: 1 addition & 1 deletion configcenter/zookeeper/go-server/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dubbo:
# name: "tri"
# port: 20000
# provider:
# registryIDs:
# registry-ids:
# - demoZK
# services:
# GreeterProvider:
Expand Down
4 changes: 3 additions & 1 deletion context/dubbo/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ func main() {
var userProvider = &UserProvider{}
config.SetConsumerService(userProvider)
hessian.RegisterPOJO(&ContextContent{})
config.Load()
if err := config.Load(); err != nil {
panic(err)
}
gxlog.CInfo("\n\n\nstart to test dubbo")

atta := make(map[string]interface{})
Expand Down
2 changes: 1 addition & 1 deletion context/dubbo/go-client/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dubbo:
max-msg-len: 1024000
session-name: client
consumer:
registryIDs:
registry-ids:
- demoZK
references:
UserProvider:
Expand Down
2 changes: 1 addition & 1 deletion context/dubbo/go-server/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func main() {
func initSignal() {
signals := make(chan os.Signal, 1)
// It is not possible to block SIGKILL or syscall.SIGSTOP
signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
for {
sig := <-signals
logger.Infof("get signal %s", sig.String())
Expand Down
2 changes: 1 addition & 1 deletion context/dubbo/go-server/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dubbo:
max-msg-len: 1024000
session-name: server
provider:
registryIDs:
registry-ids:
- demoZK
services:
UserProvider:
Expand Down
5 changes: 4 additions & 1 deletion context/triple/go-client/cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ func init() {

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yml
func main() {
config.Load()
err := config.Load()
if err != nil {
panic(err)
}

logger.Info("start to test dubbo")
req := &api.HelloRequest{
Expand Down
2 changes: 1 addition & 1 deletion context/triple/go-client/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
registryIDs:
registry-ids:
- demoZK
references:
GreeterClientImpl:
Expand Down
4 changes: 2 additions & 2 deletions context/triple/go-server/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ dubbo:
name: tri
port: 20000
provider:
registryIDs:
registry-ids:
- demoZK
services:
GreeterProvider:
protocolIDs: triple
protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
6 changes: 3 additions & 3 deletions direct/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Direct example code description:
```yaml
services:
"UserProvider":
registryIDs: "demoZk"
registry-ids: "demoZk"
protocol : "dubbo"
interface : "org.apache.dubbo.UserProvider"
loadbalance: "random"
Expand Down Expand Up @@ -67,7 +67,7 @@ initSignal()
func initSignal() {
signals := make(chan os.Signal, 1)
// It is not possible to block SIGKILL or syscall.SIGSTOP
signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
signal.Notify(signals, os.Interrupt, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
for {
sig := <-signals
logger.Infof("get signal %s", sig.String())
Expand Down Expand Up @@ -112,7 +112,7 @@ application:
environment: "dev"
references:
"UserProvider":
registryIDs: "demoZk"
registry-ids: "demoZk"
protocol: "dubbo"
interface: "org.apache.dubbo.UserProvider"
cluster: "failover"
Expand Down
6 changes: 3 additions & 3 deletions direct/README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
```yaml
services:
"UserProvider":
registryIDs: "demoZk"
registry-ids: "demoZk"
protocol : "dubbo"
interface : "org.apache.dubbo.UserProvider"
loadbalance: "random"
Expand Down Expand Up @@ -70,7 +70,7 @@ initSignal()
func initSignal() {
signals := make(chan os.Signal, 1)
// It is not possible to block SIGKILL or syscall.SIGSTOP
signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
signal.Notify(signals, os.Interrup, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
for {
sig := <-signals
logger.Infof("get signal %s", sig.String())
Expand Down Expand Up @@ -115,7 +115,7 @@ application:
environment: "dev"
references:
"UserProvider":
registryIDs: "demoZk"
registry-ids: "demoZk"
protocol: "dubbo"
interface: "org.apache.dubbo.UserProvider"
cluster: "failover"
Expand Down
2 changes: 1 addition & 1 deletion direct/go-server/conf/dubbogo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dubbo:
provider:
services:
GreeterProvider:
protocolIDs: triple
protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
Loading