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.

Sign up for GitHub

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

Jump to bottom

Enable publish servicedefinition to metadata center #2025

Merged
merged 8 commits into from
Sep 24, 2022
Merged

Enable publish servicedefinition to metadata center #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ddd9897
fix zk invalid path when metadata-type: remote
Leospard Aug 5, 2022
0979169
format the file
Leospard Aug 21, 2022
46b3051
add log record when joinParams early return
Leospard Aug 25, 2022
0fd60c2
fix type conversion bug
Leospard Sep 18, 2022
7464068
add json format
Leospard Sep 18, 2022
4d8844e
modify unit test
Leospard Sep 18, 2022
ac7070d
Merge branch '3.0' into metatype_dev
Leospard Sep 18, 2022
b2e2641
fix typo
Leospard Sep 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions metadata/definition/definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ type ServiceDefiner interface {

// ServiceDefinition is the describer of service definition
type ServiceDefinition struct {
CanonicalName string
CodeSource string
Methods []MethodDefinition
Types []TypeDefinition
CanonicalName string `json:"canonicalName"`
CodeSource string `json:"codeSource"`
Methods []MethodDefinition `json:"methods"`
Types []TypeDefinition `json:"types"`
}

// ToBytes convert ServiceDefinition to json string
Expand Down Expand Up @@ -71,26 +71,26 @@ func (def *ServiceDefinition) String() string {

// FullServiceDefinition is the describer of service definition with parameters
type FullServiceDefinition struct {
Parameters map[string]string
Parameters map[string]string `json:"parameters"`
ServiceDefinition
}

// MethodDefinition is the describer of method definition
type MethodDefinition struct {
Name string
ParameterTypes []string
ReturnType string
Parameters []TypeDefinition
Name string `json:"name"`
ParameterTypes []string `json:"parameterTypes"`
ReturnType string `json:"returnType"`
Parameters []TypeDefinition `json:"parameters"`
}

// TypeDefinition is the describer of type definition
type TypeDefinition struct {
ID string
Type string
Items []TypeDefinition
Enums []string
Properties map[string]TypeDefinition
TypeBuilderName string
ID string `json:"id"`
Type string `json:"type"`
Items []TypeDefinition `json:"items"`
Enums []string `json:"enums"`
Properties map[string]TypeDefinition `json:"properties"`
TypeBuilderName string `json:"typeBuilderName"`
}

// BuildServiceDefinition can build service definition which will be used to describe a service
Expand Down
8 changes: 8 additions & 0 deletions metadata/identifier/base_metadata_identifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import (
"net/url"
)

import (
"github.com/dubbogo/gost/log/logger"
)

import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
)
Expand All @@ -43,6 +47,10 @@ type BaseMetadataIdentifier struct {
func joinParams(joinChar string, params []string) string {
var joinedStr string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

string change strings.Builder?

for _, param := range params {
if param == "" {
logger.Info("[Metadata report] Break loop in `joinParams` to avoid invalid path when meeting empty param")
break
Leospard marked this conversation as resolved.
Show resolved Hide resolved
}
joinedStr += joinChar
joinedStr += param
}
Expand Down
2 changes: 1 addition & 1 deletion metadata/report/delegate/delegate_report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func (mr *MetadataReport) doHandlerMetadataCollection(metadataMap map[*identifie
}
for e := range metadataMap {
if common.RoleType(common.PROVIDER).Role() == e.Side {
mr.StoreProviderMetadata(e, metadataMap[e].(*definition.ServiceDefinition))
mr.StoreProviderMetadata(e, metadataMap[e].(*definition.FullServiceDefinition))
} else if common.RoleType(common.CONSUMER).Role() == e.Side {
mr.StoreConsumerMetadata(e, metadataMap[e].(map[string]string))
}
Expand Down
8 changes: 4 additions & 4 deletions metadata/service/local/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ func TestMetadataService(t *testing.T) {
assert.NoError(t, err)
err = mts.PublishServiceDefinition(u)
assert.NoError(t, err)
expected := "{\"Parameters\":{\"anyhost\":\"true\",\"application\":\"BDTService\"," +
expected := "{\"parameters\":{\"anyhost\":\"true\",\"application\":\"BDTService\"," +
"\"bean.name\":\"UserProvider\",\"category\":\"providers\",\"default.timeout\":\"10000\"," +
"\"dubbo\":\"dubbo-provider-golang-1.0.0\",\"environment\":\"dev\",\"group\":\"group1\"," +
"\"interface\":\"com.ikurento.user.UserProvider\",\"ip\":\"192.168.56.1\"," +
"\"methods\":\"GetUser\",\"module\":\"dubbogo user-info server\",\"org\":\"ikurento.com\"," +
"\"owner\":\"ZX\",\"pid\":\"1447\",\"revision\":\"0.0.1\",\"side\":\"provider\"," +
"\"timeout\":\"3000\",\"timestamp\":\"1556509797245\",\"version\":\"0.0.1\"}," +
"\"CanonicalName\":\"com.ikurento.user.UserProvider\",\"CodeSource\":\"\"," +
"\"Methods\":[{\"Name\":\"GetUser\",\"ParameterTypes\":[\"slice\"],\"ReturnType\":\"ptr\"," +
"\"Parameters\":null}],\"Types\":null}"
"\"canonicalName\":\"com.ikurento.user.UserProvider\",\"codeSource\":\"\"," +
"\"methods\":[{\"name\":\"GetUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"," +
"\"parameters\":null}],\"types\":null}"
def1, err := mts.GetServiceDefinition(serviceName, group, version)
assert.Equal(t, expected, def1)
assert.NoError(t, err)
Expand Down
9 changes: 4 additions & 5 deletions metadata/service/remote/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,16 @@ func TestMockInmemoryProc(t *testing.T) {
err = mts.PublishServiceDefinition(u)
assert.NoError(t, err)

expected := "{\"Parameters\":{\"anyhost\":\"true\",\"application\":\"BDTService\"," +
expected := "{\"parameters\":{\"anyhost\":\"true\",\"application\":\"BDTService\"," +
"\"bean.name\":\"UserProvider\",\"category\":\"providers\",\"default.timeout\":\"10000\"," +
"\"dubbo\":\"dubbo-provider-golang-1.0.0\",\"environment\":\"dev\",\"group\":\"group1\"," +
"\"interface\":\"com.ikurento.user.UserProvider\",\"ip\":\"192.168.56.1\"," +
"\"methods\":\"GetUser\",\"module\":\"dubbogo user-info server\",\"org\":\"ikurento.com\"," +
"\"owner\":\"ZX\",\"pid\":\"1447\",\"revision\":\"0.0.1\",\"side\":\"provider\"," +
"\"timeout\":\"3000\",\"timestamp\":\"1556509797245\",\"version\":\"0.0.1\"}," +
"\"CanonicalName\":\"com.ikurento.user.UserProvider\",\"CodeSource\":\"\"," +
"\"Methods\":[{\"Name\":\"GetUser\",\"ParameterTypes\":[\"slice\"],\"ReturnType\":\"ptr\"," +
"\"Parameters\":null}],\"Types\":null}"

"\"canonicalName\":\"com.ikurento.user.UserProvider\",\"codeSource\":\"\"," +
"\"methods\":[{\"name\":\"GetUser\",\"parameterTypes\":[\"slice\"],\"returnType\":\"ptr\"," +
"\"parameters\":null}],\"types\":null}"
def1, _ := mts.GetServiceDefinition(serviceName, group, version)
assert.Equal(t, expected, def1)
serviceKey := definition.ServiceDescriperBuild(serviceName, group, version)
Expand Down