vendor: update buildkit to 1e6032c

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig/envconfig.go

@@ -33,12 +33,12 @@ var DefaultEnvOptionsReader = EnvOptionsReader{
 	ReadFile: ioutil.ReadFile,
 }
 
-func ApplyGRPCEnvConfigs(cfg *Config) {
-	DefaultEnvOptionsReader.ApplyGRPCEnvConfigs(cfg)
+func ApplyGRPCEnvConfigs(cfg Config) Config {
+	return DefaultEnvOptionsReader.ApplyGRPCEnvConfigs(cfg)
 }
 
-func ApplyHTTPEnvConfigs(cfg *Config) {
-	DefaultEnvOptionsReader.ApplyHTTPEnvConfigs(cfg)
+func ApplyHTTPEnvConfigs(cfg Config) Config {
+	return DefaultEnvOptionsReader.ApplyHTTPEnvConfigs(cfg)
 }
 
 type EnvOptionsReader struct {
@@ -46,18 +46,20 @@ type EnvOptionsReader struct {
 	ReadFile func(filename string) ([]byte, error)
 }
 
-func (e *EnvOptionsReader) ApplyHTTPEnvConfigs(cfg *Config) {
+func (e *EnvOptionsReader) ApplyHTTPEnvConfigs(cfg Config) Config {
 	opts := e.GetOptionsFromEnv()
 	for _, opt := range opts {
-		opt.ApplyHTTPOption(cfg)
+		cfg = opt.ApplyHTTPOption(cfg)
 	}
+	return cfg
 }
 
-func (e *EnvOptionsReader) ApplyGRPCEnvConfigs(cfg *Config) {
+func (e *EnvOptionsReader) ApplyGRPCEnvConfigs(cfg Config) Config {
 	opts := e.GetOptionsFromEnv()
 	for _, opt := range opts {
-		opt.ApplyGRPCOption(cfg)
+		cfg = opt.ApplyGRPCOption(cfg)
 	}
+	return cfg
 }
 
 func (e *EnvOptionsReader) GetOptionsFromEnv() []GenericOption {
@@ -74,7 +76,7 @@ func (e *EnvOptionsReader) GetOptionsFromEnv() []GenericOption {
 			} else {
 				opts = append(opts, WithSecure())
 			}
-			opts = append(opts, newSplitOption(func(cfg *Config) {
+			opts = append(opts, newSplitOption(func(cfg Config) Config {
 				cfg.Traces.Endpoint = u.Host
 				// For endpoint URLs for OTLP/HTTP per-signal variables, the
 				// URL MUST be used as-is without any modification. The only
@@ -85,10 +87,12 @@ func (e *EnvOptionsReader) GetOptionsFromEnv() []GenericOption {
 					path = "/"
 				}
 				cfg.Traces.URLPath = path
-			}, func(cfg *Config) {
+				return cfg
+			}, func(cfg Config) Config {
 				// For OTLP/gRPC endpoints, this is the target to which the
 				// exporter is going to send telemetry.
 				cfg.Traces.Endpoint = path.Join(u.Host, u.Path)
+				return cfg
 			}))
 		}
 	} else if v, ok = e.getEnvValue("ENDPOINT"); ok {
@@ -101,16 +105,18 @@ func (e *EnvOptionsReader) GetOptionsFromEnv() []GenericOption {
 			} else {
 				opts = append(opts, WithSecure())
 			}
-			opts = append(opts, newSplitOption(func(cfg *Config) {
+			opts = append(opts, newSplitOption(func(cfg Config) Config {
 				cfg.Traces.Endpoint = u.Host
 				// For OTLP/HTTP endpoint URLs without a per-signal
 				// configuration, the passed endpoint is used as a base URL
 				// and the signals are sent to these paths relative to that.
 				cfg.Traces.URLPath = path.Join(u.Path, DefaultTracesPath)
-			}, func(cfg *Config) {
+				return cfg
+			}, func(cfg Config) Config {
 				// For OTLP/gRPC endpoints, this is the target to which the
 				// exporter is going to send telemetry.
 				cfg.Traces.Endpoint = path.Join(u.Host, u.Path)
+				return cfg
 			}))
 		}
 	}

vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig/options.go

@@ -22,6 +22,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding/gzip"
 
 	"go.opentelemetry.io/otel/exporters/otlp/internal/retry"
@@ -82,9 +83,9 @@ func NewDefaultConfig() Config {
 // any unset setting using the default gRPC config values.
 func NewGRPCConfig(opts ...GRPCOption) Config {
 	cfg := NewDefaultConfig()
-	ApplyGRPCEnvConfigs(&cfg)
+	cfg = ApplyGRPCEnvConfigs(cfg)
 	for _, opt := range opts {
-		opt.ApplyGRPCOption(&cfg)
+		cfg = opt.ApplyGRPCOption(cfg)
 	}
 
 	if cfg.ServiceConfig != "" {
@@ -94,7 +95,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.Traces.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Traces.GRPCCredentials))
 	} else if cfg.Traces.Insecure {
-		cfg.DialOptions = append(cfg.DialOptions, grpc.WithInsecure())
+		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	} else {
 		// Default to using the host's root CA.
 		creds := credentials.NewTLS(nil)
@@ -121,8 +122,8 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 type (
 	// GenericOption applies an option to the HTTP or gRPC driver.
 	GenericOption interface {
-		ApplyHTTPOption(*Config)
-		ApplyGRPCOption(*Config)
+		ApplyHTTPOption(Config) Config
+		ApplyGRPCOption(Config) Config
 
 		// A private method to prevent users implementing the
 		// interface and so future additions to it will not
@@ -132,7 +133,7 @@ type (
 
 	// HTTPOption applies an option to the HTTP driver.
 	HTTPOption interface {
-		ApplyHTTPOption(*Config)
+		ApplyHTTPOption(Config) Config
 
 		// A private method to prevent users implementing the
 		// interface and so future additions to it will not
@@ -142,7 +143,7 @@ type (
 
 	// GRPCOption applies an option to the gRPC driver.
 	GRPCOption interface {
-		ApplyGRPCOption(*Config)
+		ApplyGRPCOption(Config) Config
 
 		// A private method to prevent users implementing the
 		// interface and so future additions to it will not
@@ -154,128 +155,138 @@ type (
 // genericOption is an option that applies the same logic
 // for both gRPC and HTTP.
 type genericOption struct {
-	fn func(*Config)
+	fn func(Config) Config
 }
 
-func (g *genericOption) ApplyGRPCOption(cfg *Config) {
-	g.fn(cfg)
+func (g *genericOption) ApplyGRPCOption(cfg Config) Config {
+	return g.fn(cfg)
 }
 
-func (g *genericOption) ApplyHTTPOption(cfg *Config) {
-	g.fn(cfg)
+func (g *genericOption) ApplyHTTPOption(cfg Config) Config {
+	return g.fn(cfg)
 }
 
 func (genericOption) private() {}
 
-func newGenericOption(fn func(cfg *Config)) GenericOption {
+func newGenericOption(fn func(cfg Config) Config) GenericOption {
 	return &genericOption{fn: fn}
 }
 
 // splitOption is an option that applies different logics
 // for gRPC and HTTP.
 type splitOption struct {
-	httpFn func(*Config)
-	grpcFn func(*Config)
+	httpFn func(Config) Config
+	grpcFn func(Config) Config
 }
 
-func (g *splitOption) ApplyGRPCOption(cfg *Config) {
-	g.grpcFn(cfg)
+func (g *splitOption) ApplyGRPCOption(cfg Config) Config {
+	return g.grpcFn(cfg)
 }
 
-func (g *splitOption) ApplyHTTPOption(cfg *Config) {
-	g.httpFn(cfg)
+func (g *splitOption) ApplyHTTPOption(cfg Config) Config {
+	return g.httpFn(cfg)
 }
 
 func (splitOption) private() {}
 
-func newSplitOption(httpFn func(cfg *Config), grpcFn func(cfg *Config)) GenericOption {
+func newSplitOption(httpFn func(cfg Config) Config, grpcFn func(cfg Config) Config) GenericOption {
 	return &splitOption{httpFn: httpFn, grpcFn: grpcFn}
 }
 
 // httpOption is an option that is only applied to the HTTP driver.
 type httpOption struct {
-	fn func(*Config)
+	fn func(Config) Config
 }
 
-func (h *httpOption) ApplyHTTPOption(cfg *Config) {
-	h.fn(cfg)
+func (h *httpOption) ApplyHTTPOption(cfg Config) Config {
+	return h.fn(cfg)
 }
 
 func (httpOption) private() {}
 
-func NewHTTPOption(fn func(cfg *Config)) HTTPOption {
+func NewHTTPOption(fn func(cfg Config) Config) HTTPOption {
 	return &httpOption{fn: fn}
 }
 
 // grpcOption is an option that is only applied to the gRPC driver.
 type grpcOption struct {
-	fn func(*Config)
+	fn func(Config) Config
 }
 
-func (h *grpcOption) ApplyGRPCOption(cfg *Config) {
-	h.fn(cfg)
+func (h *grpcOption) ApplyGRPCOption(cfg Config) Config {
+	return h.fn(cfg)
 }
 
 func (grpcOption) private() {}
 
-func NewGRPCOption(fn func(cfg *Config)) GRPCOption {
+func NewGRPCOption(fn func(cfg Config) Config) GRPCOption {
 	return &grpcOption{fn: fn}
 }
 
 // Generic Options
 
 func WithEndpoint(endpoint string) GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.Endpoint = endpoint
+		return cfg
 	})
 }
 
 func WithCompression(compression Compression) GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.Compression = compression
+		return cfg
 	})
 }
 
 func WithURLPath(urlPath string) GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.URLPath = urlPath
+		return cfg
 	})
 }
 
 func WithRetry(rc retry.Config) GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.RetryConfig = rc
+		return cfg
 	})
 }
 
 func WithTLSClientConfig(tlsCfg *tls.Config) GenericOption {
-	return newSplitOption(func(cfg *Config) {
+	return newSplitOption(func(cfg Config) Config {
 		cfg.Traces.TLSCfg = tlsCfg.Clone()
-	}, func(cfg *Config) {
+		return cfg
+	}, func(cfg Config) Config {
 		cfg.Traces.GRPCCredentials = credentials.NewTLS(tlsCfg)
+		return cfg
 	})
 }
 
 func WithInsecure() GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.Insecure = true
+		return cfg
 	})
 }
 
 func WithSecure() GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.Insecure = false
+		return cfg
 	})
 }
 
 func WithHeaders(headers map[string]string) GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.Headers = headers
+		return cfg
 	})
 }
 
 func WithTimeout(duration time.Duration) GenericOption {
-	return newGenericOption(func(cfg *Config) {
+	return newGenericOption(func(cfg Config) Config {
 		cfg.Traces.Timeout = duration
+		return cfg
 	})
 }