Skip to content

Commit bc82281

Browse files
danish9039yurishkuro
authored andcommitted
Move pkg/metrics to internal/metrics (jaegertracing#6901)
## Which problem is this PR solving? - part of jaegertracing#6869 ## Description of the changes - moved `pkg/metrics` to `internal/metrics` ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: danish9039 <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: hippie-danish <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: amol-verma-allen <[email protected]>
1 parent 134c283 commit bc82281

File tree

120 files changed

+250
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+250
-111
lines changed

cmd/all-in-one/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
3232
"github.com/jaegertracing/jaeger/internal/config"
3333
"github.com/jaegertracing/jaeger/internal/jtracer"
34+
"github.com/jaegertracing/jaeger/internal/metrics"
3435
ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
3536
"github.com/jaegertracing/jaeger/internal/storage/metricstore"
3637
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
@@ -40,7 +41,6 @@ import (
4041
"github.com/jaegertracing/jaeger/internal/telemetry"
4142
"github.com/jaegertracing/jaeger/internal/tenancy"
4243
"github.com/jaegertracing/jaeger/internal/version"
43-
"github.com/jaegertracing/jaeger/pkg/metrics"
4444
"github.com/jaegertracing/jaeger/ports"
4545
)
4646

cmd/collector/app/collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
2020
"github.com/jaegertracing/jaeger/cmd/collector/app/server"
2121
"github.com/jaegertracing/jaeger/internal/healthcheck"
22+
"github.com/jaegertracing/jaeger/internal/metrics"
2223
"github.com/jaegertracing/jaeger/internal/safeexpvar"
2324
"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy"
2425
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
2526
"github.com/jaegertracing/jaeger/internal/tenancy"
26-
"github.com/jaegertracing/jaeger/pkg/metrics"
2727
)
2828

2929
const (

cmd/collector/app/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/jaegertracing/jaeger-idl/model/v1"
1515
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
16-
"github.com/jaegertracing/jaeger/pkg/metrics"
16+
"github.com/jaegertracing/jaeger/internal/metrics"
1717
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
1818
)
1919

cmd/collector/app/metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
"github.com/jaegertracing/jaeger-idl/model/v1"
1515
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
16+
jaegerM "github.com/jaegertracing/jaeger/internal/metrics"
1617
"github.com/jaegertracing/jaeger/internal/metricstest"
17-
jaegerM "github.com/jaegertracing/jaeger/pkg/metrics"
1818
)
1919

2020
func TestProcessorMetrics(t *testing.T) {

cmd/collector/app/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
1212
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
1313
"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
14-
"github.com/jaegertracing/jaeger/pkg/metrics"
14+
"github.com/jaegertracing/jaeger/internal/metrics"
1515
)
1616

1717
type options struct {

cmd/collector/app/options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/jaegertracing/jaeger-idl/model/v1"
1414
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
1515
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
16-
"github.com/jaegertracing/jaeger/pkg/metrics"
16+
"github.com/jaegertracing/jaeger/internal/metrics"
1717
)
1818

1919
func TestAllOptionSet(t *testing.T) {

cmd/collector/app/server/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414

1515
"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
1616
"github.com/jaegertracing/jaeger/internal/healthcheck"
17+
"github.com/jaegertracing/jaeger/internal/metrics"
1718
"github.com/jaegertracing/jaeger/internal/recoveryhandler"
1819
samplinghttp "github.com/jaegertracing/jaeger/internal/sampling/http"
1920
"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy"
2021
"github.com/jaegertracing/jaeger/internal/telemetry"
2122
"github.com/jaegertracing/jaeger/pkg/httpmetrics"
22-
"github.com/jaegertracing/jaeger/pkg/metrics"
2323
)
2424

2525
// HTTPServerParams to construct a new Jaeger Collector HTTP Server

cmd/collector/app/span_handler_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
1515
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
1616
zs "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
17+
"github.com/jaegertracing/jaeger/internal/metrics"
1718
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
1819
"github.com/jaegertracing/jaeger/internal/tenancy"
19-
"github.com/jaegertracing/jaeger/pkg/metrics"
2020
)
2121

2222
// SpanHandlerBuilder holds configuration required for handlers

cmd/collector/app/span_handler_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
1515
cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
1616
"github.com/jaegertracing/jaeger/internal/config"
17+
"github.com/jaegertracing/jaeger/internal/metrics"
1718
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1819
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
1920
"github.com/jaegertracing/jaeger/internal/tenancy"
20-
"github.com/jaegertracing/jaeger/pkg/metrics"
2121
)
2222

2323
func TestNewSpanHandlerBuilder(t *testing.T) {

cmd/collector/app/span_processor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ import (
4242
"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
4343
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
4444
zipkinsanitizer "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
45+
"github.com/jaegertracing/jaeger/internal/metrics"
4546
"github.com/jaegertracing/jaeger/internal/metricstest"
4647
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
4748
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
4849
"github.com/jaegertracing/jaeger/internal/tenancy"
4950
"github.com/jaegertracing/jaeger/internal/testutils"
50-
"github.com/jaegertracing/jaeger/pkg/metrics"
5151
)
5252

5353
var (

0 commit comments

Comments
 (0)