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

OTEL API fix hidden fields and ssl opts

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.

apps/emqx_opentelemetry/src/emqx_otel_schema.erl

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

apps/emqx_opentelemetry/test/emqx_otel_schema_SUITE.erl

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

apps/emqx_opentelemetry/test/emqx_otel_trace_SUITE.erl

@@ -29,7 +29,7 @@
 %% How to run it locally:
 %%  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 jaeger-all-in-one prots maooing.
+%%     Uncomment jaeger-all-in-one ports mapping.
 %%  2. Start deps services:
 %%     DOCKER_USER="$(id -u)" docker-compose -f .ci/docker-compose-file/docker-compose-otel.yaml up
 %%  3. Run tests with special env variables: