-
Notifications
You must be signed in to change notification settings - Fork 4
server: add lifetime Prometheus counters #31
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
Open
yaoge123
wants to merge
3
commits into
ustclug:master
Choose a base branch
from
yaoge123:add-prometheus-counters
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package server | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "sort" | ||
| "strings" | ||
| "time" | ||
| ) | ||
|
|
||
| func prometheusEscapeLabelValue(s string) string { | ||
| s = strings.ReplaceAll(s, `\`, `\\`) | ||
| s = strings.ReplaceAll(s, "\n", `\n`) | ||
| s = strings.ReplaceAll(s, `"`, `\"`) | ||
| return s | ||
| } | ||
|
|
||
| func prometheusLabelValueOrUnknown(s string) string { | ||
| if s == "" { | ||
| return "unknown" | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| func prometheusLabels(index uint32, module, upstream string) string { | ||
| return fmt.Sprintf( | ||
| `index="%d",module="%s",upstream="%s"`, | ||
| index, | ||
| prometheusEscapeLabelValue(prometheusLabelValueOrUnknown(module)), | ||
| prometheusEscapeLabelValue(prometheusLabelValueOrUnknown(upstream)), | ||
| ) | ||
| } | ||
|
|
||
| type prometheusConnectionGroup struct { | ||
| module string | ||
| upstream string | ||
| } | ||
|
|
||
| func (s *Server) writePrometheusMetrics(w io.Writer, now time.Time) { | ||
| connections := s.ListConnectionInfo() | ||
| acceptedConnections := s.acceptedConnTotal.Load() | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_active_connections Current active rsync proxy connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_active_connections gauge") | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_active_connections %d\n", s.GetActiveConnectionCount()) | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_accepted_connections_total Total accepted rsync proxy connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_accepted_connections_total counter") | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_accepted_connections_total %d\n", acceptedConnections) | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_completed_connections_total Total completed rsync proxy connections that reached upstream relay.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_completed_connections_total counter") | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_completed_connections_total %d\n", s.completedConns.Load()) | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_sent_bytes_total Total bytes sent to clients for completed connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_sent_bytes_total counter") | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_sent_bytes_total %d\n", s.sentBytesTotal.Load()) | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_received_bytes_total Total bytes received from clients for completed connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_received_bytes_total counter") | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_received_bytes_total %d\n", s.recvBytesTotal.Load()) | ||
|
|
||
| connectionCounts := make(map[prometheusConnectionGroup]int) | ||
| for _, conn := range connections { | ||
| _, module, upstream, _, _, _ := conn.snapshot() | ||
| key := prometheusConnectionGroup{ | ||
| module: prometheusLabelValueOrUnknown(module), | ||
| upstream: prometheusLabelValueOrUnknown(upstream), | ||
| } | ||
| connectionCounts[key]++ | ||
| } | ||
|
|
||
| keys := make([]prometheusConnectionGroup, 0, len(connectionCounts)) | ||
| for key := range connectionCounts { | ||
| keys = append(keys, key) | ||
| } | ||
| sort.Slice(keys, func(i, j int) bool { | ||
| if keys[i].module != keys[j].module { | ||
| return keys[i].module < keys[j].module | ||
| } | ||
| return keys[i].upstream < keys[j].upstream | ||
| }) | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_active_connections_by_module Current active rsync proxy connections by module and upstream.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_active_connections_by_module gauge") | ||
| for _, key := range keys { | ||
| module := prometheusEscapeLabelValue(key.module) | ||
| upstream := prometheusEscapeLabelValue(key.upstream) | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_active_connections_by_module{module=\"%s\",upstream=\"%s\"} %d\n", module, upstream, connectionCounts[key]) | ||
| } | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_connection_sent_bytes Bytes sent to clients for active connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_connection_sent_bytes gauge") | ||
| for _, conn := range connections { | ||
| index, module, upstream, _, sentBytes, _ := conn.snapshot() | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_connection_sent_bytes{%s} %d\n", prometheusLabels(index, module, upstream), sentBytes) | ||
| } | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_connection_received_bytes Bytes received from clients for active connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_connection_received_bytes gauge") | ||
| for _, conn := range connections { | ||
| index, module, upstream, _, _, receivedBytes := conn.snapshot() | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_connection_received_bytes{%s} %d\n", prometheusLabels(index, module, upstream), receivedBytes) | ||
| } | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_connection_connected_timestamp_seconds Unix timestamp when active connections were established.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_connection_connected_timestamp_seconds gauge") | ||
| for _, conn := range connections { | ||
| index, module, upstream, connectedAt, _, _ := conn.snapshot() | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_connection_connected_timestamp_seconds{%s} %d\n", prometheusLabels(index, module, upstream), connectedAt.Unix()) | ||
| } | ||
|
|
||
| _, _ = fmt.Fprintln(w, "# HELP rsync_proxy_connection_duration_seconds Current duration of active connections.") | ||
| _, _ = fmt.Fprintln(w, "# TYPE rsync_proxy_connection_duration_seconds gauge") | ||
| for _, conn := range connections { | ||
| index, module, upstream, connectedAt, _, _ := conn.snapshot() | ||
| duration := now.Sub(connectedAt).Seconds() | ||
| if duration < 0 { | ||
| duration = 0 | ||
| } | ||
| _, _ = fmt.Fprintf(w, "rsync_proxy_connection_duration_seconds{%s} %.3f\n", prometheusLabels(index, module, upstream), duration) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in
82cb742. The lifetime counters now wait for both copy goroutines to finish before sampling byte totals, so the counters and access log use the completed transfer state instead of one half of the relay.