Move model/converter to internal/converter

cmd/anonymizer/app/anonymizer/anonymizer.go

@@ -16,7 +16,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
-	uiconv "github.com/jaegertracing/jaeger/model/converter/json"
+	uiconv "github.com/jaegertracing/jaeger/internal/converter/json"
 	uimodel "github.com/jaegertracing/jaeger/model/json"
 )
 

cmd/collector/app/handler/thrift_span_handler.go

@@ -15,7 +15,7 @@ import (
 	"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"
+	jConv "github.com/jaegertracing/jaeger/internal/converter/thrift/jaeger"
 )
 
 // SubmitBatchOptions are passed to Submit methods of the handlers.

cmd/query/app/http_handler.go

@@ -24,11 +24,11 @@ import (
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/cmd/query/app/qualitymetrics"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
+	uiconv "github.com/jaegertracing/jaeger/internal/converter/json"
 	"github.com/jaegertracing/jaeger/internal/jtracer"
 	"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
-	uiconv "github.com/jaegertracing/jaeger/model/converter/json"
 	ui "github.com/jaegertracing/jaeger/model/json"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
 )

crossdock/services/agent.go

@@ -13,7 +13,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	p2json "github.com/jaegertracing/jaeger/model/converter/json"
+	p2json "github.com/jaegertracing/jaeger/internal/converter/json"
 )
 
 var errSamplingRateMissing = errors.New("sampling rate is missing")

crossdock/services/agent_test.go

@@ -14,7 +14,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	p2json "github.com/jaegertracing/jaeger/model/converter/json"
+	p2json "github.com/jaegertracing/jaeger/internal/converter/json"
 )
 
 var testResponse = &api_v2.SamplingStrategyResponse{

model/converter/json/sampling_test.go → internal/converter/json/sampling_test.go

@@ -12,7 +12,7 @@ import (
 
 	"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"
+	thriftconv "github.com/jaegertracing/jaeger/internal/converter/thrift/jaeger"
 )
 
 func TestSamplingStrategyResponseToJSON_Error(t *testing.T) {

internal/sampling/http/handler.go

@@ -15,8 +15,8 @@ import (
 	"github.com/gorilla/mux"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	p2json "github.com/jaegertracing/jaeger/model/converter/json"
-	t2p "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger"
+	p2json "github.com/jaegertracing/jaeger/internal/converter/json"
+	t2p "github.com/jaegertracing/jaeger/internal/converter/thrift/jaeger"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 )
 

internal/sampling/http/handler_test.go

@@ -18,9 +18,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
+	p2json "github.com/jaegertracing/jaeger/internal/converter/json"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
 	tSampling092 "github.com/jaegertracing/jaeger/internal/sampling/http/thrift-0.9.2"
-	p2json "github.com/jaegertracing/jaeger/model/converter/json"
 )
 
 type testServer struct {

pkg/gogocodec/codec_test.go

@@ -77,7 +77,7 @@ func TestUseGogo(t *testing.T) {
 }
 
 func BenchmarkCodecUnmarshal25Spans(b *testing.B) {
-	const fileName = "../../model/converter/thrift/jaeger/fixtures/domain_01.json"
+	const fileName = "../../internal/converter/thrift/jaeger/fixtures/domain_01.json"
 	jsonFile, err := os.Open(fileName)
 	require.NoError(b, err, "Failed to open json fixture file %s", fileName)
 	var trace model.Trace