Skip to content

Commit

Permalink
Rename prometheus/metricsstore To prometheus/metricstore
Browse files Browse the repository at this point in the history
Signed-off-by: Mahad Zaryab <[email protected]>
  • Loading branch information
mahadzaryab1 committed Dec 2, 2024
1 parent 21be594 commit 2c782e1
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions cmd/query/app/http_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -693,31 +693,31 @@ func TestGetMetricsSuccess(t *testing.T) {
name: "latencies",
urlPath: "/api/metrics/latencies?service=emailservice&quantile=0.95",
mockedQueryMethod: "GetLatencies",
mockedQueryMethodParamType: "*metricsstore.LatenciesQueryParameters",
mockedQueryMethodParamType: "*metricstore.LatenciesQueryParameters",
},
{
name: "call rates",
urlPath: "/api/metrics/calls?service=emailservice",
mockedQueryMethod: "GetCallRates",
mockedQueryMethodParamType: "*metricsstore.CallRateQueryParameters",
mockedQueryMethodParamType: "*metricstore.CallRateQueryParameters",
},
{
name: "error rates",
urlPath: "/api/metrics/errors?service=emailservice",
mockedQueryMethod: "GetErrorRates",
mockedQueryMethodParamType: "*metricsstore.ErrorRateQueryParameters",
mockedQueryMethodParamType: "*metricstore.ErrorRateQueryParameters",
},
{
name: "error rates with pretty print",
urlPath: "/api/metrics/errors?service=emailservice&prettyPrint=true",
mockedQueryMethod: "GetErrorRates",
mockedQueryMethodParamType: "*metricsstore.ErrorRateQueryParameters",
mockedQueryMethodParamType: "*metricstore.ErrorRateQueryParameters",
},
{
name: "error rates with spanKinds",
urlPath: "/api/metrics/errors?service=emailservice&spanKind=client",
mockedQueryMethod: "GetErrorRates",
mockedQueryMethodParamType: "*metricsstore.ErrorRateQueryParameters",
mockedQueryMethodParamType: "*metricstore.ErrorRateQueryParameters",
},
} {
t.Run(tc.name, func(t *testing.T) {
Expand Down Expand Up @@ -754,14 +754,14 @@ func TestMetricsReaderError(t *testing.T) {
{
urlPath: "/api/metrics/calls?service=emailservice",
mockedQueryMethod: "GetCallRates",
mockedQueryMethodParamType: "*metricsstore.CallRateQueryParameters",
mockedQueryMethodParamType: "*metricstore.CallRateQueryParameters",
mockedResponse: nil,
wantErrorMessage: "error fetching call rates",
},
{
urlPath: "/api/metrics/minstep",
mockedQueryMethod: "GetMinStepDuration",
mockedQueryMethodParamType: "*metricsstore.MinStepDurationQueryParameters",
mockedQueryMethodParamType: "*metricstore.MinStepDurationQueryParameters",
mockedResponse: time.Duration(0),
wantErrorMessage: "error fetching min step duration",
},
Expand Down Expand Up @@ -826,7 +826,7 @@ func TestGetMinStep(t *testing.T) {
metricsReader.On(
"GetMinStepDuration",
mock.AnythingOfType("*context.valueCtx"),
mock.AnythingOfType("*metricsstore.MinStepDurationQueryParameters"),
mock.AnythingOfType("*metricstore.MinStepDurationQueryParameters"),
).Return(5*time.Millisecond, nil).Once()

// Test
Expand Down
2 changes: 1 addition & 1 deletion plugin/metricstore/prometheus/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin"
prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricsstore"
prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore"
"github.com/jaegertracing/jaeger/storage/metricstore"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2021 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metricsstore
package metricstore

import (
"context"
Expand All @@ -24,7 +24,7 @@ import (
"github.com/jaegertracing/jaeger/pkg/bearertoken"
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
"github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricsstore/dbmodel"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore/dbmodel"
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
"github.com/jaegertracing/jaeger/storage/metricstore"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2021 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metricsstore
package metricstore

import (
"context"
Expand Down

0 comments on commit 2c782e1

Please sign in to comment.