Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: Add OTEL tracer to metricsstore reader component #4595

Merged
merged 13 commits into from Jul 29, 2023
Merged

feat: Add OTEL tracer to metricsstore reader component #4595

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1faf91e
adds otel tracer to metrics reader component
afzal442 Jul 23, 2023
faaecd4
updates the tracer to use global tp
afzal442 Jul 24, 2023
ec7d45d
adds condition to jt closer
afzal442 Jul 25, 2023
ffcc85e
adds tp to main and creates tp in test
afzal442 Jul 25, 2023
4852cec
adds exporter.GetSpan() to test recorded spans
afzal442 Jul 25, 2023
a6b2884
fixes the span creation for query
afzal442 Jul 26, 2023
09b3fbf
fixes the shutdown issue
afzal442 Jul 26, 2023
a0dcb35
validates the no. of spans reported
afzal442 Jul 27, 2023
e279905
reorders the defer to execute the close
afzal442 Jul 27, 2023
4319e62
fixes spans reported err
afzal442 Jul 27, 2023
3295970
moves defer to its obj creation
afzal442 Jul 27, 2023
abeeeb6
reorders the assert in the sequence call
afzal442 Jul 28, 2023
7d4624b
sets the span status
afzal442 Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 23 additions & 28 deletions plugin/metrics/prometheus/metricsstore/reader_test.go
View file
Open in desktop
Expand Up @@ -64,14 +64,14 @@ var defaultConfig = config.Configuration{
LatencyUnit: "ms",
}

func tracerProvider(t *testing.T) (trace.TracerProvider, *tracetest.InMemoryExporter, func(ctx context.Context) error) {
func tracerProvider(t *testing.T) (trace.TracerProvider, *tracetest.InMemoryExporter, func()) {
exporter := tracetest.NewInMemoryExporter()
tp := sdktrace.NewTracerProvider(
sdktrace.WithSampler(sdktrace.AlwaysSample()),
sdktrace.WithSyncer(exporter),
)
closer := func(ctx context.Context) error {
return tp.Shutdown(ctx)
closer := func() {
assert.NoError(t, tp.Shutdown(context.Background()))
}
return tp, exporter, closer
}
Expand All @@ -85,8 +85,7 @@ func TestNewMetricsReaderValidAddress(t *testing.T) {
}, logger, tracer)
require.NoError(t, err)
assert.NotNil(t, reader)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
}

func TestNewMetricsReaderInvalidAddress(t *testing.T) {
Expand All @@ -99,8 +98,7 @@ func TestNewMetricsReaderInvalidAddress(t *testing.T) {
require.Error(t, err)
assert.Contains(t, err.Error(), "failed to initialize prometheus client")
assert.Nil(t, reader)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
afzal442 marked this conversation as resolved.
Show resolved Hide resolved
}

func TestGetMinStepDuration(t *testing.T) {
Expand All @@ -120,8 +118,7 @@ func TestGetMinStepDuration(t *testing.T) {
minStep, err := reader.GetMinStepDuration(context.Background(), &params)
require.NoError(t, err)
assert.Equal(t, time.Millisecond, minStep)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
}

func TestMetricsServerError(t *testing.T) {
Expand Down Expand Up @@ -155,11 +152,11 @@ func TestMetricsServerError(t *testing.T) {

m, err := reader.GetCallRates(context.Background(), &params)
assert.NotNil(t, m)
assert.NotEmpty(t, exp.GetSpans(), "No spans recorded during the test.")
require.Error(t, err)
assert.Contains(t, err.Error(), "failed executing metrics query")
err = closer(context.Background())
require.NoError(t, err)
assert.NotEmpty(t, exp.GetSpans(), "Expected spans are recorded")
assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
defer closer()
}

func TestGetLatencies(t *testing.T) {
Expand Down Expand Up @@ -258,10 +255,10 @@ func TestGetLatencies(t *testing.T) {

m, err := reader.GetLatencies(context.Background(), &params)
require.NoError(t, err)
assert.NotEmpty(t, exp.GetSpans(), "No spans recorded during the test.")
assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
assertMetrics(t, m, tc.wantLabels, tc.wantName, tc.wantDescription)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
})
}
}
Expand Down Expand Up @@ -359,10 +356,10 @@ func TestGetCallRates(t *testing.T) {

m, err := reader.GetCallRates(context.Background(), &params)
require.NoError(t, err)
assert.NotEmpty(t, exp.GetSpans(), "No spans recorded during the test.")
assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
afzal442 marked this conversation as resolved.
Show resolved Hide resolved
assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
assertMetrics(t, m, tc.wantLabels, tc.wantName, tc.wantDescription)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
})
}
}
Expand Down Expand Up @@ -485,10 +482,10 @@ func TestGetErrorRates(t *testing.T) {

m, err := reader.GetErrorRates(context.Background(), &params)
require.NoError(t, err)
assert.NotEmpty(t, exp.GetSpans(), "No spans recorded during the test.")
assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
assertMetrics(t, m, tc.wantLabels, tc.wantName, tc.wantDescription)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
})
}
}
Expand All @@ -506,8 +503,7 @@ func TestInvalidLatencyUnit(t *testing.T) {
LatencyUnit: "something invalid",
}
_, _ = NewMetricsReader(cfg, zap.NewNop(), tracer)
err := closer(context.Background())
require.NoError(t, err)
defer closer()
}

func TestWarningResponse(t *testing.T) {
Expand All @@ -520,10 +516,10 @@ func TestWarningResponse(t *testing.T) {

m, err := reader.GetErrorRates(context.Background(), &params)
require.NoError(t, err)
assert.NotEmpty(t, exp.GetSpans(), "No spans recorded during the test.")
assert.NotEmpty(t, exp.GetSpans(), "Spans recorded during the test.")
assert.Len(t, exp.GetSpans(), 1, "HTTP request was traced and span reported")
assert.NotNil(t, m)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
}

func TestGetRoundTripperTLSConfig(t *testing.T) {
Expand Down Expand Up @@ -628,8 +624,7 @@ func TestInvalidCertFile(t *testing.T) {
}, logger, tracer)
require.Error(t, err)
assert.Nil(t, reader)
err = closer(context.Background())
require.NoError(t, err)
defer closer()
}

func startMockPrometheusServer(t *testing.T, wantPromQlQuery string, wantWarnings []string) *httptest.Server {
Expand Down