Merge pull request #5467 from michaeldmitry/otlp-insecure-flag

Add `--otlp-insecure` flag

Author: brancz

README.md

@@ -98,6 +98,8 @@ Flags:
                                  logfmt
       --otlp-address=STRING      The endpoint to send OTLP traces to.
       --otlp-exporter="grpc"     The OTLP exporter to use.
+      --otlp-insecure            If true, disables TLS for OTLP exporters (both
+                                 gRPC and HTTP).
       --cors-allowed-origins=CORS-ALLOWED-ORIGINS,...
                                  Allowed CORS origins.
       --version                  Show application version.

pkg/parca/parca.go

@@ -139,6 +139,7 @@ type FlagsLogs struct {
 type FlagsOTLP struct {
 	Address  string `help:"The endpoint to send OTLP traces to."`
 	Exporter string `default:"grpc"                              enum:"grpc,http,stdout" help:"The OTLP exporter to use."`
+	Insecure bool   `default:"true" help:"If true, disables TLS for OTLP exporters (both gRPC and HTTP)."`
 }
 
 type FlagsStorage struct {
@@ -193,7 +194,7 @@ func Run(ctx context.Context, logger log.Logger, reg *prometheus.Registry, flags
 	if flags.OTLP.Address != "" {
 		var err error
 
-		exporter, err = tracer.NewExporter(flags.OTLP.Exporter, flags.OTLP.Address)
+		exporter, err = tracer.NewExporter(flags.OTLP.Exporter, flags.OTLP.Address, flags.OTLP.Insecure)
 		if err != nil {
 			level.Error(logger).Log("msg", "failed to create tracing exporter", "err", err)
 		}

pkg/tracer/tracer.go

@@ -107,12 +107,12 @@ func NewProvider(ctx context.Context, version string, exporter sdktrace.SpanExpo
 	return provider, nil
 }
 
-func NewExporter(exType, otlpAddress string) (Exporter, error) {
+func NewExporter(exType, otlpAddress string, otlpInsecure bool) (Exporter, error) {
 	switch strings.ToLower(exType) {
 	case string(ExporterTypeGRPC):
-		return NewGRPCExporter(otlpAddress)
+		return NewGRPCExporter(otlpAddress, otlpInsecure)
 	case string(ExporterTypeHTTP):
-		return NewHTTPExporter(otlpAddress)
+		return NewHTTPExporter(otlpAddress, otlpInsecure)
 	case string(ExporterTypeStdio):
 		return NewConsoleExporter(os.Stdout)
 	default:
@@ -144,18 +144,23 @@ func NewConsoleExporter(w io.Writer) (Exporter, error) {
 }
 
 // NewGRPCExporter returns a gRPC exporter.
-func NewGRPCExporter(otlpAddress string) (Exporter, error) {
-	return otlptracegrpc.NewUnstarted(
-		otlptracegrpc.WithInsecure(),
-		otlptracegrpc.WithEndpoint(otlpAddress),
-	), nil
+func NewGRPCExporter(otlpAddress string, otlpInsecure bool) (Exporter, error) {
+	opts := []otlptracegrpc.Option{otlptracegrpc.WithEndpoint(otlpAddress)}
+	if otlpInsecure {
+		opts = append(opts, otlptracegrpc.WithInsecure())
+	}
+
+	return otlptracegrpc.NewUnstarted(opts...), nil
 }
 
 // NewHTTPExporter returns a HTTP exporter.
-func NewHTTPExporter(otlpAddress string) (Exporter, error) {
+func NewHTTPExporter(otlpAddress string, otlpInsecure bool) (Exporter, error) {
+	opts := []otlptracehttp.Option{otlptracehttp.WithEndpoint(otlpAddress)}
+	if otlpInsecure {
+		opts = append(opts, otlptracehttp.WithInsecure())
+	}
 	return otlptrace.NewUnstarted(otlptracehttp.NewClient(
-		otlptracehttp.WithInsecure(),
-		otlptracehttp.WithEndpoint(otlpAddress),
+		opts...,
 	)), nil
 }