Skip to content

Commit 6d4d7c4

Browse files
Nabil-SalahNabil-Salah
authored
Use jeager-idl/proto-gen/api_v2 (#6609)
## Which problem is this PR solving? - part of #6494 ## Description of the changes - replace model proto-gen_api_v2 imports to use jaeger-idl proto-gen/api_v2 imports - Prohibit dependencies on github.com/jaegertracing/jaeger/proto-gen/api_v2 via linter ## How was this change tested? - `make test` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] 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: nabil salah <[email protected]>
1 parent 7168853 commit 6d4d7c4

Some content is hidden

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

48 files changed

+49
-47
lines changed

‎.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ linters-settings:
125125
desc: "Use errors.Join instead of github.com/hashicorp/go-multierror"
126126
- pkg: "github.com/jaegertracing/jaeger/model$"
127127
desc: "Use github.com/jaegertracing/jaeger-idl/model/v1"
128+
- pkg: "github.com/jaegertracing/jaeger/proto-gen/api_v2$"
129+
desc: "Use github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
128130
# crossdock-go provides assert/require similar to stretchr/testify
129131
# but we never want to use them outside of the crossdock tests.
130132
disallow-crossdock:

‎cmd/agent/app/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"go.uber.org/zap"
2121
yaml "gopkg.in/yaml.v3"
2222

23+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
2324
"github.com/jaegertracing/jaeger/cmd/agent/app/configmanager"
2425
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
2526
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
2627
"github.com/jaegertracing/jaeger/internal/metricstest"
2728
"github.com/jaegertracing/jaeger/pkg/metrics"
28-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
2929
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
3030
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
3131
)

‎cmd/agent/app/configmanager/grpc/manager.go

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

1010
"google.golang.org/grpc"
1111

12-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
12+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1313
)
1414

1515
// ConfigManagerProxy returns sampling decisions from collector over gRPC.

‎cmd/agent/app/configmanager/grpc/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"google.golang.org/grpc"
1414
"google.golang.org/grpc/credentials/insecure"
1515

16+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1617
"github.com/jaegertracing/jaeger/pkg/testutils"
17-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
1818
)
1919

2020
func TestSamplingManager_GetSamplingStrategy(t *testing.T) {

‎cmd/agent/app/configmanager/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package configmanager
77
import (
88
"context"
99

10-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
10+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1111
)
1212

1313
// TODO this interface could be moved to pkg/clientcfg, along with grpc proxy,

‎cmd/agent/app/configmanager/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package configmanager
66
import (
77
"context"
88

9+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
910
"github.com/jaegertracing/jaeger/pkg/metrics"
10-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
1111
)
1212

1313
// configManagerMetrics holds metrics related to ClientConfigManager

‎cmd/agent/app/configmanager/metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"github.com/stretchr/testify/require"
1313

14+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1415
"github.com/jaegertracing/jaeger/internal/metricstest"
1516
"github.com/jaegertracing/jaeger/pkg/testutils"
16-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
1717
)
1818

1919
type noopManager struct{}

‎cmd/agent/app/reporter/grpc/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"google.golang.org/grpc/credentials"
1919
yaml "gopkg.in/yaml.v3"
2020

21+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
2122
"github.com/jaegertracing/jaeger/internal/metricstest"
2223
"github.com/jaegertracing/jaeger/pkg/discovery"
2324
"github.com/jaegertracing/jaeger/pkg/metrics"
24-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
2525
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
2626
)
2727

‎cmd/agent/app/reporter/grpc/collector_proxy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"go.uber.org/zap"
1717
"google.golang.org/grpc"
1818

19+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1920
"github.com/jaegertracing/jaeger/internal/metricstest"
20-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
2121
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
2222
)
2323

‎cmd/agent/app/reporter/grpc/reporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"google.golang.org/grpc/status"
1515

1616
"github.com/jaegertracing/jaeger-idl/model/v1"
17+
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1718
zipkin2 "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
1819
jConverter "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
1920
"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
20-
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
2121
thrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
2222
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
2323
)

0 commit comments

Comments
 (0)