[chore] Move es/spanstore/dbmodel to internal directory (jaegertracin…

…g#6428) - Resolves jaegertracing#6410 - Prerequisite: open-telemetry/opentelemetry-collector-contrib#36972 - move plugin/storage/es/spanstore/dbmodel to plugin/storage/es/spanstore/internal/dbmodel - - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: zzzk1 <[email protected]>
Manik2708 · Jan 5, 2025 · 5c5935e · 5c5935e
1 parent 286adbe
commit 5c5935e
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 6 deletions.
diff --git a/...spanstore/dbmodel/fixtures/domain_01.json → .../internal/dbmodel/fixtures/domain_01.json b/...spanstore/dbmodel/fixtures/domain_01.json → .../internal/dbmodel/fixtures/domain_01.json
diff --git a/.../es/spanstore/dbmodel/fixtures/es_01.json → ...tore/internal/dbmodel/fixtures/es_01.json b/.../es/spanstore/dbmodel/fixtures/es_01.json → ...tore/internal/dbmodel/fixtures/es_01.json
diff --git a/...orage/es/spanstore/dbmodel/from_domain.go → ...spanstore/internal/dbmodel/from_domain.go b/...orage/es/spanstore/dbmodel/from_domain.go → ...spanstore/internal/dbmodel/from_domain.go
diff --git a/.../es/spanstore/dbmodel/from_domain_test.go → ...tore/internal/dbmodel/from_domain_test.go b/.../es/spanstore/dbmodel/from_domain_test.go → ...tore/internal/dbmodel/from_domain_test.go
diff --git a/...anstore/dbmodel/json_span_compare_test.go → ...nternal/dbmodel/json_span_compare_test.go b/...anstore/dbmodel/json_span_compare_test.go → ...nternal/dbmodel/json_span_compare_test.go
diff --git a/plugin/storage/es/spanstore/dbmodel/model.go → ...ge/es/spanstore/internal/dbmodel/model.go b/plugin/storage/es/spanstore/dbmodel/model.go → ...ge/es/spanstore/internal/dbmodel/model.go
diff --git a/...rage/es/spanstore/dbmodel/package_test.go → ...panstore/internal/dbmodel/package_test.go b/...rage/es/spanstore/dbmodel/package_test.go → ...panstore/internal/dbmodel/package_test.go
diff --git a/...storage/es/spanstore/dbmodel/to_domain.go → ...s/spanstore/internal/dbmodel/to_domain.go b/...storage/es/spanstore/dbmodel/to_domain.go → ...s/spanstore/internal/dbmodel/to_domain.go
diff --git a/...ge/es/spanstore/dbmodel/to_domain_test.go → ...nstore/internal/dbmodel/to_domain_test.go b/...ge/es/spanstore/dbmodel/to_domain_test.go → ...nstore/internal/dbmodel/to_domain_test.go
diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go
@@ -22,7 +22,7 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/es"
 	cfg "github.com/jaegertracing/jaeger/pkg/es/config"
-	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/es/config"
 	"github.com/jaegertracing/jaeger/pkg/es/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/plugin/storage/es/spanstore/service_operation.go b/plugin/storage/es/spanstore/service_operation.go
@@ -19,7 +19,7 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/cache"
 	"github.com/jaegertracing/jaeger/pkg/es"
-	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/plugin/storage/es/spanstore/service_operation_test.go b/plugin/storage/es/spanstore/service_operation_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/es/mocks"
-	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/plugin/storage/es/spanstore/writer.go b/plugin/storage/es/spanstore/writer.go
@@ -16,7 +16,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/es"
 	cfg "github.com/jaegertracing/jaeger/pkg/es/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore/spanstoremetrics"
 )
 

diff --git a/plugin/storage/es/spanstore/writer_test.go b/plugin/storage/es/spanstore/writer_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/es/config"
 	"github.com/jaegertracing/jaeger/pkg/es/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )