github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

add parseEndpoint

Browse Source
This commit is contained in:
xiandong 2023-02-17 13:46:45 +08:00 committed by kevin
parent 41efb48f55
commit fd5b38b07c
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/trace/agent.go
View File

@ -60,7 +60,8 @@ func createExporter(c Config) (sdktrace.SpanExporter, error) {
case kindJaeger: case kindJaeger:
return jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(c.Endpoint))) return jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(c.Endpoint)))
case kindJaegerUdp: case kindJaegerUdp:
return jaeger.New(jaeger.WithAgentEndpoint(jaeger.WithAgentHost(c.getEndpointHost()), jaeger.WithAgentPort(c.getEndpointPort()))) host, port := c.parseEndpoint()
return jaeger.New(jaeger.WithAgentEndpoint(jaeger.WithAgentHost(host), jaeger.WithAgentPort(port)))
case kindZipkin: case kindZipkin:
return zipkin.New(c.Endpoint) return zipkin.New(c.Endpoint)
case kindOtlpGrpc: case kindOtlpGrpc:

15
core/trace/config.go
View File

@ -15,19 +15,14 @@ type Config struct {
Batcher string `json:",default=jaeger,options=jaeger|jaegerudp|zipkin|otlpgrpc|otlphttp"` Batcher string `json:",default=jaeger,options=jaeger|jaegerudp|zipkin|otlpgrpc|otlphttp"`
} }
func (c *Config) getEndpointHost() string { func (c *Config) parseEndpoint() (host string, port string) {
EndpointSlice := strings.Split(c.Endpoint, ":") EndpointSlice := strings.Split(c.Endpoint, ":")
if len(EndpointSlice) > 0 { if len(EndpointSlice) > 0 {
return strings.TrimSpace(EndpointSlice[0]) host = strings.TrimSpace(EndpointSlice[0])
} }
return "" if len(EndpointSlice) > 0 {
} port = strings.TrimSpace(EndpointSlice[1])
func (c *Config) getEndpointPort() string {
EndpointSlice := strings.Split(c.Endpoint, ":")
if len(EndpointSlice) > 1 {
return strings.TrimSpace(EndpointSlice[1])
} }
return "" return host, port
} }

12
core/trace/config_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
) )
func TestConfig_getEndpointHost(t *testing.T) { func TestConfig_parseEndpoint(t *testing.T) {
logx.Disable() logx.Disable()
c1 := Config{ c1 := Config{
@ -19,8 +19,10 @@ func TestConfig_getEndpointHost(t *testing.T) {
Endpoint: "localhost:6831", Endpoint: "localhost:6831",
Batcher: kindJaegerUdp, Batcher: kindJaegerUdp,
} }
assert.NotEqual(t, "localhost", c1.getEndpointHost()) host1, port1 := c1.parseEndpoint()
assert.NotEqual(t, "14268", c1.getEndpointPort()) assert.NotEqual(t, "localhost", host1)
assert.Equal(t, "localhost", c2.getEndpointHost()) assert.NotEqual(t, "14268", port1)
assert.Equal(t, "6831", c2.getEndpointPort()) host2, port2 := c2.parseEndpoint()
assert.Equal(t, "localhost", host2)
assert.Equal(t, "6831", port2)
} }