yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(emqx_otel_schema): add `enable` field to SSL opts

This commit is contained in:
Serge Tupchii 2023-12-12 13:07:08 +02:00
parent 36b12a01c9
commit 3c3452c1dd
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_opentelemetry/src/emqx_otel_config.erl
View File

@ -150,7 +150,7 @@ tr_handler_conf(#{logs := LogsConf, exporter := ExporterConf}) ->
ssl_opts(Endpoint, SSLOpts) -> ssl_opts(Endpoint, SSLOpts) ->
case is_ssl(Endpoint) of case is_ssl(Endpoint) of
true -> true ->
emqx_tls_lib:to_client_opts(SSLOpts#{enable => true}); emqx_tls_lib:to_client_opts(SSLOpts);
false -> false ->
[] []
end. end.

7
apps/emqx_opentelemetry/src/emqx_otel_schema.erl
View File

@ -230,16 +230,14 @@ fields("otel_exporter") ->
)}, )},
{ssl_options, {ssl_options,
?HOCON( ?HOCON(
?R_REF("ssl_opts"), ?R_REF(emqx_schema, "ssl_client_opts"),
#{ #{
desc => ?DESC(exporter_ssl), desc => ?DESC(exporter_ssl),
default => #{<<"enable">> => false},
importance => ?IMPORTANCE_LOW importance => ?IMPORTANCE_LOW
} }
)} )}
]; ];
fields("ssl_opts") ->
Schema = emqx_schema:client_ssl_opts_schema(#{}),
lists:keydelete("enable", 1, Schema);
fields("trace_filter") -> fields("trace_filter") ->
%% More filters can be implemented in future, e.g. topic, clientid %% 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_logs") -> ?DESC(otel_logs);
desc("otel_metrics") -> ?DESC(otel_metrics); desc("otel_metrics") -> ?DESC(otel_metrics);
desc("otel_traces") -> ?DESC(otel_traces); desc("otel_traces") -> ?DESC(otel_traces);
desc("ssl_opts") -> ?DESC(exporter_ssl);
desc("trace_filter") -> ?DESC(trace_filter); desc("trace_filter") -> ?DESC(trace_filter);
desc(_) -> undefined. desc(_) -> undefined.