diff --git a/examples/circuitbreaker/consumer/polaris.yaml b/examples/circuitbreaker/consumer/polaris.yaml index 64f22499..95105396 100644 --- a/examples/circuitbreaker/consumer/polaris.yaml +++ b/examples/circuitbreaker/consumer/polaris.yaml @@ -1,7 +1,7 @@ global: serverConnector: addresses: - - 172.18.0.1:8091 + - 127.0.0.1:8091 statReporter: enable: true chain: diff --git a/examples/circuitbreaker/provider/polaris.yaml b/examples/circuitbreaker/provider/polaris.yaml index 64f22499..95105396 100644 --- a/examples/circuitbreaker/provider/polaris.yaml +++ b/examples/circuitbreaker/provider/polaris.yaml @@ -1,7 +1,7 @@ global: serverConnector: addresses: - - 172.18.0.1:8091 + - 127.0.0.1:8091 statReporter: enable: true chain: diff --git a/examples/quickstart/provider/main.go b/examples/quickstart/provider/main.go index 40088ba8..a74db138 100644 --- a/examples/quickstart/provider/main.go +++ b/examples/quickstart/provider/main.go @@ -27,7 +27,6 @@ import ( "os/signal" "strings" "syscall" - "time" "github.com/polarismesh/polaris-go" ) @@ -121,22 +120,6 @@ func (svr *PolarisProvider) deregisterService() { log.Printf("deregister successfully.") } -func (svr *PolarisProvider) doHeartbeat() { - log.Printf("start to invoke heartbeat operation") - ticker := time.NewTicker(time.Duration(5 * time.Second)) - for range ticker.C { - if !svr.isShutdown { - heartbeatRequest := &polaris.InstanceHeartbeatRequest{} - heartbeatRequest.Namespace = namespace - heartbeatRequest.Service = service - heartbeatRequest.Host = svr.host - heartbeatRequest.Port = svr.port - heartbeatRequest.ServiceToken = token - svr.provider.Heartbeat(heartbeatRequest) - } - } -} - func (svr *PolarisProvider) runMainLoop() { ch := make(chan os.Signal, 1) signal.Notify(ch, []os.Signal{ diff --git a/examples/ratelimit/consumer/polaris.yaml b/examples/ratelimit/consumer/polaris.yaml index ff54675d..95105396 100644 --- a/examples/ratelimit/consumer/polaris.yaml +++ b/examples/ratelimit/consumer/polaris.yaml @@ -1,7 +1,7 @@ global: serverConnector: addresses: - - 9.134.5.52:8091 + - 127.0.0.1:8091 statReporter: enable: true chain: diff --git a/examples/ratelimit/image/create_service_ratelimit.png b/examples/ratelimit/image/create_service_ratelimit.png index 9c6f680d..b2b3e1ca 100644 Binary files a/examples/ratelimit/image/create_service_ratelimit.png and b/examples/ratelimit/image/create_service_ratelimit.png differ diff --git a/examples/ratelimit/provider/polaris.yaml b/examples/ratelimit/provider/polaris.yaml index 32646672..80fc30b5 100644 --- a/examples/ratelimit/provider/polaris.yaml +++ b/examples/ratelimit/provider/polaris.yaml @@ -1,7 +1,7 @@ global: serverConnector: addresses: - - 9.134.5.52:8091 + - 127.0.0.1:8091 statReporter: enable: true chain: diff --git a/examples/route/dynamic/README-zh.md b/examples/route/dynamic/README-zh.md index 0d6478f4..05b17831 100644 --- a/examples/route/dynamic/README-zh.md +++ b/examples/route/dynamic/README-zh.md @@ -58,16 +58,16 @@ global: ``` # linux/mac运行命令 -./provider --metadata="env=dev" > provider-20000.log 2>&1 & -./provider --metadata="env=test" > provider-20001.log 2>&1 & -./provider --metadata="env=pre" > provider-20002.log 2>&1 & -./provider --metadata="env=prod" > provider-20003.log 2>&1 & +./provider --port="20000" --metadata="env=dev" > provider-20000.log 2>&1 & +./provider --port="20001" --metadata="env=test" > provider-20001.log 2>&1 & +./provider --port="20002" --metadata="env=pre" > provider-20002.log 2>&1 & +./provider --port="20003" --metadata="env=prod" > provider-20003.log 2>&1 & # windows运行命令 -./provider.exe --metadata="env=dev" > provider-20000.log -./provider.exe --metadata="env=test" > provider-20001.log -./provider.exe --metadata="env=pre" > provider-20002.log -./provider.exe --metadata="env=prod" > provider-20003.log +./provider.exe --port="20000" --metadata="env=dev" > provider-20000.log +./provider.exe --port="20001" --metadata="env=test" > provider-20001.log +./provider.exe --port="20002" --metadata="env=pre" > provider-20002.log +./provider.exe --port="20003" --metadata="env=prod" > provider-20003.log ``` 运行构建出的**consumer**可执行文件 @@ -76,10 +76,10 @@ global: ``` # linux/mac运行命令 -./consumer --selfNamespace={selfName} --selfService=EchoConsumer +./consumer # windows运行命令 -./consumer.exe --selfNamespace={selfName} --selfService=EchoConsumer +./consumer.exe ``` ### 验证 @@ -87,7 +87,7 @@ global: 通过设置请求头参数***env***的值，实现路由到不同的服务实例 ``` -curl -H 'env: pre' http://127.0.0.1:18080/echo +curl http://127.0.0.1:18080/echo?env=pre Hello, I'm RouteEchoServer Provider, My metadata's : env=pre, host : x.x.x.x:x ``` \ No newline at end of file diff --git a/examples/route/dynamic/README.md b/examples/route/dynamic/README.md index 23beffce..f0dc5684 100644 --- a/examples/route/dynamic/README.md +++ b/examples/route/dynamic/README.md @@ -76,10 +76,10 @@ Run the built **consumer** executable ``` # linux/mac -./consumer --selfNamespace={selfName} --selfService=EchoConsumer +./consumer # windows -./consumer.exe --selfNamespace={selfName} --selfService=EchoConsumer +./consumer.exe ``` ### Verify @@ -87,7 +87,7 @@ Run the built **consumer** executable Realize the route to different service instances by setting the value of the request header **env** ``` -curl -H 'env: pre' http://127.0.0.1:18080/echo +curl http://127.0.0.1:18080/echo?env=pre Hello, I'm RouteEchoServer Provider, My metadata's : env=pre, host : x.x.x.x:x ``` \ No newline at end of file diff --git a/examples/route/dynamic/consumer/main.go b/examples/route/dynamic/consumer/main.go index 5f964f33..20282dbe 100644 --- a/examples/route/dynamic/consumer/main.go +++ b/examples/route/dynamic/consumer/main.go @@ -23,6 +23,7 @@ import ( "fmt" "io/ioutil" "log" + "net" "net/http" "strings" "time" @@ -37,6 +38,7 @@ var ( selfNamespace string selfService string port int64 + token string ) func initArgs() { @@ -45,18 +47,42 @@ func initArgs() { flag.StringVar(&selfNamespace, "selfNamespace", "default", "selfNamespace") flag.StringVar(&selfService, "selfService", "", "selfService") flag.Int64Var(&port, "port", 18080, "port") + flag.StringVar(&token, "token", "", "token") } // PolarisConsumer . type PolarisConsumer struct { consumer polaris.ConsumerAPI router polaris.RouterAPI + provider polaris.ProviderAPI namespace string service string } // Run . func (svr *PolarisConsumer) Run() { + if selfService != "" && selfNamespace != "" { + tmpHost, err := getLocalHost(svr.provider.SDKContext().GetConfig().GetGlobal().GetServerConnector().GetAddresses()[0]) + if nil != err { + panic(fmt.Errorf("error occur while fetching localhost: %v", err)) + } + req := &polaris.InstanceRegisterRequest{} + req.Namespace = selfNamespace + req.Service = selfService + log.Printf("start to invoke register operation") + registerRequest := &polaris.InstanceRegisterRequest{} + registerRequest.Service = service + registerRequest.Namespace = namespace + registerRequest.Host = tmpHost + registerRequest.Port = int(port) + registerRequest.ServiceToken = token + resp, err := svr.provider.RegisterInstance(registerRequest) + if nil != err { + log.Fatalf("fail to register instance, err is %v", err) + } + log.Printf("register response: instanceId %s", resp.InstanceID) + } + svr.runWebServer() } @@ -155,6 +181,7 @@ func main() { svr := &PolarisConsumer{ consumer: polaris.NewConsumerAPIByContext(sdkCtx), router: polaris.NewRouterAPIByContext(sdkCtx), + provider: polaris.NewProviderAPIByContext(sdkCtx), namespace: namespace, service: service, } @@ -177,3 +204,16 @@ func convertQuery(rawQuery string) map[string]string { } return meta } + +func getLocalHost(serverAddr string) (string, error) { + conn, err := net.Dial("tcp", serverAddr) + if nil != err { + return "", err + } + localAddr := conn.LocalAddr().String() + colonIdx := strings.LastIndex(localAddr, ":") + if colonIdx > 0 { + return localAddr[:colonIdx], nil + } + return localAddr, nil +} diff --git a/examples/route/dynamic/provider/main.go b/examples/route/dynamic/provider/main.go index 13a752aa..c53b0256 100644 --- a/examples/route/dynamic/provider/main.go +++ b/examples/route/dynamic/provider/main.go @@ -89,6 +89,22 @@ func (svr *PolarisProvider) Run() { runMainLoop() } +func (svr *PolarisProvider) registerService() { + log.Printf("start to invoke register operation") + registerRequest := &polaris.InstanceRegisterRequest{} + registerRequest.Service = service + registerRequest.Namespace = namespace + registerRequest.Host = host + registerRequest.Port = svr.port + registerRequest.ServiceToken = token + registerRequest.Metadata = convertMetadatas() + resp, err := svr.provider.RegisterInstance(registerRequest) + if nil != err { + log.Fatalf("fail to register instance, err is %v", err) + } + log.Printf("register response: instanceId %s", resp.InstanceID) +} + func (svr *PolarisProvider) runWebServer() { http.HandleFunc("/echo", func(rw http.ResponseWriter, r *http.Request) { rw.WriteHeader(http.StatusOK) @@ -112,22 +128,6 @@ func (svr *PolarisProvider) runWebServer() { } -func (svr *PolarisProvider) registerService() { - log.Printf("start to invoke register operation") - registerRequest := &polaris.InstanceRegisterRequest{} - registerRequest.Service = service - registerRequest.Namespace = namespace - registerRequest.Host = host - registerRequest.Port = svr.port - registerRequest.ServiceToken = token - registerRequest.Metadata = convertMetadatas() - resp, err := svr.provider.RegisterInstance(registerRequest) - if nil != err { - log.Fatalf("fail to register instance, err is %v", err) - } - log.Printf("register response: instanceId %s", resp.InstanceID) -} - func runMainLoop() { ch := make(chan os.Signal, 1) signal.Notify(ch, []os.Signal{ diff --git a/examples/route/nearby/consumer/go.mod b/examples/route/nearby/consumer/go.mod index 16ae2ea7..430488d2 100644 --- a/examples/route/nearby/consumer/go.mod +++ b/examples/route/nearby/consumer/go.mod @@ -4,6 +4,8 @@ go 1.17 require github.com/polarismesh/polaris-go v1.2.0-beta.3 +replace github.com/polarismesh/polaris-go => ../../../../ + require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect @@ -32,5 +34,3 @@ require ( google.golang.org/protobuf v1.28.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) - -replace github.com/polarismesh/polaris-go => ../../../../ diff --git a/pkg/model/service.go b/pkg/model/service.go index c4446ba3..60226154 100644 --- a/pkg/model/service.go +++ b/pkg/model/service.go @@ -775,7 +775,7 @@ type CircuitBreakGauge struct { CBStatus CircuitBreakerStatus } -// GetCircuitBreakerStatus 获取变化前的熔断状态 +// GetCircuitBreakerStatus 获取当前实例熔断状态 func (cbg *CircuitBreakGauge) GetCircuitBreakerStatus() CircuitBreakerStatus { return cbg.CBStatus } diff --git a/pkg/model/stat.go b/pkg/model/stat.go index 13ce9343..a80500f5 100644 --- a/pkg/model/stat.go +++ b/pkg/model/stat.go @@ -64,6 +64,31 @@ const ( RouteStat ) +func DescMetricType(t MetricType) string { + switch t { + case SDKAPIStat: + return "SDKAPIStat" + case ServiceStat: + return "ServiceStat" + case InstanceStat: + return "InstanceStat" + case SDKCfgStat: + return "SDKCfgStat" + case CircuitBreakStat: + return "CircuitBreakStat" + case PluginAPIStat: + return "PluginAPIStat" + case LoadBalanceStat: + return "LoadBalanceStat" + case RateLimitStat: + return "RateLimitStat" + case RouteStat: + return "RouteStat" + default: + return "Unknown" + } +} + var metricTypes = HashSet{} // ValidMetircType 检测是不是合法的统计类型. diff --git a/plugin/localregistry/inmemory/inmemory.go b/plugin/localregistry/inmemory/inmemory.go index 22871305..6ffae1ab 100644 --- a/plugin/localregistry/inmemory/inmemory.go +++ b/plugin/localregistry/inmemory/inmemory.go @@ -575,7 +575,7 @@ func (g *LocalCache) UpdateInstances(svcUpdateReq *localregistry.ServiceUpdateRe cbStatusUpdated = false } err := g.engine.SyncReportStat(model.CircuitBreakStat, - &model.CircuitBreakGauge{ChangeInstance: updateInstance, CBStatus: preCBStatus}) + &model.CircuitBreakGauge{ChangeInstance: updateInstance, CBStatus: nextCBStatus}) if err != nil { log.GetBaseLogger().Errorf("fail to report circuitbreak change, error %v", err) } diff --git a/plugin/statreporter/prometheus/model.go b/plugin/statreporter/prometheus/model.go index c07949c1..84aadefb 100644 --- a/plugin/statreporter/prometheus/model.go +++ b/plugin/statreporter/prometheus/model.go @@ -161,14 +161,14 @@ var ( CircuitBreakerOpen = metricDesc{ Name: MetricsNameCircuitBreakerOpen, Help: "total of opened circuit breaker", - MetricType: TypeForCounterVec, + MetricType: TypeForGaugeVec, LabelNames: GetLabels(CircuitBreakerGaugeLabelOrder), } CircuitBreakerHalfOpen = metricDesc{ Name: MetricsNameCircuitBreakerHalfOpen, Help: "total of half-open circuit breaker", - MetricType: TypeForCounterVec, + MetricType: TypeForGaugeVec, LabelNames: GetLabels(CircuitBreakerGaugeLabelOrder), } ) diff --git a/plugin/statreporter/prometheus/prometheus_handler.go b/plugin/statreporter/prometheus/prometheus_handler.go index 5a44eb39..fe76b0ce 100644 --- a/plugin/statreporter/prometheus/prometheus_handler.go +++ b/plugin/statreporter/prometheus/prometheus_handler.go @@ -223,21 +223,22 @@ func (p *PrometheusHandler) handleRateLimitGauge(metricsType model.MetricType, v func (p *PrometheusHandler) handleCircuitBreakGauge(metricsType model.MetricType, val *model.CircuitBreakGauge) { labels := p.convertCircuitBreakGaugeToLabels(val) - open := p.metricVecCaches[MetricsNameCircuitBreakerOpen].(*prometheus.CounterVec) + open := p.metricVecCaches[MetricsNameCircuitBreakerOpen].(*prometheus.GaugeVec) + // 计算完之后的熔断状态 status := val.GetCircuitBreakerStatus().GetStatus() if status == model.Open { open.With(labels).Inc() } else { - open.With(labels).Add(-1) + open.With(labels).Dec() } - halfOpen := p.metricVecCaches[MetricsNameCircuitBreakerHalfOpen].(*prometheus.CounterVec) + halfOpen := p.metricVecCaches[MetricsNameCircuitBreakerHalfOpen].(*prometheus.GaugeVec) if status == model.HalfOpen { halfOpen.With(labels).Inc() } else { - halfOpen.With(labels).Add(-1) + halfOpen.With(labels).Dec() } }