Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

replace all imports of jaeger/thrift-gen/* with jaeger-idl/thrift-gen/* #6621

Merged
merged 3 commits into from
Jan 28, 2025
Merged

replace all imports of jaeger/thrift-gen/* with jaeger-idl/thrift-gen/* #6621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f2f05e
replace all imports of jaeger/thrift-gen/* with jaeger-idl/thrift-gen/*
danish9039 Jan 27, 2025
88911f5
Merge branch 'main' into replace-imports
danish9039 Jan 28, 2025
57e54dd
...
danish9039 Jan 28, 2025
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 cmd/agent/app/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/apache/thrift/lib/go/thrift"
"go.uber.org/zap"

agentThrift "github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
"github.com/jaegertracing/jaeger/cmd/agent/app/configmanager"
"github.com/jaegertracing/jaeger/cmd/agent/app/httpserver"
"github.com/jaegertracing/jaeger/cmd/agent/app/processors"
Expand All @@ -22,7 +23,6 @@ import (
"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
"github.com/jaegertracing/jaeger/internal/safeexpvar"
"github.com/jaegertracing/jaeger/pkg/metrics"
agentThrift "github.com/jaegertracing/jaeger/thrift-gen/agent"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
yaml "gopkg.in/yaml.v3"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/agent/app/configmanager"
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

var yamlConfig = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/app/processors/thrift_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
grpcrep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
"github.com/jaegertracing/jaeger/cmd/agent/app/servers"
"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/thrift-gen/agent"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

// TODO make these tests faster, they take almost 4 seconds
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/client_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/client_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zaptest/observer"

"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

type clientMetricsTest struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/reporter/grpc/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
yaml "gopkg.in/yaml.v3"

"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/pkg/discovery"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
)

var yamlConfig = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/reporter/grpc/collector_proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"google.golang.org/grpc"

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

var _ io.Closer = (*ProxyBuilder)(nil)
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/grpc/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
thrift "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
zipkin2 "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
jConverter "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
thrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

// Reporter reports data to collector over gRPC.
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/grpc/reporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
jThrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
jThrift "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

type mockSpanHandler struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package reporter
import (
"context"

"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

func TestMetricsReporter(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"context"
"errors"

"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

// Reporter handles spans received by Processor and forwards them to central
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/reporter/reporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

func TestMultiReporter(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/servers/tbuffered_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/agent/app/customtransport"
"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
"github.com/jaegertracing/jaeger/cmd/agent/app/testutils"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/thrift-gen/agent"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

func TestTBufferedServerSendReceive(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/testutils/in_memory_reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"context"
"sync"

"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

// InMemoryReporter collects spans in memory
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/app/testutils/in_memory_reporter_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/assert"
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

func TestInMemoryReporter(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/testutils/thriftudp_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/apache/thrift/lib/go/thrift"

"github.com/jaegertracing/jaeger-idl/thrift-gen/agent"
"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
"github.com/jaegertracing/jaeger/thrift-gen/agent"
)

// NewZipkinThriftUDPClient creates a new zipking agent client that works like Jaeger client
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/handler/http_thrift_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/apache/thrift/lib/go/thrift"
"github.com/gorilla/mux"

tJaeger "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
tJaeger "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/handler/http_thrift_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
jaegerClient "github.com/uber/jaeger-client-go"
"github.com/uber/jaeger-client-go/transport"

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

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/app/handler/thrift_span_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
zipkinS "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
jConv "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

// SubmitBatchOptions are passed to Submit methods of the handlers.
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/app/handler/thrift_span_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
zipkinsanitizer "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

func TestJaegerSpanHandler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/handler/zipkin_receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"

"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
zipkinthrift "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
"github.com/jaegertracing/jaeger/pkg/tenancy"
"github.com/jaegertracing/jaeger/pkg/testutils"
zipkin_proto3 "github.com/jaegertracing/jaeger/proto-gen/zipkin"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

func TestZipkinReceiver(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/sanitizer/zipkin/span_sanitizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
zc "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/stretchr/testify/assert"

"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/app/span_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
zc "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
zipkinsanitizer "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin"
Expand All @@ -31,8 +33,6 @@ import (
"github.com/jaegertracing/jaeger/pkg/tenancy"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/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 (
"fmt"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
)

// FromDomain takes an array of model.Span and returns
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/to_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
)

// ToDomain transforms a set of spans and a process in jaeger.thrift format into a slice of model.Span.
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/to_domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
"github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger"
)

const NumberOfFixtures = 2
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/zipkin/deserialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/apache/thrift/lib/go/thrift"

"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

// SerializeThrift is only used in tests.
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/zipkin/deserialize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

func TestDeserializeWithBadListStart(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/zipkin/to_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"go.opentelemetry.io/otel/trace"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/zipkin/to_domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/model/v1"
z "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
z "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
)

const NumberOfFixtures = 3
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/kafka/marshalling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore"
"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

func TestProtobufMarshallerAndUnmarshaller(t *testing.T) {
Expand Down
Loading