Move model/json to internal/uimodel

Signed-off-by: pipiland <[email protected]>

Author: pipiland2612

cmd/all-in-one/all_in_one_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
-	ui "github.com/jaegertracing/jaeger/model/json"
+	ui "github.com/jaegertracing/jaeger/internal/uimodel"
 	"github.com/jaegertracing/jaeger/ports"
 )
 

cmd/anonymizer/app/anonymizer/anonymizer.go

@@ -16,8 +16,8 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
-	uiconv "github.com/jaegertracing/jaeger/internal/converter/json"
-	uimodel "github.com/jaegertracing/jaeger/model/json"
+	"github.com/jaegertracing/jaeger/internal/uimodel"
+	uiconv "github.com/jaegertracing/jaeger/internal/uimodel/converter/v1"
 )
 
 var allowedTags = map[string]bool{

cmd/anonymizer/app/uiconv/extractor.go

@@ -11,7 +11,7 @@ import (
 
 	"go.uber.org/zap"
 
-	uimodel "github.com/jaegertracing/jaeger/model/json"
+	"github.com/jaegertracing/jaeger/internal/uimodel"
 )
 
 // extractor reads the spans from reader, filters by traceID, and stores as JSON into uiFile.

cmd/anonymizer/app/uiconv/reader.go

@@ -12,7 +12,7 @@ import (
 
 	"go.uber.org/zap"
 
-	uimodel "github.com/jaegertracing/jaeger/model/json"
+	"github.com/jaegertracing/jaeger/internal/uimodel"
 )
 
 var errNoMoreSpans = errors.New("no more spans")

cmd/query/app/handler_deps_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
-	ui "github.com/jaegertracing/jaeger/model/json"
+	ui "github.com/jaegertracing/jaeger/internal/uimodel"
 )
 
 func TestDeduplicateDependencies(t *testing.T) {

cmd/query/app/http_handler.go

@@ -24,13 +24,13 @@ 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/proto-gen/api_v2/metrics"
 	"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"
-	ui "github.com/jaegertracing/jaeger/model/json"
+	ui "github.com/jaegertracing/jaeger/internal/uimodel"
+	uiconv "github.com/jaegertracing/jaeger/internal/uimodel/converter/v1"
 )
 
 const (

cmd/query/app/http_handler_test.go

@@ -42,7 +42,7 @@ import (
 	depsmocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
 	"github.com/jaegertracing/jaeger/internal/tenancy"
-	ui "github.com/jaegertracing/jaeger/model/json"
+	ui "github.com/jaegertracing/jaeger/internal/uimodel"
 )
 
 const millisToNanosMultiplier = int64(time.Millisecond / time.Nanosecond)

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/internal/converter/json"
+	p2json "github.com/jaegertracing/jaeger/internal/uimodel/converter/v1"
 )
 
 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/internal/converter/json"
+	p2json "github.com/jaegertracing/jaeger/internal/uimodel/converter/v1"
 )
 
 var testResponse = &api_v2.SamplingStrategyResponse{