From 8f2f05e55896f0a9d4c018d9d8497e79a76ee9ea Mon Sep 17 00:00:00 2001 From: danish9039 Date: Mon, 27 Jan 2025 17:06:17 +0530 Subject: [PATCH 1/2] replace all imports of jaeger/thrift-gen/* with jaeger-idl/thrift-gen/* Signed-off-by: danish9039 --- cmd/agent/app/builder.go | 2 +- cmd/agent/app/builder_test.go | 4 ++-- cmd/agent/app/processors/thrift_processor_test.go | 6 +++--- cmd/agent/app/reporter/client_metrics.go | 4 ++-- cmd/agent/app/reporter/client_metrics_test.go | 4 ++-- cmd/agent/app/reporter/grpc/builder_test.go | 2 +- cmd/agent/app/reporter/grpc/collector_proxy_test.go | 2 +- cmd/agent/app/reporter/grpc/reporter.go | 4 ++-- cmd/agent/app/reporter/grpc/reporter_test.go | 4 ++-- cmd/agent/app/reporter/metrics.go | 4 ++-- cmd/agent/app/reporter/metrics_test.go | 4 ++-- cmd/agent/app/reporter/reporter.go | 4 ++-- cmd/agent/app/reporter/reporter_test.go | 4 ++-- cmd/agent/app/servers/tbuffered_server_test.go | 4 ++-- cmd/agent/app/testutils/in_memory_reporter.go | 4 ++-- cmd/agent/app/testutils/in_memory_reporter_test.go | 4 ++-- cmd/agent/app/testutils/thriftudp_client.go | 2 +- cmd/collector/app/handler/http_thrift_handler.go | 2 +- cmd/collector/app/handler/http_thrift_handler_test.go | 2 +- cmd/collector/app/handler/thrift_span_handler.go | 4 ++-- cmd/collector/app/handler/thrift_span_handler_test.go | 4 ++-- cmd/collector/app/handler/zipkin_receiver_test.go | 2 +- cmd/collector/app/sanitizer/zipkin/span_sanitizer.go | 2 +- cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go | 2 +- cmd/collector/app/span_processor_test.go | 4 ++-- model/converter/thrift/jaeger/from_domain.go | 2 +- model/converter/thrift/jaeger/to_domain.go | 2 +- model/converter/thrift/jaeger/to_domain_test.go | 2 +- model/converter/thrift/zipkin/deserialize.go | 2 +- model/converter/thrift/zipkin/deserialize_test.go | 2 +- model/converter/thrift/zipkin/to_domain.go | 2 +- model/converter/thrift/zipkin/to_domain_test.go | 2 +- plugin/storage/kafka/marshalling_test.go | 2 +- 33 files changed, 50 insertions(+), 50 deletions(-) diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go index c1d9ef90a15..b4526fb9dce 100644 --- a/cmd/agent/app/builder.go +++ b/cmd/agent/app/builder.go @@ -22,7 +22,7 @@ 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" + agentThrift "github.com/jaegertracing/jaeger-idl/thrift-gen/agent" ) const ( diff --git a/cmd/agent/app/builder_test.go b/cmd/agent/app/builder_test.go index 3595e1fb3bc..aba1da95562 100644 --- a/cmd/agent/app/builder_test.go +++ b/cmd/agent/app/builder_test.go @@ -26,8 +26,8 @@ import ( "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) var yamlConfig = ` diff --git a/cmd/agent/app/processors/thrift_processor_test.go b/cmd/agent/app/processors/thrift_processor_test.go index 3d50e507ded..583cb52aeb6 100644 --- a/cmd/agent/app/processors/thrift_processor_test.go +++ b/cmd/agent/app/processors/thrift_processor_test.go @@ -24,9 +24,9 @@ import ( "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/agent" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) // TODO make these tests faster, they take almost 4 seconds diff --git a/cmd/agent/app/reporter/client_metrics.go b/cmd/agent/app/reporter/client_metrics.go index 7b237582a5f..9c3d781e60b 100644 --- a/cmd/agent/app/reporter/client_metrics.go +++ b/cmd/agent/app/reporter/client_metrics.go @@ -12,8 +12,8 @@ import ( "go.uber.org/zap" "github.com/jaegertracing/jaeger/pkg/metrics" - "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" ) const ( diff --git a/cmd/agent/app/reporter/client_metrics_test.go b/cmd/agent/app/reporter/client_metrics_test.go index 46bae58f4b3..7ac6a34729f 100644 --- a/cmd/agent/app/reporter/client_metrics_test.go +++ b/cmd/agent/app/reporter/client_metrics_test.go @@ -16,8 +16,8 @@ import ( "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) type clientMetricsTest struct { diff --git a/cmd/agent/app/reporter/grpc/builder_test.go b/cmd/agent/app/reporter/grpc/builder_test.go index 1e6ebe4447f..f2c92518dc6 100644 --- a/cmd/agent/app/reporter/grpc/builder_test.go +++ b/cmd/agent/app/reporter/grpc/builder_test.go @@ -22,7 +22,7 @@ import ( "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" ) var yamlConfig = ` diff --git a/cmd/agent/app/reporter/grpc/collector_proxy_test.go b/cmd/agent/app/reporter/grpc/collector_proxy_test.go index a4fb588d342..038045f4ee4 100644 --- a/cmd/agent/app/reporter/grpc/collector_proxy_test.go +++ b/cmd/agent/app/reporter/grpc/collector_proxy_test.go @@ -18,7 +18,7 @@ import ( "github.com/jaegertracing/jaeger-idl/proto-gen/api_v2" "github.com/jaegertracing/jaeger/internal/metricstest" - "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" ) var _ io.Closer = (*ProxyBuilder)(nil) diff --git a/cmd/agent/app/reporter/grpc/reporter.go b/cmd/agent/app/reporter/grpc/reporter.go index 93a967d4816..51384b756e6 100644 --- a/cmd/agent/app/reporter/grpc/reporter.go +++ b/cmd/agent/app/reporter/grpc/reporter.go @@ -18,8 +18,8 @@ import ( 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" + thrift "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) // Reporter reports data to collector over gRPC. diff --git a/cmd/agent/app/reporter/grpc/reporter_test.go b/cmd/agent/app/reporter/grpc/reporter_test.go index f771adb990e..983083bbf7c 100644 --- a/cmd/agent/app/reporter/grpc/reporter_test.go +++ b/cmd/agent/app/reporter/grpc/reporter_test.go @@ -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 { diff --git a/cmd/agent/app/reporter/metrics.go b/cmd/agent/app/reporter/metrics.go index 9b29c3f59f4..9f820695d46 100644 --- a/cmd/agent/app/reporter/metrics.go +++ b/cmd/agent/app/reporter/metrics.go @@ -7,8 +7,8 @@ import ( "context" "github.com/jaegertracing/jaeger/pkg/metrics" - "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" ) const ( diff --git a/cmd/agent/app/reporter/metrics_test.go b/cmd/agent/app/reporter/metrics_test.go index 0edba65c6ed..56dd92dc5d1 100644 --- a/cmd/agent/app/reporter/metrics_test.go +++ b/cmd/agent/app/reporter/metrics_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" "github.com/jaegertracing/jaeger/internal/metricstest" - "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 TestMetricsReporter(t *testing.T) { diff --git a/cmd/agent/app/reporter/reporter.go b/cmd/agent/app/reporter/reporter.go index 0ce8fe95815..94b0fe88922 100644 --- a/cmd/agent/app/reporter/reporter.go +++ b/cmd/agent/app/reporter/reporter.go @@ -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 diff --git a/cmd/agent/app/reporter/reporter_test.go b/cmd/agent/app/reporter/reporter_test.go index 07cb1e69175..6692741895c 100644 --- a/cmd/agent/app/reporter/reporter_test.go +++ b/cmd/agent/app/reporter/reporter_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/jaegertracing/jaeger/cmd/agent/app/testutils" - "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 TestMultiReporter(t *testing.T) { diff --git a/cmd/agent/app/servers/tbuffered_server_test.go b/cmd/agent/app/servers/tbuffered_server_test.go index fbda3af694d..5c5a314ca7d 100644 --- a/cmd/agent/app/servers/tbuffered_server_test.go +++ b/cmd/agent/app/servers/tbuffered_server_test.go @@ -20,8 +20,8 @@ import ( "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/agent" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) func TestTBufferedServerSendReceive(t *testing.T) { diff --git a/cmd/agent/app/testutils/in_memory_reporter.go b/cmd/agent/app/testutils/in_memory_reporter.go index ad000448cb6..04404317698 100644 --- a/cmd/agent/app/testutils/in_memory_reporter.go +++ b/cmd/agent/app/testutils/in_memory_reporter.go @@ -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 diff --git a/cmd/agent/app/testutils/in_memory_reporter_test.go b/cmd/agent/app/testutils/in_memory_reporter_test.go index 1551ec7e8d5..21a47ae69cd 100644 --- a/cmd/agent/app/testutils/in_memory_reporter_test.go +++ b/cmd/agent/app/testutils/in_memory_reporter_test.go @@ -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) { diff --git a/cmd/agent/app/testutils/thriftudp_client.go b/cmd/agent/app/testutils/thriftudp_client.go index 959e4aa72b9..487619a5239 100644 --- a/cmd/agent/app/testutils/thriftudp_client.go +++ b/cmd/agent/app/testutils/thriftudp_client.go @@ -10,7 +10,7 @@ import ( "github.com/apache/thrift/lib/go/thrift" "github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp" - "github.com/jaegertracing/jaeger/thrift-gen/agent" + "github.com/jaegertracing/jaeger-idl/thrift-gen/agent" ) // NewZipkinThriftUDPClient creates a new zipking agent client that works like Jaeger client diff --git a/cmd/collector/app/handler/http_thrift_handler.go b/cmd/collector/app/handler/http_thrift_handler.go index 40d6fbcf494..079338f1460 100644 --- a/cmd/collector/app/handler/http_thrift_handler.go +++ b/cmd/collector/app/handler/http_thrift_handler.go @@ -15,7 +15,7 @@ import ( "github.com/gorilla/mux" "github.com/jaegertracing/jaeger/cmd/collector/app/processor" - tJaeger "github.com/jaegertracing/jaeger/thrift-gen/jaeger" + tJaeger "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" ) const ( diff --git a/cmd/collector/app/handler/http_thrift_handler_test.go b/cmd/collector/app/handler/http_thrift_handler_test.go index 743a9af5f73..b0e72fc4936 100644 --- a/cmd/collector/app/handler/http_thrift_handler_test.go +++ b/cmd/collector/app/handler/http_thrift_handler_test.go @@ -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 ( diff --git a/cmd/collector/app/handler/thrift_span_handler.go b/cmd/collector/app/handler/thrift_span_handler.go index 378e924d457..a3fa18fe041 100644 --- a/cmd/collector/app/handler/thrift_span_handler.go +++ b/cmd/collector/app/handler/thrift_span_handler.go @@ -14,8 +14,8 @@ import ( 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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) // SubmitBatchOptions are passed to Submit methods of the handlers. diff --git a/cmd/collector/app/handler/thrift_span_handler_test.go b/cmd/collector/app/handler/thrift_span_handler_test.go index 965fa3de2d9..708efcb8a02 100644 --- a/cmd/collector/app/handler/thrift_span_handler_test.go +++ b/cmd/collector/app/handler/thrift_span_handler_test.go @@ -19,8 +19,8 @@ import ( "github.com/jaegertracing/jaeger-idl/model/v1" "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) func TestJaegerSpanHandler(t *testing.T) { diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go index d6ad98c4319..26fa77fb318 100644 --- a/cmd/collector/app/handler/zipkin_receiver_test.go +++ b/cmd/collector/app/handler/zipkin_receiver_test.go @@ -28,7 +28,7 @@ import ( "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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) func TestZipkinReceiver(t *testing.T) { diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go index 1e9fb29e250..b38437fbe91 100644 --- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go +++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer.go @@ -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 ( diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go index b3cc9196cb7..72840544dda 100644 --- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go +++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/jaegertracing/jaeger/pkg/testutils" - "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) var ( diff --git a/cmd/collector/app/span_processor_test.go b/cmd/collector/app/span_processor_test.go index b9713701e42..2140b42f6d2 100644 --- a/cmd/collector/app/span_processor_test.go +++ b/cmd/collector/app/span_processor_test.go @@ -31,8 +31,8 @@ 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" + "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + zc "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) var ( diff --git a/model/converter/thrift/jaeger/from_domain.go b/model/converter/thrift/jaeger/from_domain.go index 047343159b6..7b68c5a326c 100644 --- a/model/converter/thrift/jaeger/from_domain.go +++ b/model/converter/thrift/jaeger/from_domain.go @@ -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 diff --git a/model/converter/thrift/jaeger/to_domain.go b/model/converter/thrift/jaeger/to_domain.go index 9f3c7621747..55c78a634c8 100644 --- a/model/converter/thrift/jaeger/to_domain.go +++ b/model/converter/thrift/jaeger/to_domain.go @@ -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. diff --git a/model/converter/thrift/jaeger/to_domain_test.go b/model/converter/thrift/jaeger/to_domain_test.go index d1b2af6821b..12a833b733a 100644 --- a/model/converter/thrift/jaeger/to_domain_test.go +++ b/model/converter/thrift/jaeger/to_domain_test.go @@ -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 diff --git a/model/converter/thrift/zipkin/deserialize.go b/model/converter/thrift/zipkin/deserialize.go index 7f581895e30..931bc314d6b 100644 --- a/model/converter/thrift/zipkin/deserialize.go +++ b/model/converter/thrift/zipkin/deserialize.go @@ -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. diff --git a/model/converter/thrift/zipkin/deserialize_test.go b/model/converter/thrift/zipkin/deserialize_test.go index 10822494d32..2e09d01f908 100644 --- a/model/converter/thrift/zipkin/deserialize_test.go +++ b/model/converter/thrift/zipkin/deserialize_test.go @@ -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) { diff --git a/model/converter/thrift/zipkin/to_domain.go b/model/converter/thrift/zipkin/to_domain.go index 610b92b112a..970f5732f48 100644 --- a/model/converter/thrift/zipkin/to_domain.go +++ b/model/converter/thrift/zipkin/to_domain.go @@ -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 ( diff --git a/model/converter/thrift/zipkin/to_domain_test.go b/model/converter/thrift/zipkin/to_domain_test.go index f68789f974e..3189fc61e7e 100644 --- a/model/converter/thrift/zipkin/to_domain_test.go +++ b/model/converter/thrift/zipkin/to_domain_test.go @@ -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 diff --git a/plugin/storage/kafka/marshalling_test.go b/plugin/storage/kafka/marshalling_test.go index de174b791ce..b6696752d85 100644 --- a/plugin/storage/kafka/marshalling_test.go +++ b/plugin/storage/kafka/marshalling_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" - "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) func TestProtobufMarshallerAndUnmarshaller(t *testing.T) { From 57e54dd5d9085e342b97086abb8d8f0a8018b6a2 Mon Sep 17 00:00:00 2001 From: danish9039 Date: Tue, 28 Jan 2025 12:53:17 +0530 Subject: [PATCH 2/2] ... Signed-off-by: danish9039 --- cmd/agent/app/builder.go | 2 +- cmd/agent/app/builder_test.go | 4 ++-- cmd/agent/app/processors/thrift_processor_test.go | 6 +++--- cmd/agent/app/reporter/client_metrics.go | 2 +- cmd/agent/app/reporter/client_metrics_test.go | 4 ++-- cmd/agent/app/reporter/grpc/builder_test.go | 2 +- cmd/agent/app/reporter/grpc/collector_proxy_test.go | 2 +- cmd/agent/app/reporter/grpc/reporter.go | 4 ++-- cmd/agent/app/reporter/metrics.go | 2 +- cmd/agent/app/reporter/metrics_test.go | 2 +- cmd/agent/app/reporter/reporter_test.go | 2 +- cmd/agent/app/servers/tbuffered_server_test.go | 4 ++-- cmd/agent/app/testutils/thriftudp_client.go | 2 +- cmd/collector/app/handler/http_thrift_handler.go | 2 +- cmd/collector/app/handler/thrift_span_handler.go | 4 ++-- cmd/collector/app/handler/thrift_span_handler_test.go | 4 ++-- cmd/collector/app/handler/zipkin_receiver_test.go | 2 +- cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go | 2 +- cmd/collector/app/span_processor_test.go | 4 ++-- plugin/storage/kafka/marshalling_test.go | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go index b4526fb9dce..50a1c755a32 100644 --- a/cmd/agent/app/builder.go +++ b/cmd/agent/app/builder.go @@ -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" @@ -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-idl/thrift-gen/agent" ) const ( diff --git a/cmd/agent/app/builder_test.go b/cmd/agent/app/builder_test.go index aba1da95562..a4472374f27 100644 --- a/cmd/agent/app/builder_test.go +++ b/cmd/agent/app/builder_test.go @@ -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-idl/thrift-gen/jaeger" - "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) var yamlConfig = ` diff --git a/cmd/agent/app/processors/thrift_processor_test.go b/cmd/agent/app/processors/thrift_processor_test.go index 583cb52aeb6..13551f8ccce 100644 --- a/cmd/agent/app/processors/thrift_processor_test.go +++ b/cmd/agent/app/processors/thrift_processor_test.go @@ -17,6 +17,9 @@ 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" @@ -24,9 +27,6 @@ import ( "github.com/jaegertracing/jaeger/cmd/agent/app/testutils" "github.com/jaegertracing/jaeger/internal/metricstest" "github.com/jaegertracing/jaeger/pkg/metrics" - "github.com/jaegertracing/jaeger-idl/thrift-gen/agent" - "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" - "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) // TODO make these tests faster, they take almost 4 seconds diff --git a/cmd/agent/app/reporter/client_metrics.go b/cmd/agent/app/reporter/client_metrics.go index 9c3d781e60b..b804cf34fae 100644 --- a/cmd/agent/app/reporter/client_metrics.go +++ b/cmd/agent/app/reporter/client_metrics.go @@ -11,9 +11,9 @@ import ( "go.uber.org/zap" - "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/pkg/metrics" ) const ( diff --git a/cmd/agent/app/reporter/client_metrics_test.go b/cmd/agent/app/reporter/client_metrics_test.go index 7ac6a34729f..667de0ea2cf 100644 --- a/cmd/agent/app/reporter/client_metrics_test.go +++ b/cmd/agent/app/reporter/client_metrics_test.go @@ -14,10 +14,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/jaegertracing/jaeger/cmd/agent/app/testutils" - "github.com/jaegertracing/jaeger/internal/metricstest" "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" ) type clientMetricsTest struct { diff --git a/cmd/agent/app/reporter/grpc/builder_test.go b/cmd/agent/app/reporter/grpc/builder_test.go index f2c92518dc6..1e730ec434e 100644 --- a/cmd/agent/app/reporter/grpc/builder_test.go +++ b/cmd/agent/app/reporter/grpc/builder_test.go @@ -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-idl/thrift-gen/jaeger" ) var yamlConfig = ` diff --git a/cmd/agent/app/reporter/grpc/collector_proxy_test.go b/cmd/agent/app/reporter/grpc/collector_proxy_test.go index 038045f4ee4..8c844786b5e 100644 --- a/cmd/agent/app/reporter/grpc/collector_proxy_test.go +++ b/cmd/agent/app/reporter/grpc/collector_proxy_test.go @@ -17,8 +17,8 @@ import ( "google.golang.org/grpc" "github.com/jaegertracing/jaeger-idl/proto-gen/api_v2" - "github.com/jaegertracing/jaeger/internal/metricstest" "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/internal/metricstest" ) var _ io.Closer = (*ProxyBuilder)(nil) diff --git a/cmd/agent/app/reporter/grpc/reporter.go b/cmd/agent/app/reporter/grpc/reporter.go index 51384b756e6..14446daac6b 100644 --- a/cmd/agent/app/reporter/grpc/reporter.go +++ b/cmd/agent/app/reporter/grpc/reporter.go @@ -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-idl/thrift-gen/jaeger" - "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) // Reporter reports data to collector over gRPC. diff --git a/cmd/agent/app/reporter/metrics.go b/cmd/agent/app/reporter/metrics.go index 9f820695d46..12145e7816c 100644 --- a/cmd/agent/app/reporter/metrics.go +++ b/cmd/agent/app/reporter/metrics.go @@ -6,9 +6,9 @@ package reporter import ( "context" - "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/pkg/metrics" ) const ( diff --git a/cmd/agent/app/reporter/metrics_test.go b/cmd/agent/app/reporter/metrics_test.go index 56dd92dc5d1..1043708e707 100644 --- a/cmd/agent/app/reporter/metrics_test.go +++ b/cmd/agent/app/reporter/metrics_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/jaegertracing/jaeger/internal/metricstest" "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/internal/metricstest" ) func TestMetricsReporter(t *testing.T) { diff --git a/cmd/agent/app/reporter/reporter_test.go b/cmd/agent/app/reporter/reporter_test.go index 6692741895c..c424574fce1 100644 --- a/cmd/agent/app/reporter/reporter_test.go +++ b/cmd/agent/app/reporter/reporter_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/jaegertracing/jaeger/cmd/agent/app/testutils" "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/cmd/agent/app/testutils" ) func TestMultiReporter(t *testing.T) { diff --git a/cmd/agent/app/servers/tbuffered_server_test.go b/cmd/agent/app/servers/tbuffered_server_test.go index 5c5a314ca7d..55e1647b8fe 100644 --- a/cmd/agent/app/servers/tbuffered_server_test.go +++ b/cmd/agent/app/servers/tbuffered_server_test.go @@ -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-idl/thrift-gen/agent" - "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) func TestTBufferedServerSendReceive(t *testing.T) { diff --git a/cmd/agent/app/testutils/thriftudp_client.go b/cmd/agent/app/testutils/thriftudp_client.go index 487619a5239..199d4386c86 100644 --- a/cmd/agent/app/testutils/thriftudp_client.go +++ b/cmd/agent/app/testutils/thriftudp_client.go @@ -9,8 +9,8 @@ import ( "github.com/apache/thrift/lib/go/thrift" - "github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp" "github.com/jaegertracing/jaeger-idl/thrift-gen/agent" + "github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp" ) // NewZipkinThriftUDPClient creates a new zipking agent client that works like Jaeger client diff --git a/cmd/collector/app/handler/http_thrift_handler.go b/cmd/collector/app/handler/http_thrift_handler.go index 079338f1460..83a15c818c1 100644 --- a/cmd/collector/app/handler/http_thrift_handler.go +++ b/cmd/collector/app/handler/http_thrift_handler.go @@ -14,8 +14,8 @@ import ( "github.com/apache/thrift/lib/go/thrift" "github.com/gorilla/mux" - "github.com/jaegertracing/jaeger/cmd/collector/app/processor" tJaeger "github.com/jaegertracing/jaeger-idl/thrift-gen/jaeger" + "github.com/jaegertracing/jaeger/cmd/collector/app/processor" ) const ( diff --git a/cmd/collector/app/handler/thrift_span_handler.go b/cmd/collector/app/handler/thrift_span_handler.go index a3fa18fe041..76b40fc516e 100644 --- a/cmd/collector/app/handler/thrift_span_handler.go +++ b/cmd/collector/app/handler/thrift_span_handler.go @@ -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-idl/thrift-gen/jaeger" - "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) // SubmitBatchOptions are passed to Submit methods of the handlers. diff --git a/cmd/collector/app/handler/thrift_span_handler_test.go b/cmd/collector/app/handler/thrift_span_handler_test.go index 708efcb8a02..2b46e0bab3b 100644 --- a/cmd/collector/app/handler/thrift_span_handler_test.go +++ b/cmd/collector/app/handler/thrift_span_handler_test.go @@ -17,10 +17,10 @@ import ( "go.uber.org/zap" "github.com/jaegertracing/jaeger-idl/model/v1" - "github.com/jaegertracing/jaeger/cmd/collector/app/processor" - zipkinsanitizer "github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer/zipkin" "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" ) func TestJaegerSpanHandler(t *testing.T) { diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go index 26fa77fb318..50b1504b658 100644 --- a/cmd/collector/app/handler/zipkin_receiver_test.go +++ b/cmd/collector/app/handler/zipkin_receiver_test.go @@ -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-idl/thrift-gen/zipkincore" ) func TestZipkinReceiver(t *testing.T) { diff --git a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go index 72840544dda..b8dd9e36e46 100644 --- a/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go +++ b/cmd/collector/app/sanitizer/zipkin/span_sanitizer_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/jaegertracing/jaeger/pkg/testutils" "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/pkg/testutils" ) var ( diff --git a/cmd/collector/app/span_processor_test.go b/cmd/collector/app/span_processor_test.go index 2140b42f6d2..cec4dc0f215 100644 --- a/cmd/collector/app/span_processor_test.go +++ b/cmd/collector/app/span_processor_test.go @@ -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" @@ -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-idl/thrift-gen/jaeger" - zc "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" ) var ( diff --git a/plugin/storage/kafka/marshalling_test.go b/plugin/storage/kafka/marshalling_test.go index b6696752d85..7ea7b90cdbd 100644 --- a/plugin/storage/kafka/marshalling_test.go +++ b/plugin/storage/kafka/marshalling_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" "github.com/jaegertracing/jaeger-idl/thrift-gen/zipkincore" + "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" ) func TestProtobufMarshallerAndUnmarshaller(t *testing.T) {