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

Improve tag and configurator rules to keep up with official site #2330

Merged
merged 27 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f27e976
improve tag and configurator rules
chickenlj Jun 7, 2023
9d6939a
ASF header
chickenlj Jun 8, 2023
92a6adf
Merge branch 'main' into router-enhance
chickenlj Jun 19, 2023
2a4625d
add metrics base api interface (#2350)
FoghostCn Jul 7, 2023
12bcf73
Introduce metrics bus (#2351)
FinalT Jul 7, 2023
1f4b1c8
add medata and config center metrics (#2357)
FoghostCn Jul 18, 2023
96dcff5
Merge branch 'main' into feature-metrics
chickenlj Jul 19, 2023
459d2ba
update go mod
chickenlj Jul 19, 2023
667ffcb
Merge branch 'main' into router-enhance
chickenlj Jul 20, 2023
0e4f92f
update unit test
chickenlj Jul 20, 2023
59cb82b
Merge remote-tracking branch 'chickenlj/router-enhance' into router-e…
chickenlj Jul 20, 2023
d0c3564
add metadata rt metrics (#2363)
FoghostCn Jul 26, 2023
82e9849
add registry metrics (#2366)
FinalT Jul 31, 2023
413c894
Merge branch 'main' into feature-metrics
chickenlj Jul 31, 2023
035e2d4
Merge branch 'main' into router-enhance
chickenlj Aug 4, 2023
f5b88b2
Merge branch 'main' of https://github.com/apache/dubbo-go
chickenlj Aug 4, 2023
0c01e72
Merge branch 'main' into router-enhance
chickenlj Aug 4, 2023
59d20f2
ignore Attribute field
chickenlj Aug 6, 2023
cdfb622
Update cluster/router/tag/match.go
chickenlj Aug 15, 2023
2cb8393
Use pointer as receiver
chickenlj Aug 15, 2023
44a83c5
Merge branch 'main' into router-enhance
chickenlj Aug 16, 2023
9da87c7
Merge branch 'main' of https://github.com/apache/dubbo-go
chickenlj Aug 16, 2023
4e52f14
Merge branch 'main' into router-enhance
chickenlj Aug 16, 2023
06f3369
Merge branch 'main' into router-enhance
chickenlj Aug 24, 2023
4fdf50b
unexport url attributes field
chickenlj Aug 24, 2023
eee3001
Merge remote-tracking branch 'chickenlj/router-enhance' into router-e…
chickenlj Aug 24, 2023
9498a4f
Merge branch 'main' into router-enhance
chickenlj Nov 2, 2023
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
Prev Previous commit
Next Next commit
add registry metrics (#2366)
  • Loading branch information
FinalT committed Jul 31, 2023
commit 82e9849fc019f93459baf8faf3449d13c51bd9e8
153 changes: 153 additions & 0 deletions metrics/registry/collector.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package registry

import (
"time"
)

import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/metrics"
)

var (
registryChan = make(chan metrics.MetricsEvent, 128)
)

func init() {
metrics.AddCollector("registry", func(m metrics.MetricRegistry, c *metrics.ReporterConfig) {
rc := &registryCollector{regRegistry: m}
go rc.start()
})
}

// registryCollector is the registry's metrics collector
type registryCollector struct {
regRegistry metrics.MetricRegistry
}

func (rc *registryCollector) start() {
metrics.Subscribe(constant.MetricsRegistry, registryChan)
for event := range registryChan {
if registryEvent, ok := event.(*RegistryMetricsEvent); ok {
switch registryEvent.Name {
case Reg:
rc.regHandler(registryEvent)
case Sub:
rc.subHandler(registryEvent)
case Notify:
rc.notifyHandler(registryEvent)
case ServerReg:
rc.serverRegHandler(registryEvent)
case ServerSub:
rc.serverSubHandler(registryEvent)
default:
}
}
}
}

func newStatesMetricFunc(total *metrics.MetricKey, succ *metrics.MetricKey, fail *metrics.MetricKey,
level metrics.MetricLevel, reg metrics.MetricRegistry) metrics.StatesMetrics {
return metrics.NewStatesMetrics(metrics.NewMetricId(total, level), metrics.NewMetricId(succ, level),
metrics.NewMetricId(fail, level), reg)
}

func newTimeMetrics(min, max, avg, sum, last *metrics.MetricKey, level metrics.MetricLevel, mr metrics.MetricRegistry) metrics.TimeMetric {
return metrics.NewTimeMetric(metrics.NewMetricId(min, level), metrics.NewMetricId(max, level), metrics.NewMetricId(avg, level),
metrics.NewMetricId(sum, level), metrics.NewMetricId(last, level), mr)
}

// regHandler handles register metrics
func (rc *registryCollector) regHandler(event *RegistryMetricsEvent) {
// Event is converted to metrics
// Save metrics to the MetricRegistry
m := metrics.ComputeIfAbsentCache(dubboRegNum, func() interface{} {
return newStatesMetricFunc(RegisterMetricRequests, RegisterMetricRequestsSucceed, RegisterMetricRequestsFailed, metrics.GetApplicationLevel(), rc.regRegistry)
}).(metrics.StatesMetrics)
m.Inc(event.Succ)
metric := metrics.ComputeIfAbsentCache(dubboRegRt, func() interface{} {
return newTimeMetrics(RegisterRtMillisecondsMin, RegisterRtMillisecondsMax, RegisterRtMillisecondsAvg, RegisterRtMillisecondsSum, RegisterRtMillisecondsLast, metrics.GetApplicationLevel(), rc.regRegistry)
}).(metrics.TimeMetric)
metric.Record(event.CostMs())
}

// subHandler handles subscribe metrics
func (rc *registryCollector) subHandler(event *RegistryMetricsEvent) {
// Event is converted to metrics
// Save metrics to the MetricRegistry
m := newStatesMetricFunc(SubscribeMetricNum, SubscribeMetricNumSucceed, SubscribeMetricNumFailed, metrics.GetApplicationLevel(), rc.regRegistry)
m.Inc(event.Succ)
}

// notifyHandler handles notify metrics
func (rc *registryCollector) notifyHandler(event *RegistryMetricsEvent) {
// Event is converted to metrics
// Save metrics to the MetricRegistry
rc.regRegistry.Counter(metrics.NewMetricId(NotifyMetricRequests, metrics.GetApplicationLevel())).Inc()
rc.regRegistry.Histogram(metrics.NewMetricId(NotifyMetricNumLast, metrics.GetApplicationLevel())).Record(float64(event.End.UnixNano()) / float64(time.Second))
metric := metrics.ComputeIfAbsentCache(dubboNotifyRt, func() interface{} {
return newTimeMetrics(NotifyRtMillisecondsMin, NotifyRtMillisecondsMax, NotifyRtMillisecondsAvg, NotifyRtMillisecondsSum, NotifyRtMillisecondsLast, metrics.GetApplicationLevel(), rc.regRegistry)
}).(metrics.TimeMetric)
metric.Record(event.CostMs())
}

// directoryHandler handles directory metrics
func (rc *registryCollector) directoryHandler(event *RegistryMetricsEvent) {
// Event is converted to metrics
// Save metrics to the MetricRegistry
level := metrics.GetApplicationLevel()
typ := event.Attachment["DirTyp"]
switch typ {
case NumAllInc:
rc.regRegistry.Counter(metrics.NewMetricId(DirectoryMetricNumAll, level)).Inc()
case NumAllDec:
rc.regRegistry.Counter(metrics.NewMetricId(DirectoryMetricNumAll, level)).Add(-1)
case NumDisableTotal:
rc.regRegistry.Counter(metrics.NewMetricId(DirectoryMetricNumDisable, level)).Inc()
case NumToReconnectTotal:
rc.regRegistry.Counter(metrics.NewMetricId(DirectoryMetricNumToReconnect, level)).Inc()
case NumValidTotal:
rc.regRegistry.Counter(metrics.NewMetricId(DirectoryMetricNumValid, level)).Inc()
default:
}

}

// serverRegHandler handles server register metrics
func (rc *registryCollector) serverRegHandler(event *RegistryMetricsEvent) {
// Event is converted to metrics
// Save metrics to the MetricRegistry
m := metrics.ComputeIfAbsentCache(dubboRegServerNum, func() interface{} {
return newStatesMetricFunc(ServiceRegisterMetricRequests, ServiceRegisterMetricRequestsSucceed, ServiceRegisterMetricRequestsFailed, metrics.GetApplicationLevel(), rc.regRegistry)
}).(metrics.StatesMetrics)
m.Inc(event.Succ)
metric := metrics.ComputeIfAbsentCache(dubboRegServerRt, func() interface{} {
return newTimeMetrics(RegisterServiceRtMillisecondsMin, RegisterServiceRtMillisecondsMax, RegisterServiceRtMillisecondsAvg, RegisterServiceRtMillisecondsSum, RegisterServiceRtMillisecondsLast, metrics.GetApplicationLevel(), rc.regRegistry)
}).(metrics.TimeMetric)
metric.Record(event.CostMs())
}

// serverSubHandler handles server subscribe metrics
func (rc *registryCollector) serverSubHandler(event *RegistryMetricsEvent) {
// Event is converted to metrics
// Save metrics to the MetricRegistry
m := newStatesMetricFunc(ServiceSubscribeMetricNum, ServiceSubscribeMetricNumSucceed, ServiceSubscribeMetricNumFailed, metrics.GetApplicationLevel(), rc.regRegistry)
m.Inc(event.Succ)
}
78 changes: 62 additions & 16 deletions metrics/registry/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,81 @@

package registry

import (
"time"
)

import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/metrics"
)

// RegistryMetricsEvent contains info about register metrics
type RegistryMetricsEvent struct {
//Contains some information, such as time, success, failure

// PostType MetricKey
// FinishType MetricKey
// ErrorType MetricKey
// Level MetricsLevel

// Time
// Start time.time
// End time.time
Name MetricName
Succ bool
Start time.Time
End time.Time
Attachment map[string]string
}

func (r RegistryMetricsEvent) Type() string {
return constant.MetricsRegistry
}

// NewRegistryEvent
func (r *RegistryMetricsEvent) CostMs() float64 {
return float64(r.End.Sub(r.Start)) / float64(time.Millisecond)
}

// NewSubscribeEvent
// NewRegisterEvent for register metrics
func NewRegisterEvent(succ bool, start time.Time) metrics.MetricsEvent {
return &RegistryMetricsEvent{
Name: Reg,
Succ: succ,
Start: start,
End: time.Now(),
}
}

// NewNotifyEvent
// NewSubscribeEvent for subscribe metrics
func NewSubscribeEvent(succ bool) metrics.MetricsEvent {
return &RegistryMetricsEvent{
Name: Sub,
Succ: succ,
}
}

// NewNotifyEvent for notify metrics
func NewNotifyEvent(start time.Time) metrics.MetricsEvent {
return &RegistryMetricsEvent{
Name: Notify,
Start: start,
End: time.Now(),
}
}

// NewDirectoryEvent
// NewDirectoryEvent for directory metrics
func NewDirectoryEvent(dirTyp string) metrics.MetricsEvent {
return &RegistryMetricsEvent{
Name: Directory,
Attachment: map[string]string{"DirTyp": dirTyp},
}
}

// NewServerRegistryEvent
// NewServerRegisterEvent for server register metrics
func NewServerRegisterEvent(succ bool, start time.Time) metrics.MetricsEvent {
return &RegistryMetricsEvent{
Name: ServerReg,
Succ: succ,
Start: start,
End: time.Now(),
}
}

// NewServerSubscribeEvent
// NewServerSubscribeEvent for server subscribe metrics
func NewServerSubscribeEvent(succ bool) metrics.MetricsEvent {
return &RegistryMetricsEvent{
Name: ServerSub,
Succ: succ,
}
}
98 changes: 0 additions & 98 deletions metrics/registry/listener.go

This file was deleted.

Loading
Loading