chore: move common grpc packages to pkg/grpc

jaegertracing · May 2, 2023 · 40053a3 · 40053a3
1 parent 612eb70
commit 40053a3
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 13 deletions.
diff --git a/cmd/remote-storage/app/server.go b/cmd/remote-storage/app/server.go
@@ -24,9 +24,9 @@ import (
 	"google.golang.org/grpc/reflection"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	"github.com/jaegertracing/jaeger/pkg/healthcheck"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"

diff --git a/examples/memstore-plugin/main.go b/examples/memstore-plugin/main.go
@@ -25,9 +25,9 @@ import (
 	jaegerClientConfig "github.com/uber/jaeger-client-go/config"
 	googleGRPC "google.golang.org/grpc"
 
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
+	"github.com/jaegertracing/jaeger/pkg/grpc"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	grpcMemory "github.com/jaegertracing/jaeger/plugin/storage/grpc/memory"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 )
 

diff --git a/plugin/storage/grpc/config/.nocover → pkg/grpc/config/.nocover b/plugin/storage/grpc/config/.nocover → pkg/grpc/config/.nocover
diff --git a/plugin/storage/grpc/config/config.go → pkg/grpc/config/config.go b/plugin/storage/grpc/config/config.go → pkg/grpc/config/config.go
@@ -31,8 +31,8 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 )
 
 var pluginHealthCheckInterval = time.Second * 60

diff --git a/plugin/storage/grpc/grpc.go → pkg/grpc/grpc.go b/plugin/storage/grpc/grpc.go → pkg/grpc/grpc.go
@@ -18,7 +18,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 	"google.golang.org/grpc"
 
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 )
 
 // Serve creates a plugin configuration using the implementation of StoragePlugin and then serves it.

diff --git a/plugin/storage/grpc/shared/archive.go → pkg/grpc/shared/archive.go b/plugin/storage/grpc/shared/archive.go → pkg/grpc/shared/archive.go
diff --git a/plugin/storage/grpc/shared/archive_test.go → pkg/grpc/shared/archive_test.go b/plugin/storage/grpc/shared/archive_test.go → pkg/grpc/shared/archive_test.go
diff --git a/plugin/storage/grpc/shared/grpc_client.go → pkg/grpc/shared/grpc_client.go b/plugin/storage/grpc/shared/grpc_client.go → pkg/grpc/shared/grpc_client.go
diff --git a/...n/storage/grpc/shared/grpc_client_test.go → pkg/grpc/shared/grpc_client_test.go b/...n/storage/grpc/shared/grpc_client_test.go → pkg/grpc/shared/grpc_client_test.go
diff --git a/plugin/storage/grpc/shared/grpc_handler.go → pkg/grpc/shared/grpc_handler.go b/plugin/storage/grpc/shared/grpc_handler.go → pkg/grpc/shared/grpc_handler.go
diff --git a/.../storage/grpc/shared/grpc_handler_test.go → pkg/grpc/shared/grpc_handler_test.go b/.../storage/grpc/shared/grpc_handler_test.go → pkg/grpc/shared/grpc_handler_test.go
diff --git a/plugin/storage/grpc/shared/interface.go → pkg/grpc/shared/interface.go b/plugin/storage/grpc/shared/interface.go → pkg/grpc/shared/interface.go
diff --git a/plugin/storage/grpc/shared/plugin.go → pkg/grpc/shared/plugin.go b/plugin/storage/grpc/shared/plugin.go → pkg/grpc/shared/plugin.go
diff --git a/...n/storage/grpc/shared/streaming_writer.go → pkg/grpc/shared/streaming_writer.go b/...n/storage/grpc/shared/streaming_writer.go → pkg/grpc/shared/streaming_writer.go
diff --git a/...rage/grpc/shared/streaming_writer_test.go → pkg/grpc/shared/streaming_writer_test.go b/...rage/grpc/shared/streaming_writer_test.go → pkg/grpc/shared/streaming_writer_test.go
diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go
@@ -22,10 +22,10 @@ import (
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 
+	"github.com/jaegertracing/jaeger/pkg/grpc/config"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/config"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"

diff --git a/plugin/storage/grpc/factory_test.go b/plugin/storage/grpc/factory_test.go
@@ -24,10 +24,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
+	grpcConfig "github.com/jaegertracing/jaeger/pkg/grpc/config"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	grpcConfig "github.com/jaegertracing/jaeger/plugin/storage/grpc/config"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc/mocks"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"

diff --git a/plugin/storage/grpc/memory/plugin.go b/plugin/storage/grpc/memory/plugin.go
@@ -15,7 +15,7 @@
 package memory
 
 import (
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"

diff --git a/plugin/storage/grpc/mocks/PluginCapabilities.go b/plugin/storage/grpc/mocks/PluginCapabilities.go
diff --git a/plugin/storage/grpc/options.go b/plugin/storage/grpc/options.go
@@ -22,8 +22,8 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
+	"github.com/jaegertracing/jaeger/pkg/grpc/config"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/config"
 )
 
 const (

diff --git a/plugin/storage/integration/grpc_test.go b/plugin/storage/integration/grpc_test.go
@@ -30,11 +30,11 @@ import (
 	googleGRPC "google.golang.org/grpc"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
+	"github.com/jaegertracing/jaeger/pkg/grpc/shared"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	grpcMemory "github.com/jaegertracing/jaeger/plugin/storage/grpc/memory"
-	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 )