Skip to content

Commit 6d8c70e

Browse files
authored
Update import paths for jaeger thrift files to use jaeger-idl (#6635)
## Which problem is this PR solving? - #6617 (comment) ## Description of the changes - replace use of jaeger-idl/thrift-gen/sampling imports ## How was this change tested? - `make test lint' ## 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 17cdd33 commit 6d8c70e

5 files changed

+5
-5
lines changed

model/converter/json/sampling_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
14+
api_v1 "github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
1415
thriftconv "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
15-
api_v1 "github.com/jaegertracing/jaeger/thrift-gen/sampling"
1616
)
1717

1818
func TestSamplingStrategyResponseToJSON_Error(t *testing.T) {

model/converter/thrift/jaeger/sampling_from_domain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"math"
99

1010
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
11-
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
11+
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
1212
)
1313

1414
// ConvertSamplingResponseFromDomain converts proto sampling response to its thrift representation.

model/converter/thrift/jaeger/sampling_from_domain_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
14-
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
14+
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
1515
)
1616

1717
func TestConvertStrategyTypeFromDomain(t *testing.T) {

model/converter/thrift/jaeger/sampling_to_domain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"errors"
88

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

1313
// ConvertSamplingResponseToDomain converts thrift sampling response to its proto representation.

model/converter/thrift/jaeger/sampling_to_domain_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
14-
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
14+
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
1515
)
1616

1717
func TestConvertStrategyTypeToDomain(t *testing.T) {

0 commit comments

Comments
 (0)