Skip to content

Support Prometheus metrics as default mode#516

Merged
yurishkuro merged 3 commits intomasterfrom
prometheus-metrics
Nov 28, 2017
Merged

Support Prometheus metrics as default mode#516
yurishkuro merged 3 commits intomasterfrom
prometheus-metrics

Conversation

@yurishkuro
Copy link
Copy Markdown
Member

@yurishkuro yurishkuro commented Nov 7, 2017

Depends in jaegertracing/jaeger-lib#29

Resolves #360, partially #273 .

@ghost ghost assigned yurishkuro Nov 7, 2017
@ghost ghost added the review label Nov 7, 2017
@yurishkuro yurishkuro force-pushed the prometheus-metrics branch 3 times, most recently from 0b328ab to 3655911 Compare November 12, 2017 22:54
@yurishkuro yurishkuro changed the title [WIP] Support Prometheus metrics in the agent [WIP] Support Prometheus metrics Nov 12, 2017
@yurishkuro yurishkuro force-pushed the prometheus-metrics branch 2 times, most recently from 1c9795d to 7fbd871 Compare November 12, 2017 23:25
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.05%) to 100.0% when pulling 7fbd871 on prometheus-metrics into 32e2cd3 on master.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.05%) to 100.0% when pulling 7fbd871 on prometheus-metrics into 32e2cd3 on master.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.05%) to 100.0% when pulling eb29339 on prometheus-metrics into 32e2cd3 on master.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.02%) to 99.969% when pulling 05603c0 on prometheus-metrics into 32e2cd3 on master.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.05%) to 100.0% when pulling 535fabf on prometheus-metrics into 32e2cd3 on master.

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})
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.05%) to 100.0% when pulling 23420ab on prometheus-metrics into 32e2cd3 on master.

@yurishkuro yurishkuro changed the title [WIP] Support Prometheus metrics Support Prometheus metrics as default mode Nov 13, 2017
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 100.0% when pulling 3afc106 on prometheus-metrics into 5db9cde on master.

Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 100.0% when pulling 9707610 on prometheus-metrics into ecb6609 on master.

kitprom "github.com/uber/jaeger-lib/metrics/go-kit/prometheus"
jprom "github.com/uber/jaeger-lib/metrics/prometheus"

"github.com/uber/jaeger-lib/metrics"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imports for this is wonky

Signed-off-by: Yuri Shkuro <ys@uber.com>
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 100.0% when pulling b263332 on prometheus-metrics into ecb6609 on master.

@yurishkuro yurishkuro merged commit 9988a3d into master Nov 28, 2017
@ghost ghost removed the review label Nov 28, 2017
@yurishkuro yurishkuro deleted the prometheus-metrics branch December 23, 2017 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants