(dubbo-go-samples) branch new-triple-samples updated (0ecee7b2 -> 61a49b74)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch new-triple-samples
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
from 0ecee7b2 Merge pull request #639 from
DMwangnima/new-triple-samples-modify_helloworld
new 6e0db77c update helloworld
new f71624b1 update license check
new 553a3e71 update dubbo-go dep
new 2d247f5b update workflow
new 20692002 update helloworld
new 86542343 update workflow
new d014627a replace with skywalking-eye
new c8402b99 update license
new 214a68af ignore license check
new 9465498f quickstart
new 61a49b74 Merge pull request #642 from
chickenlj/new-triple-samples-helloworld
The 732 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/github-actions.yml | 4 +-
.licenserc.yaml| 88 +
.../apache/dubbo/samples/UserProviderTriple.java | 17
go.mod | 3 +-
go.sum | 2 +
helloworld/README.md | 105 ++---
helloworld/README_zh.md| 85 -
helloworld/{client.go => client/main.go} | 2 +-
helloworld/{server.go => server/main.go} | 0
.../dubbo/sample/WrapperArrayClassProvider.java| 17
.../java/org/apache/dubbo/sample/ComplexData.java | 17
.../dubbo/sample/WrapperArrayClassProvider.java| 17
.../sample/WrapperArrayClassProviderImpl.java | 17
.../com/apache/dubbo/sample/basic/ComplexData.java | 17
.../apache/dubbo/sample/basic/ComplexProvider.java | 17
.../java/com/apache/dubbo/sample/basic/User.java | 17
start_integrate_test.sh| 3 -
17 files changed, 280 insertions(+), 148 deletions(-)
create mode 100644 .licenserc.yaml
delete mode 100644 helloworld/README_zh.md
rename helloworld/{client.go => client/main.go} (97%)
rename helloworld/{server.go => server/main.go} (100%)
(dubbo-go-pixiu) branch dependabot/go_modules/github.com/docker/docker-24.0.7incompatible deleted (was c481df6d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/docker/docker-24.0.7incompatible in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git was c481df6d build(deps): bump github.com/docker/docker The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(dubbo-go-pixiu) branch develop updated: build(deps): bump github.com/docker/docker (#587)
This is an automated email from the ASF dual-hosted git repository. baerwang 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 463809cc build(deps): bump github.com/docker/docker (#587) 463809cc is described below commit 463809cc00823b1c784bec7f4005fe3dffa01dce Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Oct 31 10:20:57 2023 +0800 build(deps): bump github.com/docker/docker (#587) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 23.0.0-rc.1+incompatible to 24.0.7+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v23.0.0-rc.1...v24.0.7) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 91548c71..211d1582 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,7 @@ require ( github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v23.0.0-rc.1+incompatible // indirect + github.com/docker/docker v24.0.7+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/eapache/go-resiliency v1.1.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect diff --git a/go.sum b/go.sum index 64fbdf91..731901e3 100644 --- a/go.sum +++ b/go.sum @@ -476,8 +476,8 @@ github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.10+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v23.0.0-rc.1+incompatible h1:Dmn88McWuHc7BSNN1s6RtfhMmt6ZPQAYUEf7FhqpiQI= -github.com/docker/docker v23.0.0-rc.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
(dubbo-go-pixiu) branch dependabot/pip/samples/bookinfo/src/productpage/werkzeug-3.0.1 deleted (was 310a7cb8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/pip/samples/bookinfo/src/productpage/werkzeug-3.0.1 in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git was 310a7cb8 build(deps): bump werkzeug in /samples/bookinfo/src/productpage The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(dubbo-go-pixiu) branch develop updated: build(deps): bump werkzeug in /samples/bookinfo/src/productpage (#586)
This is an automated email from the ASF dual-hosted git repository. mark4z 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 056ac5bf build(deps): bump werkzeug in /samples/bookinfo/src/productpage (#586) 056ac5bf is described below commit 056ac5bf2884fb70480d3f32982a6c1a0a866c77 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Oct 30 23:45:55 2023 +0800 build(deps): bump werkzeug in /samples/bookinfo/src/productpage (#586) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 0.15.5 to 3.0.1. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/0.15.5...3.0.1) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- samples/bookinfo/src/productpage/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/bookinfo/src/productpage/requirements.txt b/samples/bookinfo/src/productpage/requirements.txt index 1e103e70..e478509f 100644 --- a/samples/bookinfo/src/productpage/requirements.txt +++ b/samples/bookinfo/src/productpage/requirements.txt @@ -27,5 +27,5 @@ thrift==0.11.0 tornado==6.3.3 urllib3==1.26.18 visitor==0.1.3 -Werkzeug==0.15.5 +Werkzeug==3.0.1 wrapt==1.11.1
(dubbo-go-pixiu) branch dependabot/go_modules/github.com/docker/docker-24.0.7incompatible created (now c481df6d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/docker/docker-24.0.7incompatible in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git at c481df6d build(deps): bump github.com/docker/docker No new revisions were added by this update.
(dubbo) branch 3.3 updated: Include module dubbo-config-spring6 in jdk17 higher versions
This is an automated email from the ASF dual-hosted git repository. crazyhzm pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/3.3 by this push: new f635de7ba2 Include module dubbo-config-spring6 in jdk17 higher versions f635de7ba2 is described below commit f635de7ba26c7b2d266c9c2cdcc4e982fa5928f9 Author: Sean Yang AuthorDate: Mon Oct 30 19:03:31 2023 +0800 Include module dubbo-config-spring6 in jdk17 higher versions --- dubbo-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index 0274adf042..3e0c748b6b 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -59,7 +59,7 @@ jdk-version-ge-17 -17 +[17,) dubbo-config-spring6
(dubbo) branch 3.3 updated: Fix dubbo-rpc-triple module compile failed (#13283)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new cd35ca829a Fix dubbo-rpc-triple module compile failed (#13283)
cd35ca829a is described below
commit cd35ca829ae74cfcbd27875406ecf9630e1d88fa
Author: huazhongming
AuthorDate: Mon Oct 30 16:16:14 2023 +0800
Fix dubbo-rpc-triple module compile failed (#13283)
* Fix lost dubbo-compiler module
Signed-off-by: crazyhzm
* Fix dubbo-rpc-triple module compile failed
Signed-off-by: crazyhzm
-
Signed-off-by: crazyhzm
---
dubbo-rpc/dubbo-rpc-triple/pom.xml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml
b/dubbo-rpc/dubbo-rpc-triple/pom.xml
index 1c28453239..da116e1449 100644
--- a/dubbo-rpc/dubbo-rpc-triple/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-triple/pom.xml
@@ -91,6 +91,13 @@
dubbo-native
${project.parent.version}
+
+
+org.apache.dubbo
+dubbo-compiler
+${project.parent.version}
+compile
+
(dubbo) branch dependabot/maven/org.codehaus.mojo-license-maven-plugin-2.3.0 created (now e182e7b685)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-license-maven-plugin-2.3.0 in repository https://gitbox.apache.org/repos/asf/dubbo.git at e182e7b685 Bump org.codehaus.mojo:license-maven-plugin from 2.2.0 to 2.3.0 No new revisions were added by this update.
(dubbo) branch dependabot/maven/fabric8_kubernetes_version-6.9.1 created (now 26159c6e68)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/fabric8_kubernetes_version-6.9.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git at 26159c6e68 Bump fabric8_kubernetes_version from 6.9.0 to 6.9.1 No new revisions were added by this update.
(dubbo) branch 3.3 updated: Fix lost dubbo-compiler module (#13278)
This is an automated email from the ASF dual-hosted git repository. crazyhzm pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/3.3 by this push: new 7188a3a5cb Fix lost dubbo-compiler module (#13278) 7188a3a5cb is described below commit 7188a3a5cb59ca1af69097729f271a73dc61c1c7 Author: huazhongming AuthorDate: Mon Oct 30 15:10:55 2023 +0800 Fix lost dubbo-compiler module (#13278) Signed-off-by: crazyhzm --- dubbo-plugin/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml index 3d38c11f9e..bacce976c0 100644 --- a/dubbo-plugin/pom.xml +++ b/dubbo-plugin/pom.xml @@ -37,6 +37,7 @@ dubbo-qos-api dubbo-plugin-cluster-mergeable dubbo-native +dubbo-compiler dubbo-plugin-mock dubbo-plugin-router-script dubbo-plugin-router-mesh
(dubbo-go) branch main updated: refactor: metrics config (#2465)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/main by this push:
new 3d97d4c07 refactor: metrics config (#2465)
3d97d4c07 is described below
commit 3d97d4c07298566c52979891510048ebacd641d3
Author: Wang Guan
AuthorDate: Mon Oct 30 14:39:50 2023 +0800
refactor: metrics config (#2465)
---
config/metric_config.go | 23 +--
config/metric_config_test.go | 2 --
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/config/metric_config.go b/config/metric_config.go
index af41eb853..145200072 100644
--- a/config/metric_config.go
+++ b/config/metric_config.go
@@ -39,10 +39,9 @@ type MetricConfig struct {
Port string`default:"9090" yaml:"port"
json:"port,omitempty" property:"port"`
Path string`default:"/metrics" yaml:"path"
json:"path,omitempty" property:"path"`
Protocol string`default:"prometheus"
yaml:"protocol" json:"protocol,omitempty" property:"protocol"`
- EnableMetadata *bool `default:"true"
yaml:"enable-metadata" json:"enable-metadata,omitempty"
property:"enable-metadata"`
- EnableRegistry *bool `default:"true"
yaml:"enable-registry" json:"enable-registry,omitempty"
property:"enable-registry"`
- EnableConfigCenter *bool `default:"true"
yaml:"enable-config-center" json:"enable-config-center,omitempty"
property:"enable-config-center"`
- EnableRpc *bool `default:"true" yaml:"enable-rpc"
json:"enable-rpc,omitempty" property:"enable-rpc"`
+ EnableMetadata *bool `default:"false"
yaml:"enable-metadata" json:"enable-metadata,omitempty"
property:"enable-metadata"`
+ EnableRegistry *bool `default:"false"
yaml:"enable-registry" json:"enable-registry,omitempty"
property:"enable-registry"`
+ EnableConfigCenter *bool `default:"false"
yaml:"enable-config-center" json:"enable-config-center,omitempty"
property:"enable-config-center"`
Prometheus *PrometheusConfig `yaml:"prometheus"
json:"prometheus" property:"prometheus"`
Aggregation*AggregateConfig `yaml:"aggregation"
json:"aggregation" property:"aggregation"`
rootConfig *RootConfig
@@ -60,7 +59,7 @@ type PrometheusConfig struct {
}
type Exporter struct {
- Enabled *bool `default:"false" yaml:"enabled" json:"enabled,omitempty"
property:"enabled"`
+ Enabled *bool `default:"true" yaml:"enabled" json:"enabled,omitempty"
property:"enabled"`
}
type PushgatewayConfig struct {
@@ -93,7 +92,9 @@ func (mc *MetricConfig) Init(rc *RootConfig) error {
return err
}
mc.rootConfig = rc
- metrics.Init(mc.toURL())
+ if *mc.Enable {
+ metrics.Init(mc.toURL())
+ }
return nil
}
@@ -120,11 +121,6 @@ func (mcb *MetricConfigBuilder)
SetConfigCenterEnabled(enabled bool) *MetricConf
return mcb
}
-func (mcb *MetricConfigBuilder) SetRpcEnabled(enabled bool)
*MetricConfigBuilder {
- mcb.metricConfig.EnableRpc =
- return mcb
-}
-
func (mcb *MetricConfigBuilder) Build() *MetricConfig {
return mcb.metricConfig
}
@@ -137,15 +133,14 @@ func (mc *MetricConfig)
DynamicUpdateProperties(newMetricConfig *MetricConfig) {
//
prometheus://localhost:9090?=false=false
func (mc *MetricConfig) toURL() *common.URL {
url, _ := common.NewURL("localhost", common.WithProtocol(mc.Protocol))
- url.SetParam(constant.PrometheusExporterEnabledKey,
strconv.FormatBool(*mc.Enable)) // for compatibility
url.SetParam(constant.PrometheusExporterMetricsPortKey, mc.Port)
url.SetParam(constant.PrometheusExporterMetricsPathKey, mc.Path)
url.SetParam(constant.ApplicationKey, mc.rootConfig.Application.Name)
url.SetParam(constant.AppVersionKey, mc.rootConfig.Application.Version)
+ url.SetParam(constant.RpcEnabledKey, strconv.FormatBool(*mc.Enable))
url.SetParam(constant.MetadataEnabledKey,
strconv.FormatBool(*mc.EnableMetadata))
url.SetParam(constant.RegistryEnabledKey,
strconv.FormatBool(*mc.EnableRegistry))
url.SetParam(constant.ConfigCenterEnabledKey,
strconv.FormatBool(*mc.EnableConfigCenter))
- url.SetParam(constant.RpcEnabledKey, strconv.FormatBool(*mc.EnableRpc))
if mc.Aggregation != nil {
url.SetParam(constant.AggregationEnabledKey,
strconv.FormatBool(*mc.Aggregation.Enabled))
url.SetParam(constant.AggregationBucketNumKey,
strconv.Itoa(mc.Aggregation.BucketNum))
@@ -154,7 +149,7 @@ func (mc *MetricConfig) toURL() *common.URL {
if mc.Prometheus != nil {
if mc.Prometheus.Exporter != nil {
exporter
