From 19e7cf03ad4a97262790f66207c6d58be5e16289 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Fri, 11 Nov 2022 13:16:48 -0800 Subject: [PATCH] Remove deprecated funcs in configgrpc Signed-off-by: Bogdan Drutu --- .chloggen/rmdepcfggrpc.yaml | 18 ++++++++++++++++++ config/configgrpc/configgrpc.go | 10 ---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100755 .chloggen/rmdepcfggrpc.yaml diff --git a/.chloggen/rmdepcfggrpc.yaml b/.chloggen/rmdepcfggrpc.yaml new file mode 100755 index 00000000000..82dfd4f9da4 --- /dev/null +++ b/.chloggen/rmdepcfggrpc.yaml @@ -0,0 +1,18 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: configgrpc + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated funcs in `configgrpc`. + +# One or more tracking issues or pull requests related to the change +issues: [6529] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + - `configgrpc.GRPCClientSettings.ToDialOptions` + - `configgrpc.GRPCServerSettings.ToServerOption` diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 59ea2bccb2d..be9c9f3599d 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -192,11 +192,6 @@ func (gcs *GRPCClientSettings) ToClientConn(ctx context.Context, host component. return grpc.DialContext(ctx, gcs.SanitizedEndpoint(), opts...) } -// Deprecated: [v0.64.0] use ToClientConn. -func (gcs *GRPCClientSettings) ToDialOptions(host component.Host, settings component.TelemetrySettings) ([]grpc.DialOption, error) { - return gcs.toDialOptions(host, settings) -} - func (gcs *GRPCClientSettings) toDialOptions(host component.Host, settings component.TelemetrySettings) ([]grpc.DialOption, error) { var opts []grpc.DialOption if configcompression.IsCompressed(gcs.Compression) { @@ -298,11 +293,6 @@ func (gss *GRPCServerSettings) ToServer(host component.Host, settings component. return grpc.NewServer(opts...), nil } -// Deprecated: [v0.64.0] use ToServer. -func (gss *GRPCServerSettings) ToServerOption(host component.Host, settings component.TelemetrySettings) ([]grpc.ServerOption, error) { - return gss.toServerOption(host, settings) -} - func (gss *GRPCServerSettings) toServerOption(host component.Host, settings component.TelemetrySettings) ([]grpc.ServerOption, error) { switch gss.NetAddr.Transport { case "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6":