mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Rename handler to path in coarsemux label set 

The term "handler" is more or less specific to golang while the commonly
used term in HTTP is "path". In order to not leak golang terminology
into other clients and also to help people to understand the meaning of
the labels, this change renames handler to path.
This commit is contained in:
Tobias Schmidt 2013-11-13 13:39:15 +07:00
parent ad41ea8439
commit 1ac216f517
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
prometheus/counter_test.go
View File

@ -74,10 +74,10 @@ func testCounter(t tester) {
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Set(map[string]string{"handler": "/foo"}, 13)
g.Set(map[string]string{"path": "/foo"}, 13)
},
func(g Counter) {
g.Set(map[string]string{"handler": "/bar"}, 17)
g.Set(map[string]string{"path": "/bar"}, 17)
},
func(g Counter) {
g.ResetAll()
@ -92,96 +92,96 @@ func testCounter(t tester) {
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Set(map[string]string{"handler": "/foo"}, 19)
g.Set(map[string]string{"path": "/foo"}, 19)
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":19}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":19}]}`,
},
},
{
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Set(map[string]string{"handler": "/foo"}, 23)
g.Set(map[string]string{"path": "/foo"}, 23)
},
func(g Counter) {
g.Increment(map[string]string{"handler": "/foo"})
g.Increment(map[string]string{"path": "/foo"})
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":24}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":24}]}`,
},
},
{
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Increment(map[string]string{"handler": "/foo"})
g.Increment(map[string]string{"path": "/foo"})
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":1}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":1}]}`,
},
},
{
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Decrement(map[string]string{"handler": "/foo"})
g.Decrement(map[string]string{"path": "/foo"})
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":-1}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":-1}]}`,
},
},
{
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Set(map[string]string{"handler": "/foo"}, 29)
g.Set(map[string]string{"path": "/foo"}, 29)
},
func(g Counter) {
g.Decrement(map[string]string{"handler": "/foo"})
g.Decrement(map[string]string{"path": "/foo"})
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":28}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":28}]}`,
},
},
{
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Set(map[string]string{"handler": "/foo"}, 31)
g.Set(map[string]string{"path": "/foo"}, 31)
},
func(g Counter) {
g.IncrementBy(map[string]string{"handler": "/foo"}, 5)
g.IncrementBy(map[string]string{"path": "/foo"}, 5)
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":36}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":36}]}`,
},
},
{
in: input{
steps: []func(g Counter){
func(g Counter) {
g.Set(map[string]string{"handler": "/foo"}, 37)
g.Set(map[string]string{"path": "/foo"}, 37)
},
func(g Counter) {
g.DecrementBy(map[string]string{"handler": "/foo"}, 10)
g.DecrementBy(map[string]string{"path": "/foo"}, 10)
},
},
},
out: output{
value: `{"type":"counter","value":[{"labels":{"handler":"/foo"},"value":27}]}`,
value: `{"type":"counter","value":[{"labels":{"path":"/foo"},"value":27}]}`,
},
},
}

4
prometheus/exp/coarsemux.go
View File

@ -15,7 +15,7 @@ import (
)
const (
handler = "handler"
path = "path"
code = "code"
method = "method"
)
@ -54,7 +54,7 @@ func (h handlerDelegator) ServeHTTP(w http.ResponseWriter, r *http.Request) {
defer func() {
duration := float64(time.Since(start) / time.Microsecond)
status := rwd.Status()
labels := map[string]string{handler: h.pattern, code: status, method: strings.ToLower(r.Method)}
labels := map[string]string{path: h.pattern, code: status, method: strings.ToLower(r.Method)}
requestCounts.Increment(labels)
requestDuration.IncrementBy(labels, duration)
requestDurations.Add(labels, duration)

8
prometheus/gauge_test.go
View File

@ -74,10 +74,10 @@ func testGauge(t tester) {
in: input{
steps: []func(g Gauge){
func(g Gauge) {
g.Set(map[string]string{"handler": "/foo"}, 13)
g.Set(map[string]string{"path": "/foo"}, 13)
},
func(g Gauge) {
g.Set(map[string]string{"handler": "/bar"}, 17)
g.Set(map[string]string{"path": "/bar"}, 17)
},
func(g Gauge) {
g.ResetAll()
@ -92,12 +92,12 @@ func testGauge(t tester) {
in: input{
steps: []func(g Gauge){
func(g Gauge) {
g.Set(map[string]string{"handler": "/foo"}, 19)
g.Set(map[string]string{"path": "/foo"}, 19)
},
},
},
out: output{
value: `{"type":"gauge","value":[{"labels":{"handler":"/foo"},"value":19}]}`,
value: `{"type":"gauge","value":[{"labels":{"path":"/foo"},"value":19}]}`,
},
},
}