Merge branch 'main' into k8hotrod

jaegertracing · Nov 16, 2024 · f963a76 · f963a76
2 parents 8b2dff8 + eb6c5c9
commit f963a76
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 1 deletion.
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
@@ -12,7 +12,6 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
 
-	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage/factoryadapter"
 	"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
@@ -22,6 +21,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage"
+	"github.com/jaegertracing/jaeger/storage_v2/factoryadapter"
 	"github.com/jaegertracing/jaeger/storage_v2/spanstore"
 )
 

diff --git a/...on/jaegerstorage/factoryadapter/README.md → storage_v2/factoryadapter/README.md b/...on/jaegerstorage/factoryadapter/README.md → storage_v2/factoryadapter/README.md
diff --git a/...n/jaegerstorage/factoryadapter/factory.go → storage_v2/factoryadapter/factory.go b/...n/jaegerstorage/factoryadapter/factory.go → storage_v2/factoryadapter/factory.go
diff --git a/...gerstorage/factoryadapter/factory_test.go → storage_v2/factoryadapter/factory_test.go b/...gerstorage/factoryadapter/factory_test.go → storage_v2/factoryadapter/factory_test.go
diff --git a/...gerstorage/factoryadapter/package_test.go → storage_v2/factoryadapter/package_test.go b/...gerstorage/factoryadapter/package_test.go → storage_v2/factoryadapter/package_test.go
diff --git a/...on/jaegerstorage/factoryadapter/writer.go → storage_v2/factoryadapter/writer.go b/...on/jaegerstorage/factoryadapter/writer.go → storage_v2/factoryadapter/writer.go
diff --git a/...egerstorage/factoryadapter/writer_test.go → storage_v2/factoryadapter/writer_test.go b/...egerstorage/factoryadapter/writer_test.go → storage_v2/factoryadapter/writer_test.go