From c0d46c69c179c567f7c34c5f5597eb97cabf9322 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Tue, 6 May 2025 22:57:55 +0800 Subject: [PATCH] fix --- apps/efka/src/client/efka_client.erl | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/apps/efka/src/client/efka_client.erl b/apps/efka/src/client/efka_client.erl index 16b2bfc..df0d2a1 100644 --- a/apps/efka/src/client/efka_client.erl +++ b/apps/efka/src/client/efka_client.erl @@ -33,9 +33,6 @@ %% efka下发给微服务采集项 -define(PACKET_PUSH_METRIC, 6). -%% 微服务给efka发送log消息 --define(PACKET_LOG, 9). - %% 微服务从efka获取自身的采集项 -define(PACKET_REQUEST_METRIC, 10). %% 微服务从efka获取自身的参数 @@ -47,7 +44,7 @@ %% API -export([start_link/3]). -export([device_offline/1, device_online/1]). --export([send_metric_data/2, send_log/1, request_metric/0, request_param/0, send_event/2, controller_process/1]). +-export([send_metric_data/3, request_metric/0, request_param/0, send_event/2, controller_process/1]). -export([test/0]). @@ -71,14 +68,9 @@ test() -> controller_process(ControllerPid) when is_pid(ControllerPid) -> gen_server:call(?MODULE, {controller_process, ControllerPid}). --spec send_metric_data(Fields :: list(), Tags :: #{}) -> {ok, Result :: any()} | {error, Reason :: any()}. -send_metric_data(Fields, Tags) when is_list(Fields), is_map(Tags) -> - {ok, Ref} = gen_server:call(?MODULE, {send_metric_data, self(), Fields, Tags}), - await_reply(Ref, ?EFKA_REQUEST_TIMEOUT). - --spec send_log(Message :: binary()) -> no_return(). -send_log(Message) when is_binary(Message) -> - gen_server:cast(?MODULE, {send_log, Message}). +-spec send_metric_data(Measurement :: binary(), Tags :: map(), Fields :: map()) -> no_return(). +send_metric_data(Measurement, Tags, Fields) when is_binary(Measurement), is_map(Fields), is_map(Tags) -> + gen_server:cast(?MODULE, {send_metric_data, Measurement, Tags, Fields}). %% efka_server为了统一，r对象为字符串；需要2次json_decode -spec request_metric() -> {ok, Result :: list()} | {error, Reason :: any()}. @@ -205,12 +197,6 @@ handle_cast({send_metric_data, Measurement, Tags, Fields}, State = #state{socket {noreply, State}; -handle_cast({send_log, LogMessage}, State = #state{socket = Socket}) -> - Packet = <<0:32, ?PACKET_LOG:8, LogMessage/binary>>, - ok = gen_tcp:send(Socket, Packet), - - {noreply, State}; - handle_cast({send_event, EventType, Params}, State = #state{socket = Socket}) -> Body = jiffy:encode(#{<<"event_type">> => EventType, <<"params">> => Params}, [force_utf8]), Packet = <<0:32, ?PACKET_EVENT:8, Body/binary>>,