Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Change default metric namespace to use relevant separator for the met… #364

Merged
merged 1 commit into from
Jan 16, 2019
Merged

Change default metric namespace to use relevant separator for the met… #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions baggage_setter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ func TestTruncateBaggage(t *testing.T) {

factory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.baggage_truncations",
Name: "jaeger.tracer.baggage_truncations",
Value: 1,
},
metricstest.ExpectedMetric{
Name: "jaeger_tracer.baggage_updates",
Name: "jaeger.tracer.baggage_updates",
Tags: map[string]string{"result": "ok"},
Value: 1,
},
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestInvalidBaggage(t *testing.T) {

factory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.baggage_updates",
Name: "jaeger.tracer.baggage_updates",
Tags: map[string]string{"result": "err"},
Value: 1,
},
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ func TestBaggageRestrictionsConfig(t *testing.T) {
require.NoError(t, err)
defer closer.Close()

metricName := "jaeger_tracer.baggage_restrictions_updates"
metricName := "jaeger.tracer.baggage_restrictions_updates"
metricTags := map[string]string{"result": "err"}
key := metrics.GetKey(metricName, metricTags, "|", "=")
for i := 0; i < 100; i++ {
Expand Down
4 changes: 2 additions & 2 deletions internal/baggage/remote/restriction_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func TestNewRemoteRestrictionManager(t *testing.T) {

factory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.baggage_restrictions_updates",
Name: "jaeger.tracer.baggage_restrictions_updates",
Tags: map[string]string{"result": "ok"},
Value: 1,
},
Expand All @@ -147,7 +147,7 @@ func TestDenyBaggageOnInitializationFailure(t *testing.T) {
)
require.False(t, mgr.isReady())

metricName := "jaeger_tracer.baggage_restrictions_updates"
metricName := "jaeger.tracer.baggage_restrictions_updates"
metricTags := map[string]string{"result": "err"}
key := metrics.GetKey(metricName, metricTags, "|", "=")
for i := 0; i < 100; i++ {
Expand Down
4 changes: 2 additions & 2 deletions internal/throttler/remote/throttler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func TestRemoteThrottler_fetchCreditsErrors(t *testing.T) {

factory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.throttler_updates",
Name: "jaeger.tracer.throttler_updates",
Tags: map[string]string{"result": "err"},
Value: 1,
})
Expand Down Expand Up @@ -218,7 +218,7 @@ func TestRemotelyControlledThrottler_pollManager(t *testing.T) {

throttler.refreshCredits()
counters, _ := factory.Snapshot()
counter, ok := counters["jaeger_tracer.throttler_updates|result=ok"]
counter, ok := counters["jaeger.tracer.throttler_updates|result=ok"]
assert.True(t, ok)
assert.True(t, counter >= 1)
})
Expand Down
2 changes: 1 addition & 1 deletion metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ type Metrics struct {
func NewMetrics(factory metrics.Factory, globalTags map[string]string) *Metrics {
m := &Metrics{}
// TODO the namespace "jaeger" should be configurable
metrics.MustInit(m, factory.Namespace(metrics.NSOptions{Name: "jaeger_tracer"}), globalTags)
metrics.MustInit(m, factory.Namespace(metrics.NSOptions{Name: "jaeger"}).Namespace(metrics.NSOptions{Name: "tracer"}), globalTags)
return m
}

Expand Down
4 changes: 2 additions & 2 deletions metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ func TestNewMetrics(t *testing.T) {
m.ReporterQueueLength.Update(11)
factory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.started_spans",
Name: "jaeger.tracer.started_spans",
Tags: map[string]string{"lib": "jaeger", "sampled": "y"},
Value: 1,
},
)
factory.AssertGaugeMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.reporter_queue_length",
Name: "jaeger.tracer.reporter_queue_length",
Tags: map[string]string{"lib": "jaeger"},
Value: 11,
},
Expand Down
14 changes: 7 additions & 7 deletions propagation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ func TestSpanPropagator(t *testing.T) {
}

metricsFactory.AssertCounterMetrics(t, []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 1 + 2*len(tests)},
{Name: "jaeger_tracer.finished_spans", Value: 1 + len(tests)},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"state": "started", "sampled": "y"}, Value: 1},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"state": "joined", "sampled": "y"}, Value: len(tests)},
{Name: "jaeger.tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 1 + 2*len(tests)},
{Name: "jaeger.tracer.finished_spans", Value: 1 + len(tests)},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"state": "started", "sampled": "y"}, Value: 1},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"state": "joined", "sampled": "y"}, Value: len(tests)},
}...)
}

Expand Down Expand Up @@ -150,7 +150,7 @@ func TestDecodingError(t *testing.T) {
_, err := tracer.Extract(opentracing.HTTPHeaders, tmc)
assert.Error(t, err)

metricsFactory.AssertCounterMetrics(t, metricstest.ExpectedMetric{Name: "jaeger_tracer.span_context_decoding_errors", Value: 1})
metricsFactory.AssertCounterMetrics(t, metricstest.ExpectedMetric{Name: "jaeger.tracer.span_context_decoding_errors", Value: 1})
}

func TestBaggagePropagationHTTP(t *testing.T) {
Expand Down Expand Up @@ -213,7 +213,7 @@ func TestJaegerBaggageHeader(t *testing.T) {
// ensure that traces.started counter is incremented, not traces.joined
metricsFactory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.traces", Tags: map[string]string{"state": "started", "sampled": "y"}, Value: 1,
Name: "jaeger.tracer.traces", Tags: map[string]string{"state": "started", "sampled": "y"}, Value: 1,
},
)
})
Expand Down Expand Up @@ -286,7 +286,7 @@ func TestDebugCorrelationID(t *testing.T) {
// ensure that traces.started counter is incremented, not traces.joined
metricsFactory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.traces", Tags: map[string]string{"state": "started", "sampled": "y"}, Value: 1,
Name: "jaeger.tracer.traces", Tags: map[string]string{"state": "started", "sampled": "y"}, Value: 1,
},
)
})
Expand Down
18 changes: 9 additions & 9 deletions reporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func TestRemoteReporterAppendAndPeriodicFlush(t *testing.T) {
s.sender.assertBufferedSpans(t, 1)
// here we wait for periodic flush to occur
s.sender.assertFlushedSpans(t, 1)
s.assertCounter(t, "jaeger_tracer.reporter_spans", map[string]string{"result": "ok"}, 1)
s.assertCounter(t, "jaeger.tracer.reporter_spans", map[string]string{"result": "ok"}, 1)
}

func TestRemoteReporterFlushViaAppend(t *testing.T) {
Expand All @@ -127,8 +127,8 @@ func TestRemoteReporterFlushViaAppend(t *testing.T) {
s.sender.assertFlushedSpans(t, 2)
s.tracer.StartSpan("sp3").Finish()
s.sender.assertBufferedSpans(t, 1)
s.assertCounter(t, "jaeger_tracer.reporter_spans", map[string]string{"result": "ok"}, 2)
s.assertCounter(t, "jaeger_tracer.reporter_spans", map[string]string{"result": "err"}, 0)
s.assertCounter(t, "jaeger.tracer.reporter_spans", map[string]string{"result": "ok"}, 2)
s.assertCounter(t, "jaeger.tracer.reporter_spans", map[string]string{"result": "err"}, 0)
}

func TestRemoteReporterFailedFlushViaAppend(t *testing.T) {
Expand All @@ -137,8 +137,8 @@ func TestRemoteReporterFailedFlushViaAppend(t *testing.T) {
s.tracer.StartSpan("sp2").Finish()
s.sender.assertFlushedSpans(t, 2)
s.assertLogs(t, "ERROR: error reporting span \"sp2\": flush error\n")
s.assertCounter(t, "jaeger_tracer.reporter_spans", map[string]string{"result": "err"}, 2)
s.assertCounter(t, "jaeger_tracer.reporter_spans", map[string]string{"result": "ok"}, 0)
s.assertCounter(t, "jaeger.tracer.reporter_spans", map[string]string{"result": "err"}, 2)
s.assertCounter(t, "jaeger.tracer.reporter_spans", map[string]string{"result": "ok"}, 0)
s.close() // causes explicit flush that also fails with the same error
s.assertLogs(t, "ERROR: error reporting span \"sp2\": flush error\nERROR: error when flushing the buffer: flush error\n")
}
Expand All @@ -153,12 +153,12 @@ func TestRemoteReporterDroppedSpans(t *testing.T) {

s.metricsFactory.AssertCounterMetrics(t,
metricstest.ExpectedMetric{
Name: "jaeger_tracer.reporter_spans",
Name: "jaeger.tracer.reporter_spans",
Tags: map[string]string{"result": "ok"},
Value: 0,
},
metricstest.ExpectedMetric{
Name: "jaeger_tracer.reporter_spans",
Name: "jaeger.tracer.reporter_spans",
Tags: map[string]string{"result": "dropped"},
Value: 1,
},
Expand Down Expand Up @@ -250,8 +250,8 @@ func testRemoteReporterWithSender(
assert.Equal(t, "downstream", *tag.VStr)

metricsFactory.AssertCounterMetrics(t, []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.reporter_spans", Tags: map[string]string{"result": "ok"}, Value: 1},
{Name: "jaeger_tracer.reporter_spans", Tags: map[string]string{"result": "err"}, Value: 0},
{Name: "jaeger.tracer.reporter_spans", Tags: map[string]string{"result": "ok"}, Value: 1},
{Name: "jaeger.tracer.reporter_spans", Tags: map[string]string{"result": "err"}, Value: 0},
}...)
}

Expand Down
12 changes: 6 additions & 6 deletions sampler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ func TestRemotelyControlledSampler(t *testing.T) {
getSamplingStrategyResponse(sampling.SamplingStrategyType_PROBABILISTIC, testDefaultSamplingProbability))
remoteSampler.updateSampler()
metricsFactory.AssertCounterMetrics(t, []mTestutils.ExpectedMetric{
{Name: "jaeger_tracer.sampler_queries", Tags: map[string]string{"result": "ok"}, Value: 1},
{Name: "jaeger_tracer.sampler_updates", Tags: map[string]string{"result": "ok"}, Value: 1},
{Name: "jaeger.tracer.sampler_queries", Tags: map[string]string{"result": "ok"}, Value: 1},
{Name: "jaeger.tracer.sampler_updates", Tags: map[string]string{"result": "ok"}, Value: 1},
}...)
s1, ok := remoteSampler.getSampler().(*ProbabilisticSampler)
assert.True(t, ok)
Expand Down Expand Up @@ -428,7 +428,7 @@ func TestRemotelyControlledSampler_updateSampler(t *testing.T) {

metricsFactory.AssertCounterMetrics(t,
mTestutils.ExpectedMetric{
Name: "jaeger_tracer.sampler_updates", Tags: map[string]string{"result": "ok"}, Value: 1,
Name: "jaeger.tracer.sampler_updates", Tags: map[string]string{"result": "ok"}, Value: 1,
},
)

Expand Down Expand Up @@ -485,7 +485,7 @@ func TestSamplerQueryError(t *testing.T) {
assert.Equal(t, initSampler, sampler.sampler, "Sampler should not have been updated due to query error")

metricsFactory.AssertCounterMetrics(t,
mTestutils.ExpectedMetric{Name: "jaeger_tracer.sampler_queries", Tags: map[string]string{"result": "err"}, Value: 1},
mTestutils.ExpectedMetric{Name: "jaeger.tracer.sampler_queries", Tags: map[string]string{"result": "err"}, Value: 1},
)
}

Expand Down Expand Up @@ -538,8 +538,8 @@ func TestRemotelyControlledSampler_updateSamplerFromAdaptiveSampler(t *testing.T
remoteSampler.updateSampler()

metricsFactory.AssertCounterMetrics(t,
mTestutils.ExpectedMetric{Name: "jaeger_tracer.sampler_queries", Tags: map[string]string{"result": "ok"}, Value: 3},
mTestutils.ExpectedMetric{Name: "jaeger_tracer.sampler_updates", Tags: map[string]string{"result": "ok"}, Value: 3},
mTestutils.ExpectedMetric{Name: "jaeger.tracer.sampler_queries", Tags: map[string]string{"result": "ok"}, Value: 3},
mTestutils.ExpectedMetric{Name: "jaeger.tracer.sampler_updates", Tags: map[string]string{"result": "ok"}, Value: 3},
)
}

Expand Down
32 changes: 16 additions & 16 deletions tracer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ func (s *tracerSuite) TestBeginRootSpan() {
s.NotNil(ss.duration)

s.metricsFactory.AssertCounterMetrics(s.T(), []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.finished_spans", Value: 1},
{Name: "jaeger_tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 1},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 1},
{Name: "jaeger.tracer.finished_spans", Value: 1},
{Name: "jaeger.tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 1},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 1},
}...)
}

Expand All @@ -114,9 +114,9 @@ func (s *tracerSuite) TestStartChildSpan() {
s.NotNil(sp2.(*Span).duration)
sp1.Finish()
s.metricsFactory.AssertCounterMetrics(s.T(), []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 2},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 1},
{Name: "jaeger_tracer.finished_spans", Value: 2},
{Name: "jaeger.tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 2},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 1},
{Name: "jaeger.tracer.finished_spans", Value: 2},
}...)
}

Expand Down Expand Up @@ -145,9 +145,9 @@ func (s *tracerSuite) TestStartSpanWithMultipleReferences() {
sp2.Finish()
sp1.Finish()
s.metricsFactory.AssertCounterMetrics(s.T(), []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 4},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 3},
{Name: "jaeger_tracer.finished_spans", Value: 4},
{Name: "jaeger.tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 4},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 3},
{Name: "jaeger.tracer.finished_spans", Value: 4},
}...)
assert.Len(s.T(), sp4.(*Span).references, 3)
}
Expand All @@ -165,9 +165,9 @@ func (s *tracerSuite) TestStartSpanWithOnlyFollowFromReference() {
s.NotNil(sp2.(*Span).duration)
sp1.Finish()
s.metricsFactory.AssertCounterMetrics(s.T(), []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 2},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 1},
{Name: "jaeger_tracer.finished_spans", Value: 2},
{Name: "jaeger.tracer.started_spans", Tags: map[string]string{"sampled": "y"}, Value: 2},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"sampled": "y", "state": "started"}, Value: 1},
{Name: "jaeger.tracer.finished_spans", Value: 2},
}...)
assert.Len(s.T(), sp2.(*Span).references, 1)
}
Expand Down Expand Up @@ -195,10 +195,10 @@ func (s *tracerSuite) TestTraceStartedOrJoinedMetrics() {
s.Equal(test.sampled, sp2.Context().(SpanContext).IsSampled())

s.metricsFactory.AssertCounterMetrics(s.T(), []metricstest.ExpectedMetric{
{Name: "jaeger_tracer.started_spans", Tags: map[string]string{"sampled": test.label}, Value: 3},
{Name: "jaeger_tracer.finished_spans", Value: 3},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"sampled": test.label, "state": "started"}, Value: 1},
{Name: "jaeger_tracer.traces", Tags: map[string]string{"sampled": test.label, "state": "joined"}, Value: 1},
{Name: "jaeger.tracer.started_spans", Tags: map[string]string{"sampled": test.label}, Value: 3},
{Name: "jaeger.tracer.finished_spans", Value: 3},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"sampled": test.label, "state": "started"}, Value: 1},
{Name: "jaeger.tracer.traces", Tags: map[string]string{"sampled": test.label, "state": "joined"}, Value: 1},
}...)
}
}
Expand Down