allow otlp clients to use existing grpc connection

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
open-telemetry · Jun 14, 2021 · 40f362f · 40f362f
1 parent 3be9813
commit 40f362f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/exporters/otlp/otlpmetric/internal/connection/connection.go b/exporters/otlp/otlpmetric/internal/connection/connection.go
@@ -220,6 +220,10 @@ func (c *Connection) setConnection(cc *grpc.ClientConn) bool {
 }
 
 func (c *Connection) dialToCollector(ctx context.Context) (*grpc.ClientConn, error) {
+	if c.cfg.GRPCConn != nil {
+		return c.cfg.GRPCConn, nil
+	}
+
 	dialOpts := []grpc.DialOption{}
 	if c.cfg.ServiceConfig != "" {
 		dialOpts = append(dialOpts, grpc.WithDefaultServiceConfig(c.cfg.ServiceConfig))

diff --git a/exporters/otlp/otlpmetric/internal/otlpconfig/options.go b/exporters/otlp/otlpmetric/internal/otlpconfig/options.go
@@ -64,6 +64,7 @@ type (
 		ReconnectionPeriod time.Duration
 		ServiceConfig      string
 		DialOptions        []grpc.DialOption
+		GRPCConn           *grpc.ClientConn
 		RetrySettings      RetrySettings
 	}
 )

diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/options.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/options.go
@@ -116,6 +116,14 @@ func WithDialOption(opts ...grpc.DialOption) Option {
 	})}
 }
 
+// WithGRPCConn allows reusing existing gRPC connection when it has already been
+// established for other services. When set, other dial options will be ignored.
+func WithGRPCConn(conn *grpc.ClientConn) Option {
+	return wrappedOption{otlpconfig.NewGRPCOption(func(cfg *otlpconfig.Config) {
+		cfg.GRPCConn = conn
+	})}
+}
+
 // WithTimeout tells the client the max waiting time for the backend to process
 // each metrics batch. If unset, the default will be 10 seconds.
 func WithTimeout(duration time.Duration) Option {

diff --git a/exporters/otlp/otlptrace/internal/connection/connection.go b/exporters/otlp/otlptrace/internal/connection/connection.go
@@ -220,6 +220,10 @@ func (c *Connection) setConnection(cc *grpc.ClientConn) bool {
 }
 
 func (c *Connection) dialToCollector(ctx context.Context) (*grpc.ClientConn, error) {
+	if c.cfg.GRPCConn != nil {
+		return c.cfg.GRPCConn, nil
+	}
+
 	dialOpts := []grpc.DialOption{}
 	if c.cfg.ServiceConfig != "" {
 		dialOpts = append(dialOpts, grpc.WithDefaultServiceConfig(c.cfg.ServiceConfig))

diff --git a/exporters/otlp/otlptrace/internal/otlpconfig/options.go b/exporters/otlp/otlptrace/internal/otlpconfig/options.go
@@ -75,6 +75,7 @@ type (
 		ReconnectionPeriod time.Duration
 		ServiceConfig      string
 		DialOptions        []grpc.DialOption
+		GRPCConn           *grpc.ClientConn
 		RetrySettings      RetrySettings
 	}
 )

diff --git a/exporters/otlp/otlptrace/otlptracegrpc/options.go b/exporters/otlp/otlptrace/otlptracegrpc/options.go
@@ -115,6 +115,14 @@ func WithDialOption(opts ...grpc.DialOption) Option {
 	})}
 }
 
+// WithGRPCConn allows reusing existing gRPC connection when it has already been
+// established for other services. When set, other dial options will be ignored.
+func WithGRPCConn(conn *grpc.ClientConn) Option {
+	return wrappedOption{otlpconfig.NewGRPCOption(func(cfg *otlpconfig.Config) {
+		cfg.GRPCConn = conn
+	})}
+}
+
 // WithTimeout tells the driver the max waiting time for the backend to process
 // each spans batch. If unset, the default will be 10 seconds.
 func WithTimeout(duration time.Duration) Option {