Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update import paths for jaeger thrift files to use jaeger-idl #6635

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Update import paths for jaeger thrift files to use jaeger-idl #6635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion model/converter/json/sampling_test.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading