diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go index f2cbff9160e..a477c970bf1 100644 --- a/cmd/collector/app/handler/zipkin_receiver.go +++ b/cmd/collector/app/handler/zipkin_receiver.go @@ -69,6 +69,9 @@ func startZipkinReceiver( } consumerAdapter := newConsumerDelegate(logger, spanProcessor, tm) + // reset Zipkin spanFormat + consumerAdapter.batchConsumer.spanOptions.SpanFormat = processor.ZipkinSpanFormat + nextConsumer, err := newTraces(consumerAdapter.consume) if err != nil { return nil, fmt.Errorf("could not create Zipkin consumer: %w", err) diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go index 8d783588de6..54abedd1964 100644 --- a/cmd/collector/app/handler/zipkin_receiver_test.go +++ b/cmd/collector/app/handler/zipkin_receiver_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/receiver" "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" @@ -126,6 +127,7 @@ func TestZipkinReceiver(t *testing.T) { t.Logf("response: %s %s", response.Status, string(bodyBytes)) } require.NoError(t, response.Body.Close()) + require.Equal(t, processor.ZipkinSpanFormat, spanProcessor.getSpanFormat()) }) } }