config: add support for Insecure (#6658)

Co-authored-by: Damien Mathieu <[email protected]>
open-telemetry · Feb 5, 2025 · beb885f · beb885f
1 parent 3022ac5
commit beb885f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Added the `WithMeterProvider` option to allow passing a custom meter provider to `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux`. (#6648)
 - Added the `WithMetricAttributesFn` option to allow setting dynamic, per-request metric attributes in `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux`. (#6648)
 - Added metrics support, and emit all stable metrics from the [Semantic Conventions](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/http-metrics.md) in `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux`. (#6648)
+- Add support for configuring `Insecure` field for OTLP exporters in `go.opentelemetry.io/contrib/config`. (#6658)
 
 ### Changed
 

diff --git a/config/testdata/v0.3.yaml b/config/testdata/v0.3.yaml
@@ -57,7 +57,7 @@ logger_provider:
             compression: gzip
             # Configure max time (in milliseconds) to wait for each export.
             timeout: 10000
-            # Configure client transport security for the exporter's connection.
+            # Configure client transport security for the exporter's connection when http/https is not specified for gRPC connections.
             insecure: false
     - # Configure a simple log record processor.
       simple:
@@ -141,7 +141,7 @@ meter_provider:
             compression: gzip
             # Configure max time (in milliseconds) to wait for each export.
             timeout: 10000
-            # Configure client transport security for the exporter's connection.
+            # Configure client transport security for the exporter's connection when http/https is not specified for gRPC connections.
             insecure: false
             # Configure temporality preference.
             temporality_preference: delta
@@ -258,7 +258,7 @@ tracer_provider:
             compression: gzip
             # Configure max time (in milliseconds) to wait for each export.
             timeout: 10000
-            # Configure client transport security for the exporter's connection.
+            # Configure client transport security for the exporter's connection when http/https is not specified for gRPC connections.
             insecure: false
     - # Configure a batch span processor.
       batch:

diff --git a/config/v0.3.0/log.go b/config/v0.3.0/log.go
@@ -183,7 +183,7 @@ func otlpGRPCLogExporter(ctx context.Context, otlpConfig *OTLP) (sdklog.Exporter
 		} else {
 			opts = append(opts, otlploggrpc.WithEndpoint(*otlpConfig.Endpoint))
 		}
-		if u.Scheme == "http" {
+		if u.Scheme == "http" || (u.Scheme != "https" && otlpConfig.Insecure != nil && *otlpConfig.Insecure) {
 			opts = append(opts, otlploggrpc.WithInsecure())
 		}
 	}

diff --git a/config/v0.3.0/metric.go b/config/v0.3.0/metric.go
@@ -209,7 +209,7 @@ func otlpGRPCMetricExporter(ctx context.Context, otlpConfig *OTLPMetric) (sdkmet
 		} else {
 			opts = append(opts, otlpmetricgrpc.WithEndpoint(*otlpConfig.Endpoint))
 		}
-		if u.Scheme == "http" {
+		if u.Scheme == "http" || (u.Scheme != "https" && otlpConfig.Insecure != nil && *otlpConfig.Insecure) {
 			opts = append(opts, otlpmetricgrpc.WithInsecure())
 		}
 	}

diff --git a/config/v0.3.0/trace.go b/config/v0.3.0/trace.go
@@ -107,7 +107,7 @@ func otlpGRPCSpanExporter(ctx context.Context, otlpConfig *OTLP) (sdktrace.SpanE
 			opts = append(opts, otlptracegrpc.WithEndpoint(*otlpConfig.Endpoint))
 		}
 
-		if u.Scheme == "http" {
+		if u.Scheme == "http" || (u.Scheme != "https" && otlpConfig.Insecure != nil && *otlpConfig.Insecure) {
 			opts = append(opts, otlptracegrpc.WithInsecure())
 		}
 	}