From 3c3452c1dd2c702c174940e6f60cb41a0839ff4a Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Tue, 12 Dec 2023 13:07:08 +0200
Subject: [PATCH] fix(emqx_otel_schema): add `enable` field to SSL opts

---
 apps/emqx_opentelemetry/src/emqx_otel_config.erl | 2 +-
 apps/emqx_opentelemetry/src/emqx_otel_schema.erl | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/emqx_opentelemetry/src/emqx_otel_config.erl b/apps/emqx_opentelemetry/src/emqx_otel_config.erl
index 0d2f9988b..c16b3385a 100644
--- a/apps/emqx_opentelemetry/src/emqx_otel_config.erl
+++ b/apps/emqx_opentelemetry/src/emqx_otel_config.erl
@@ -150,7 +150,7 @@ tr_handler_conf(#{logs := LogsConf, exporter := ExporterConf}) ->
 ssl_opts(Endpoint, SSLOpts) ->
     case is_ssl(Endpoint) of
         true ->
-            emqx_tls_lib:to_client_opts(SSLOpts#{enable => true});
+            emqx_tls_lib:to_client_opts(SSLOpts);
         false ->
             []
     end.
diff --git a/apps/emqx_opentelemetry/src/emqx_otel_schema.erl b/apps/emqx_opentelemetry/src/emqx_otel_schema.erl
index 420bf23f2..be14a2b29 100644
--- a/apps/emqx_opentelemetry/src/emqx_otel_schema.erl
+++ b/apps/emqx_opentelemetry/src/emqx_otel_schema.erl
@@ -230,16 +230,14 @@ fields("otel_exporter") ->
             )},
         {ssl_options,
             ?HOCON(
-                ?R_REF("ssl_opts"),
+                ?R_REF(emqx_schema, "ssl_client_opts"),
                 #{
                     desc => ?DESC(exporter_ssl),
+                    default => #{<<"enable">> => false},
                     importance => ?IMPORTANCE_LOW
                 }
             )}
     ];
-fields("ssl_opts") ->
-    Schema = emqx_schema:client_ssl_opts_schema(#{}),
-    lists:keydelete("enable", 1, Schema);
 fields("trace_filter") ->
     %% More filters can be implemented in future, e.g. topic, clientid
     [
@@ -259,6 +257,5 @@ desc("otel_exporter") -> ?DESC(otel_exporter);
 desc("otel_logs") -> ?DESC(otel_logs);
 desc("otel_metrics") -> ?DESC(otel_metrics);
 desc("otel_traces") -> ?DESC(otel_traces);
-desc("ssl_opts") -> ?DESC(exporter_ssl);
 desc("trace_filter") -> ?DESC(trace_filter);
 desc(_) -> undefined.