Fix up gRPC implementation

rancher · Feb 15, 2023 · df23af8 · df23af8
1 parent 61460de
commit df23af8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/plugins/logging/pkg/agent/plugin.go b/plugins/logging/pkg/agent/plugin.go
@@ -13,6 +13,7 @@ import (
 	"github.com/rancher/opni/plugins/logging/pkg/agent/drivers/events"
 	"github.com/rancher/opni/plugins/logging/pkg/agent/drivers/kubernetes"
 	loggingutil "github.com/rancher/opni/plugins/logging/pkg/util"
+	collogspb "go.opentelemetry.io/proto/otlp/collector/logs/v1"
 	"go.uber.org/zap"
 )
 
@@ -66,6 +67,8 @@ func NewPlugin(ctx context.Context) *Plugin {
 	return p
 }
 
+var _ collogspb.LogsServiceServer = (*loggingutil.OTELForwarder)(nil)
+
 func Scheme(ctx context.Context) meta.Scheme {
 	scheme := meta.NewScheme(meta.WithMode(meta.ModeAgent))
 	p := NewPlugin(ctx)

diff --git a/plugins/logging/pkg/gateway/plugin.go b/plugins/logging/pkg/gateway/plugin.go
@@ -34,6 +34,7 @@ import (
 	"github.com/rancher/opni/plugins/logging/pkg/gateway/drivers"
 	"github.com/rancher/opni/plugins/logging/pkg/opensearchdata"
 	loggingutil "github.com/rancher/opni/plugins/logging/pkg/util"
+	collogspb "go.opentelemetry.io/proto/otlp/collector/logs/v1"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -202,6 +203,7 @@ func NewPlugin(ctx context.Context, opts ...PluginOption) *Plugin {
 
 var _ loggingadmin.LoggingAdminServer = (*Plugin)(nil)
 var _ loggingadmin.LoggingAdminV2Server = (*LoggingManagerV2)(nil)
+var _ collogspb.LogsServiceServer = (*loggingutil.OTELForwarder)(nil)
 
 func Scheme(ctx context.Context) meta.Scheme {
 	scheme := meta.NewScheme(meta.WithMode(meta.ModeGateway))

diff --git a/plugins/logging/pkg/util/otel.go b/plugins/logging/pkg/util/otel.go
@@ -17,6 +17,7 @@ const (
 )
 
 type OTELForwarder struct {
+	collogspb.UnsafeLogsServiceServer
 	opts otelForwarderOptions
 
 	Client *AsyncClient[collogspb.LogsServiceClient]