Support Prometheus metrics as default mode #516
Merged
Conversation
This file contains 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
yurishkuro
requested review from
black-adder,
pavolloffay and
vprithvi
as code owners
ghost
assigned
yurishkuro
force-pushed
the
prometheus-metrics
branch
3 times, most recently
from
0b328ab
to
3655911
Compare
yurishkuro
changed the title
yurishkuro
force-pushed
the
prometheus-metrics
branch
2 times, most recently
from
1c9795d
to
7fbd871
Compare
yurishkuro
commented
Nov 13, 2017
| @@ -116,7 +116,7 @@ func (spanHb *SpanHandlerBuilder) initElasticStore(esBuilder escfg.ClientBuilder | |||
| // BuildHandlers builds span handlers (Zipkin, Jaeger) | |||
| func (spanHb *SpanHandlerBuilder) BuildHandlers() (app.ZipkinSpansHandler, app.JaegerBatchesHandler) { | |||
| hostname, _ := os.Hostname() | |||
| hostMetrics := spanHb.metricsFactory.Namespace(hostname, nil) | |||
| hostMetrics := spanHb.metricsFactory.Namespace("", map[string]string{"host": hostname}) | |||
There was a problem hiding this comment.
NOTE: this is a breaking change, but without it the crossdock test was failing with "49d962b96482:save_latency" is not a valid metric name because the host name was used as a prefix.
yurishkuro
changed the title
yurishkuro
force-pushed
the
prometheus-metrics
branch
from
23420ab
to
3afc106
Compare
yurishkuro
force-pushed
the
prometheus-metrics
branch
from
3afc106
to
f76a211
Compare
Signed-off-by: Yuri Shkuro <ys@uber.com>
yurishkuro
force-pushed
the
prometheus-metrics
branch
from
f76a211
to
c9a232a
Compare
Signed-off-by: Yuri Shkuro <ys@uber.com>
black-adder
approved these changes
Nov 27, 2017
pkg/metrics/builder.go
Outdated
| "net/http" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus/promhttp" | ||
| "github.com/spf13/viper" | ||
| xkit "github.com/uber/jaeger-lib/metrics/go-kit" | ||
| kitexpvar "github.com/uber/jaeger-lib/metrics/go-kit/expvar" | ||
| kitprom "github.com/uber/jaeger-lib/metrics/go-kit/prometheus" | ||
| jprom "github.com/uber/jaeger-lib/metrics/prometheus" | ||
|
|
||
| "github.com/uber/jaeger-lib/metrics" |
There was a problem hiding this comment.
imports for this is wonky
Signed-off-by: Yuri Shkuro <ys@uber.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Depends in jaegertracing/jaeger-lib#29
Resolves #360, partially #273 .