From 3c875e4c93c40be78e06f8d3d4df269f3aa14bfa Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 18 Jul 2023 15:19:22 -0700 Subject: [PATCH 1/5] add insecure field Signed-off-by: Alex Boten --- examples/kitchen-sink.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml index 203210b..74d941b 100644 --- a/examples/kitchen-sink.yaml +++ b/examples/kitchen-sink.yaml @@ -87,6 +87,10 @@ logger_provider: # # Environment variable: OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_LOGS_TIMEOUT timeout: 10000 + # Whether to enable client transport security for the exporter's connection. + # + # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_LOGS_INSECURE + insecure: true # Configure log record limits. See also attribute_limits. limits: # Configure max log record attribute value size. Overrides attribute_limits.attribute_value_length_limit. @@ -170,6 +174,10 @@ meter_provider: # # Environment variable: OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_METRICS_TIMEOUT timeout: 10000 + # Whether to enable client transport security for the exporter's connection. + # + # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_METRICS_INSECURE, OTEL_EXPORTER_OTLP_METRIC_INSECURE + insecure: true # Configure temporality preference. # # Environment variable: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE @@ -286,6 +294,10 @@ tracer_provider: # # Environment variable: OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_TRACES_TIMEOUT timeout: 10000 + # Whether to enable client transport security for the exporter's connection. + # + # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_TRACES_INSECURE, OTEL_EXPORTER_OTLP_TRACE_INSECURE + insecure: true # Configure a batch span processor. - batch: # Configure exporter. From 769bde18cfad6013962fd2df89af394906087fcc Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 11 Jan 2024 10:53:28 -0800 Subject: [PATCH 2/5] add insecure config option Signed-off-by: Alex Boten --- schema/common.json | 3 +++ schema/meter_provider.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/schema/common.json b/schema/common.json index 55b14f8..48d48a0 100644 --- a/schema/common.json +++ b/schema/common.json @@ -42,6 +42,9 @@ "timeout": { "type": "integer", "minimum": 0 + }, + "insecure": { + "type": "boolean" } }, "required": [ diff --git a/schema/meter_provider.json b/schema/meter_provider.json index 7be98b1..7313ae0 100644 --- a/schema/meter_provider.json +++ b/schema/meter_provider.json @@ -149,6 +149,9 @@ "explicit_bucket_histogram", "base2_exponential_bucket_histogram" ] + }, + "insecure": { + "type": "boolean" } }, "required": [ From 18c1dbefed53fa848f7e6259a7a4317362d2da8f Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 11 Jan 2024 10:55:15 -0800 Subject: [PATCH 3/5] update comment Signed-off-by: Alex Boten --- examples/kitchen-sink.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml index 74d941b..9836c9d 100644 --- a/examples/kitchen-sink.yaml +++ b/examples/kitchen-sink.yaml @@ -87,7 +87,7 @@ logger_provider: # # Environment variable: OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_LOGS_TIMEOUT timeout: 10000 - # Whether to enable client transport security for the exporter's connection. + # Configure client transport security for the exporter's connection. # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_LOGS_INSECURE insecure: true @@ -174,7 +174,7 @@ meter_provider: # # Environment variable: OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_METRICS_TIMEOUT timeout: 10000 - # Whether to enable client transport security for the exporter's connection. + # Configure client transport security for the exporter's connection. # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_METRICS_INSECURE, OTEL_EXPORTER_OTLP_METRIC_INSECURE insecure: true @@ -294,7 +294,7 @@ tracer_provider: # # Environment variable: OTEL_EXPORTER_OTLP_TIMEOUT, OTEL_EXPORTER_OTLP_TRACES_TIMEOUT timeout: 10000 - # Whether to enable client transport security for the exporter's connection. + # Configure client transport security for the exporter's connection. # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_TRACES_INSECURE, OTEL_EXPORTER_OTLP_TRACE_INSECURE insecure: true From ea0eafd4408d7e4a1f674177f459022cafad331a Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 11 Jan 2024 11:10:19 -0800 Subject: [PATCH 4/5] Apply suggestions from code review --- examples/kitchen-sink.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml index 9836c9d..4f85fa0 100644 --- a/examples/kitchen-sink.yaml +++ b/examples/kitchen-sink.yaml @@ -176,7 +176,7 @@ meter_provider: timeout: 10000 # Configure client transport security for the exporter's connection. # - # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_METRICS_INSECURE, OTEL_EXPORTER_OTLP_METRIC_INSECURE + # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_METRICS_INSECURE insecure: true # Configure temporality preference. # @@ -296,7 +296,7 @@ tracer_provider: timeout: 10000 # Configure client transport security for the exporter's connection. # - # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_TRACES_INSECURE, OTEL_EXPORTER_OTLP_TRACE_INSECURE + # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_TRACES_INSECURE insecure: true # Configure a batch span processor. - batch: From 330e7c9f352035de901eafbb6f5e942b59fa8203 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 11 Jan 2024 11:24:04 -0800 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com> --- examples/kitchen-sink.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml index 4f85fa0..d2c4e84 100644 --- a/examples/kitchen-sink.yaml +++ b/examples/kitchen-sink.yaml @@ -90,7 +90,7 @@ logger_provider: # Configure client transport security for the exporter's connection. # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_LOGS_INSECURE - insecure: true + insecure: false # Configure log record limits. See also attribute_limits. limits: # Configure max log record attribute value size. Overrides attribute_limits.attribute_value_length_limit. @@ -177,7 +177,7 @@ meter_provider: # Configure client transport security for the exporter's connection. # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_METRICS_INSECURE - insecure: true + insecure: false # Configure temporality preference. # # Environment variable: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE @@ -297,7 +297,7 @@ tracer_provider: # Configure client transport security for the exporter's connection. # # Environment variable: OTEL_EXPORTER_OTLP_INSECURE, OTEL_EXPORTER_OTLP_TRACES_INSECURE - insecure: true + insecure: false # Configure a batch span processor. - batch: # Configure exporter.