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

Merge pull request #12154 from SergeTupchiy/otel-api-fix-hidden-fields-ssl-opts 

OTEL API fix hidden fields and ssl opts
This commit is contained in:
SergeTupchiy 2023-12-12 14:10:03 +02:00 committed by GitHub
parent 71011ad084 3c3452c1dd
commit 42e3b9752d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 11 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.

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

@ -108,7 +108,7 @@ fields("otel_metrics") ->
aliases => [scheduled_delay], aliases => [scheduled_delay],
default => <<"10s">>, default => <<"10s">>,
desc => ?DESC(scheduled_delay), desc => ?DESC(scheduled_delay),
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_MEDIUM
} }
)} )}
]; ];
@ -156,7 +156,7 @@ fields("otel_logs") ->
#{ #{
default => <<"1s">>, default => <<"1s">>,
desc => ?DESC(scheduled_delay), desc => ?DESC(scheduled_delay),
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_MEDIUM
} }
)} )}
]; ];
@ -195,7 +195,7 @@ fields("otel_traces") ->
#{ #{
default => <<"5s">>, default => <<"5s">>,
desc => ?DESC(scheduled_delay), desc => ?DESC(scheduled_delay),
importance => ?IMPORTANCE_HIDDEN importance => ?IMPORTANCE_MEDIUM
} }
)}, )},
{filter, {filter,
@ -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.

1
apps/emqx_opentelemetry/test/emqx_otel_schema_SUITE.erl
View File

@ -164,7 +164,6 @@ t_old_conf_disabled_exporter(_Config) ->
?assertNot(erlang:is_map_key(interval, maps:get(exporter, OtelConf))). ?assertNot(erlang:is_map_key(interval, maps:get(exporter, OtelConf))).
t_old_conf_exporter(_Config) -> t_old_conf_exporter(_Config) ->
io:format(user, "TC running: ~p~n", [?FUNCTION_NAME]),
OtelConf = emqx:get_config([opentelemetry]), OtelConf = emqx:get_config([opentelemetry]),
?assertMatch( ?assertMatch(
#{ #{

2
apps/emqx_opentelemetry/test/emqx_otel_trace_SUITE.erl
View File

@ -29,7 +29,7 @@
%% How to run it locally: %% How to run it locally:
%% 1. Uncomment networks in .ci/docker-compose-file/docker-compose-otel.yaml, %% 1. Uncomment networks in .ci/docker-compose-file/docker-compose-otel.yaml,
%% Uncomment OTLP gRPC ports mappings for otel-collector and otel-collector-tls services. %% Uncomment OTLP gRPC ports mappings for otel-collector and otel-collector-tls services.
%% Uncomment jaeger-all-in-one prots maooing. %% Uncomment jaeger-all-in-one ports mapping.
%% 2. Start deps services: %% 2. Start deps services:
%% DOCKER_USER="$(id -u)" docker-compose -f .ci/docker-compose-file/docker-compose-otel.yaml up %% DOCKER_USER="$(id -u)" docker-compose -f .ci/docker-compose-file/docker-compose-otel.yaml up
%% 3. Run tests with special env variables: %% 3. Run tests with special env variables: