Skip to content

Commit

Permalink
Update import paths for jaeger thrift files to use jaeger-idl (jaeger…
Browse files Browse the repository at this point in the history
…tracing#6635)

## Which problem is this PR solving?
-
jaegertracing#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 <nabil.salah203@gmail.com>
  • Loading branch information
Nabil-Salah authored Jan 30, 2025
1 parent 17cdd33 commit 6d8c70e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion model/converter/json/sampling_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
api_v1 "github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
thriftconv "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
api_v1 "github.com/jaegertracing/jaeger/thrift-gen/sampling"
)

func TestSamplingStrategyResponseToJSON_Error(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/sampling_from_domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"math"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
)

// ConvertSamplingResponseFromDomain converts proto sampling response to its thrift representation.
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/sampling_from_domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
)

func TestConvertStrategyTypeFromDomain(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/sampling_to_domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
)

// ConvertSamplingResponseToDomain converts thrift sampling response to its proto representation.
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/sampling_to_domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/jaegertracing/jaeger/thrift-gen/sampling"
"github.com/jaegertracing/jaeger-idl/thrift-gen/sampling"
)

func TestConvertStrategyTypeToDomain(t *testing.T) {
Expand Down

0 comments on commit 6d8c70e

Please sign in to comment.