diff --git a/client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java b/client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java index 9f6100e..2190ebd 100644 --- a/client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java +++ b/client/src/main/java/com/inscloudtech/alog/client/TracerClientStarter.java @@ -117,7 +117,7 @@ public class TracerClientStarter { * 如果未赋值,从配置器获取,底层是Properties */ private void initJLogConfig(){ - LOGGER.info("从主配置获取的tagConfig:{}", JSON.toJSONString(tagConfig)); +// LOGGER.info("从主配置获取的tagConfig:{}", JSON.toJSONString(tagConfig)); Configurator configurator = ConfiguratorFactory.getInstance(); ClientHandlerBuilder.buildHandler(tagConfig, configurator); } diff --git a/client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java b/client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java index 48335a7..d6d4a26 100644 --- a/client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java +++ b/client/src/main/java/com/inscloudtech/alog/client/task/Monitor.java @@ -34,17 +34,23 @@ public class Monitor { * 每隔30秒拉取worker信息 */ private void fetchWorkerInfo() { - ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); - //开启拉取etcd的worker信息,如果拉取失败,则定时继续拉取 - scheduledExecutorService.scheduleAtFixedRate(() -> { - LOGGER.info("trying to connect to config center and fetch worker info"); - try { - fetch(); - } catch (Exception e) { - e.printStackTrace(); - } +// ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); +// //开启拉取etcd的worker信息,如果拉取失败,则定时继续拉取 +// scheduledExecutorService.scheduleAtFixedRate(() -> { +// LOGGER.info("trying to connect to config center and fetch worker info"); +// try { +// fetch(); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// +// }, 0, 30, TimeUnit.SECONDS); - }, 0, 30, TimeUnit.SECONDS); + try { + fetch(); + } catch (Exception e) { + e.printStackTrace(); + } } /** @@ -56,7 +62,8 @@ public class Monitor { List addresses; try { //如果设置了机房属性,则拉取同机房的worker。如果同机房没worker,则拉取所有 - addresses = configurator.getList("workers"); + addresses = configurator.getList("aLog-workers"); +// addresses = configurator.getString("aLog-workers"); //全是空,给个警告 if (addresses == null || addresses.isEmpty()) { LOGGER.warn("very important warn !!! workers ip info is null!!!"); diff --git a/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java index 95e6e3b..217dda9 100644 --- a/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpClient.java @@ -61,7 +61,7 @@ public class UdpClient { }); //4.bind并返回一个channel try { - Channel channel = bootstrap.bind(8887).sync().channel(); + Channel channel = bootstrap.bind(39998).sync().channel(); Context.CHANNEL = channel; //6.等待channel的close diff --git a/client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java index e53db31..5360832 100644 --- a/client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java +++ b/client/src/main/java/com/inscloudtech/alog/client/udp/UdpSender.java @@ -187,7 +187,7 @@ public class UdpSender { private static void send(TracerData tracerData) throws InterruptedException { if(!ModeHolder.getSendMode().getUnicast()){ Listips= WorkerInfoHolder.selectWorkers(); - for(String ip:ips){ + for(String ip : ips){ String[] ipPort = ip.split(Constant.SPLITER); //发往worker的ip InetSocketAddress remoteAddress = new InetSocketAddress(ipPort[0], Integer.valueOf(ipPort[1])); diff --git a/client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java b/client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java index 206eb94..187b771 100644 --- a/client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java +++ b/client/src/main/java/com/inscloudtech/alog/client/worker/WorkerInfoHolder.java @@ -28,13 +28,13 @@ public class WorkerInfoHolder { * 发消息到哪个worker,在这里挑一个 */ public static String chooseWorker() { - String workerIp = "127.0.0.1:39999"; - - int size = WORKER_HOLDER.size(); - if (size == 0) { - return workerIp; - } - +// String workerIp = "127.0.0.1:39999"; +// +// int size = WORKER_HOLDER.size(); +// if (size == 0) { +// return workerIp; +// } + String workerIp = ""; //按本机ip对worker数量进行hash // int index = Math.abs(IpUtils.getIp().hashCode() % size); if (index >= WORKER_HOLDER.size()) { @@ -53,11 +53,11 @@ public class WorkerInfoHolder { //多播模式 返回所有注册在注册中心为Work的地址 public static List selectWorkers() { - List defaultIps = new ArrayList<>(); - defaultIps.add("127.0.0.1:39999"); - if (WORKER_HOLDER.isEmpty()) { - return defaultIps; - } +// List defaultIps = new ArrayList<>(); +// defaultIps.add("127.0.0.1:39999"); +// if (WORKER_HOLDER.isEmpty()) { +// return defaultIps; +// } return WORKER_HOLDER; } diff --git a/clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java b/clientlog4j/src/main/java/com/inscloudtech/jlog/clientlog4j/TracerLog4JAppender.java similarity index 98% rename from clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java rename to clientlog4j/src/main/java/com/inscloudtech/jlog/clientlog4j/TracerLog4JAppender.java index b487445..b669719 100644 --- a/clientlog4j/src/main/java/com/jd/platform/jlog/clientlog4j/TracerLog4JAppender.java +++ b/clientlog4j/src/main/java/com/inscloudtech/jlog/clientlog4j/TracerLog4JAppender.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.clientlog4j; +package com.inscloudtech.jlog.clientlog4j; import com.inscloudtech.alog.client.constant.TracerConstant; import com.inscloudtech.alog.client.log.LogExceptionStackTrace; diff --git a/clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java b/clientlog4j2/src/main/java/com/inscloudtech/jlog/clientlog4j2/TracerLog4J2Appender.java similarity index 99% rename from clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java rename to clientlog4j2/src/main/java/com/inscloudtech/jlog/clientlog4j2/TracerLog4J2Appender.java index 2cf7a7c..7be1582 100644 --- a/clientlog4j2/src/main/java/com/jd/platform/jlog/clientlog4j2/TracerLog4J2Appender.java +++ b/clientlog4j2/src/main/java/com/inscloudtech/jlog/clientlog4j2/TracerLog4J2Appender.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.clientlog4j2; +package com.inscloudtech.jlog.clientlog4j2; import com.inscloudtech.alog.client.log.LogExceptionStackTrace; import com.inscloudtech.alog.client.tracerholder.TracerHolder; diff --git a/clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java b/clientlogback/src/main/java/com/inscloudtech/jlog/clientlogback/TracerLogbackAppender.java similarity index 98% rename from clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java rename to clientlogback/src/main/java/com/inscloudtech/jlog/clientlogback/TracerLogbackAppender.java index 3b07feb..9992471 100644 --- a/clientlogback/src/main/java/com/jd/platform/jlog/clientlogback/TracerLogbackAppender.java +++ b/clientlogback/src/main/java/com/inscloudtech/jlog/clientlogback/TracerLogbackAppender.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.clientlogback; +package com.inscloudtech.jlog.clientlogback; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java b/common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java index fc1ab02..50f9227 100644 --- a/common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java +++ b/common/src/main/java/com/inscloudtech/alog/common/handler/JcProperties.java @@ -1,10 +1,12 @@ package com.inscloudtech.alog.common.handler; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.inscloudtech.alog.common.utils.ConfigUtil; import com.inscloudtech.alog.common.utils.StringUtil; import com.inscloudtech.alog.common.utils.FastJsonUtils; +import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -41,6 +43,15 @@ public class JcProperties extends Properties { } String val = getString(key); if(StringUtil.isNotEmpty(val)){ + if (!JSONArray.isValid(val)) { + val = val.replaceAll("\\[", "").replaceAll("\\]", ""); + String[] split = val.split(","); + List result = new ArrayList<>(); + for (int i=0; i < split.length; i++){ + result.add(split[i]); + } + return result; + } return FastJsonUtils.toList(val,String.class); } return null; diff --git a/common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java b/common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java index 32be555..aef9d6c 100644 --- a/common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java +++ b/common/src/main/java/com/inscloudtech/alog/common/utils/FastJsonUtils.java @@ -1,6 +1,7 @@ package com.inscloudtech.alog.common.utils; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.JSONLibDataFormatSerializer; import com.alibaba.fastjson.serializer.SerializeConfig; diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConfigurator.java similarity index 97% rename from config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java rename to config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConfigurator.java index 62007d5..41d45c4 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfigurator.java +++ b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConfigurator.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.config.apollo; +package com.inscloudtech.jlog.config.apollo; import java.util.List; import java.util.Properties; @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; import static com.ctrip.framework.apollo.core.ApolloClientSystemConsts.APP_ID; -import static com.inscloudtech.platform.jlog.config.apollo.ApolloConstant.*; +import static com.inscloudtech.jlog.config.apollo.ApolloConstant.*; import static com.inscloudtech.alog.core.Constant.DEFAULT_NAMESPACE; diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConfiguratorProvider.java similarity index 88% rename from config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java rename to config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConfiguratorProvider.java index 4c1d574..773e705 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConfiguratorProvider.java +++ b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConfiguratorProvider.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.config.apollo; +package com.inscloudtech.jlog.config.apollo; import com.inscloudtech.alog.core.Configurator; import com.inscloudtech.alog.core.ConfiguratorProvider; diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConstant.java b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConstant.java similarity index 92% rename from config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConstant.java rename to config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConstant.java index f951198..60a094d 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloConstant.java +++ b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloConstant.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.config.apollo; +package com.inscloudtech.jlog.config.apollo; /** * @author tangbohu diff --git a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloListener.java similarity index 89% rename from config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java rename to config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloListener.java index a9babfb..47e94c5 100644 --- a/config/config-apollo/src/main/java/com/jd/platform/jlog/config/apollo/ApolloListener.java +++ b/config/config-apollo/src/main/java/com/inscloudtech/jlog/config/apollo/ApolloListener.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.config.apollo; +package com.inscloudtech.jlog.config.apollo; import com.inscloudtech.alog.core.ClientHandlerBuilder; import com.inscloudtech.alog.core.ConfigChangeEvent; diff --git a/config/config-apollo/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider b/config/config-apollo/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider index 8b71ea8..17d6a12 100644 --- a/config/config-apollo/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider +++ b/config/config-apollo/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider @@ -1 +1 @@ -com.inscloudtech.platform.jlog.config.apollo.ApolloConfiguratorProvider +com.inscloudtech.jlog.config.apollo.ApolloConfiguratorProvider diff --git a/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java b/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java index a7c0bfe..bae614f 100644 --- a/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java +++ b/config/config-core/src/main/java/com/inscloudtech/alog/core/ClientHandlerBuilder.java @@ -17,7 +17,10 @@ public class ClientHandlerBuilder { tagConfig = buildTagConfigByConfigurator(configurator); } ExtractHandler.buildExtractHandler(tagConfig); - CompressHandler.buildCompressHandler(configurator.getLong("compress"), configurator.getLong("threshold")); +// compress: 68 +// threshold: 10 + CompressHandler.buildCompressHandler(68L, 10l); +// CompressHandler.buildCompressHandler(configurator.getLong("compress"), configurator.getLong("threshold")); } @@ -34,6 +37,19 @@ public class ClientHandlerBuilder { private static TagConfig buildTagConfigByConfigurator(Configurator configurator){ - return configurator.getObject("tag-config", TagConfig.class); + TagConfig tagConfig = new TagConfig(); + tagConfig.setDelimiter("|"); + tagConfig.setExtract(41); + +// tagConfig.setReqTags(); +// tag-config: +// reqTags[0]: uid +// reqTags[1]: url +// logTags[0]: node +// logTags[1]: bizType +// respTags[0]: errno +// respTags[1]: msg + return tagConfig; +// return configurator.getObject("tag-config", TagConfig.class); } } diff --git a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java b/config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdConfigurationProvider.java similarity index 87% rename from config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java rename to config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdConfigurationProvider.java index 055a284..4374726 100644 --- a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurationProvider.java +++ b/config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdConfigurationProvider.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.etcd; +package com.inscloudtech.jlog.etcd; import com.inscloudtech.alog.core.Configurator; diff --git a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java b/config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdConfigurator.java similarity index 98% rename from config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java rename to config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdConfigurator.java index b549696..aca45e1 100644 --- a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdConfigurator.java +++ b/config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdConfigurator.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.etcd; +package com.inscloudtech.jlog.etcd; import java.io.IOException; diff --git a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java b/config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdListener.java similarity index 88% rename from config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java rename to config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdListener.java index 0d05c8b..0dc2593 100644 --- a/config/config-etcd/src/main/java/com/jd/platform/jlog/etcd/EtcdListener.java +++ b/config/config-etcd/src/main/java/com/inscloudtech/jlog/etcd/EtcdListener.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.etcd; +package com.inscloudtech.jlog.etcd; import com.google.protobuf.ByteString; import com.ibm.etcd.api.Event; @@ -19,9 +19,6 @@ import java.io.StringReader; import java.util.List; import java.util.Set; -import static com.inscloudtech.platform.jlog.etcd.EtcdConfigurator.PROPERTIES; -import static com.inscloudtech.platform.jlog.etcd.EtcdConfigurator.PROPERTIES_PATH; - /** * @author tangbohu * @version 1.0.0 @@ -65,7 +62,7 @@ public class EtcdListener implements ConfigChangeListener { @Override public void onChangeEvent(ConfigChangeEvent event) { - RangeResponse rangeResponse = EtcdConfigurator.client.getKvClient().get(ByteString.copyFromUtf8(PROPERTIES_PATH)).sync(); + RangeResponse rangeResponse = EtcdConfigurator.client.getKvClient().get(ByteString.copyFromUtf8(EtcdConfigurator.PROPERTIES_PATH)).sync(); List keyValues = rangeResponse.getKvsList(); if (CollectionUtil.isEmpty(keyValues)) { return; @@ -79,13 +76,13 @@ public class EtcdListener implements ConfigChangeListener { e.printStackTrace(); } - Set diffKeys = CollectionUtil.diffKeys(props, PROPERTIES); + Set diffKeys = CollectionUtil.diffKeys(props, EtcdConfigurator.PROPERTIES); if(!diffKeys.isEmpty()){ - PROPERTIES = props; + EtcdConfigurator.PROPERTIES = props; for (String diffKey : diffKeys) { LOGGER.warn("NACOS {} 配置变更 key={} 变更事件:{}", event.getKey(), diffKey, String.valueOf(props.get(diffKey)), - String.valueOf(PROPERTIES.get(diffKey))); + String.valueOf(EtcdConfigurator.PROPERTIES.get(diffKey))); } ClientHandlerBuilder.refresh(); } diff --git a/config/config-etcd/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider b/config/config-etcd/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider index 1961a73..f75f62a 100644 --- a/config/config-etcd/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider +++ b/config/config-etcd/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider @@ -1 +1 @@ -com.inscloudtech.platform.jlog.etcd.EtcdConfigurationProvider +com.inscloudtech.jlog.etcd.EtcdConfigurationProvider diff --git a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java b/config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosConfigurator.java similarity index 97% rename from config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java rename to config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosConfigurator.java index 7ad6443..6961524 100644 --- a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfigurator.java +++ b/config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosConfigurator.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.nacos; +package com.inscloudtech.alog.nacos; import java.io.*; import java.util.*; @@ -17,6 +17,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static com.inscloudtech.alog.common.utils.ConfigUtil.formatConfigStr; +import static com.inscloudtech.alog.core.Constant.*; + /** diff --git a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java b/config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosConfiguratorProvider.java similarity index 86% rename from config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java rename to config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosConfiguratorProvider.java index 8a5831c..c7ca1d0 100644 --- a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosConfiguratorProvider.java +++ b/config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosConfiguratorProvider.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.nacos; +package com.inscloudtech.alog.nacos; import com.inscloudtech.alog.core.Configurator; diff --git a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java b/config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosListener.java similarity index 98% rename from config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java rename to config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosListener.java index 9d7eda5..50c2207 100644 --- a/config/config-nacos/src/main/java/com/jd/platform/jlog/nacos/NacosListener.java +++ b/config/config-nacos/src/main/java/com/inscloudtech/alog/nacos/NacosListener.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.nacos; +package com.inscloudtech.alog.nacos; import com.alibaba.nacos.api.config.listener.AbstractSharedListener; import com.alibaba.nacos.api.naming.listener.Event; diff --git a/config/config-nacos/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider b/config/config-nacos/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider index ea2316a..26dcbb0 100644 --- a/config/config-nacos/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider +++ b/config/config-nacos/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider @@ -1 +1 @@ -com.inscloudtech.platform.jlog.nacos.NacosConfiguratorProvider +com.inscloudtech.alog.nacos.NacosConfiguratorProvider diff --git a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java b/config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkConfigurator.java similarity index 98% rename from config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java rename to config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkConfigurator.java index 7b5a046..e23d636 100644 --- a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfigurator.java +++ b/config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkConfigurator.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.zk; +package com.inscloudtech.jlog.zk; import java.io.ByteArrayInputStream; import java.util.List; diff --git a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java b/config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkConfiguratorProvider.java similarity index 90% rename from config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java rename to config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkConfiguratorProvider.java index b18a156..689d394 100644 --- a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkConfiguratorProvider.java +++ b/config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkConfiguratorProvider.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.zk; +package com.inscloudtech.jlog.zk; import com.inscloudtech.alog.core.Configurator; diff --git a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java b/config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkListener.java similarity index 77% rename from config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java rename to config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkListener.java index 684997c..cef6f5d 100644 --- a/config/config-zk/src/main/java/com/jd/platform/jlog/zk/ZkListener.java +++ b/config/config-zk/src/main/java/com/inscloudtech/jlog/zk/ZkListener.java @@ -1,4 +1,4 @@ -package com.inscloudtech.platform.jlog.zk; +package com.inscloudtech.jlog.zk; import com.alibaba.fastjson.JSON; import com.inscloudtech.alog.common.utils.CollectionUtil; @@ -12,8 +12,6 @@ import org.slf4j.LoggerFactory; import java.util.Properties; import java.util.Set; -import static com.inscloudtech.platform.jlog.zk.ZkConfigurator.*; - /** * @author didi @@ -28,7 +26,7 @@ public class ZkListener implements ConfigChangeListener { public ZkListener(String path) { this.path = path; - cache = new NodeCache(zkClient, path); + cache = new NodeCache(ZkConfigurator.zkClient, path); try { cache.start(true); cache.getListenable().addListener(() -> onChangeEvent(null)); @@ -41,23 +39,23 @@ public class ZkListener implements ConfigChangeListener { @Override public void onChangeEvent(ConfigChangeEvent event) { - LOGGER.info("ZK数据变更-当前监听器关注的path:{} PROPERTIES:{}", path, JSON.toJSONString(PROPERTIES)); + LOGGER.info("ZK数据变更-当前监听器关注的path:{} PROPERTIES:{}", path, JSON.toJSONString(ZkConfigurator.PROPERTIES)); Properties props = new Properties(); - props.putAll(PROPERTIES); + props.putAll(ZkConfigurator.PROPERTIES); try { LOGGER.debug("ZK数据变更,旧Properties:{}", JSON.toJSONString(props)); - loadZkData(); - LOGGER.debug("ZK数据变更,新Properties:{}", JSON.toJSONString(PROPERTIES)); + ZkConfigurator.loadZkData(); + LOGGER.debug("ZK数据变更,新Properties:{}", JSON.toJSONString(ZkConfigurator.PROPERTIES)); } catch (Exception e) { e.printStackTrace(); } - Set diffKeys = CollectionUtil.diffKeys(props, PROPERTIES); + Set diffKeys = CollectionUtil.diffKeys(props, ZkConfigurator.PROPERTIES); if(!diffKeys.isEmpty()){ for (String diffKey : diffKeys) { LOGGER.warn("ZK {} 配置变更 key={} 变更事件:{}", path, diffKey, new ConfigChangeEvent(diffKey, String.valueOf(props.get(diffKey)), - String.valueOf(PROPERTIES.get(diffKey)))); + String.valueOf(ZkConfigurator.PROPERTIES.get(diffKey)))); } ClientHandlerBuilder.refresh(); } diff --git a/config/config-zk/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider b/config/config-zk/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider index 2541515..ec859dd 100644 --- a/config/config-zk/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider +++ b/config/config-zk/src/main/resources/META-INF/services/com.jd.platform.jlog.core.ConfiguratorProvider @@ -1 +1 @@ -com.inscloudtech.platform.jlog.zk.ZkConfiguratorProvider +com.inscloudtech.jlog.zk.ZkConfiguratorProvider diff --git a/config/pom.xml b/config/pom.xml index e269435..070ce64 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -13,9 +13,9 @@ alog-config config-core - config-etcd - config-apollo - config-nacos - config-zk + + + + diff --git a/example/src/main/java/com/inscloudtech/alog/clientdemo/aspectj/ActionLogAspect.java b/example/src/main/java/com/inscloudtech/alog/clientdemo/aspectj/ActionLogAspect.java index 641df28..d820879 100644 --- a/example/src/main/java/com/inscloudtech/alog/clientdemo/aspectj/ActionLogAspect.java +++ b/example/src/main/java/com/inscloudtech/alog/clientdemo/aspectj/ActionLogAspect.java @@ -41,13 +41,13 @@ import java.util.stream.Collectors; @Component public class ActionLogAspect { - @Around("@annotation(actionLog)") public Object doAround(ProceedingJoinPoint joinPoint, ActionLog actionLog) throws Throwable { ActionLogMessage actionLogMessage = new ActionLogMessage(); - //获取方法参数 Object[] args = joinPoint.getArgs(); Object arg = args[0]; + + //当操作行为是修改数据时,需要上报,修改前后数据值 if(actionLog.businessType().equals(BusinessType.UPDATE)){ Class mapperClass = actionLog.mapperClass(); //service,mapper对应的实体类 @@ -91,8 +91,6 @@ public class ActionLogAspect { e.printStackTrace(); } - - Long businessId = 0L; //根据mapper查询一条修改前的数据 Object serviceObj = SpringUtils.getBean(mapperClass); @@ -124,7 +122,6 @@ public class ActionLogAspect { long endTime = System.currentTimeMillis(); // 计算响应时间 long responseTime = endTime - startTime; -// log.info("请求的响应时间为: {} 毫秒", responseTime); actionLogMessage.setResponseTime(responseTime); handleLog(joinPoint, actionLog, null, result,actionLogMessage); return result; @@ -162,6 +159,7 @@ public class ActionLogAspect { getControllerMethodDescription(joinPoint, actionLog, actionLogMessage, jsonResult); long tracerId = TracerHolder.getTracerId(); actionLogMessage.setTracerId(tracerId); + actionLogMessage.setCreateTime(System.currentTimeMillis()); UdpSender.offerActionLogger(actionLogMessage); } catch (Exception exp) { // 记录本地异常日志 diff --git a/example/src/main/java/com/inscloudtech/alog/clientdemo/custom/Starter.java b/example/src/main/java/com/inscloudtech/alog/clientdemo/custom/Starter.java index 8a824ed..bc2ceb2 100644 --- a/example/src/main/java/com/inscloudtech/alog/clientdemo/custom/Starter.java +++ b/example/src/main/java/com/inscloudtech/alog/clientdemo/custom/Starter.java @@ -51,7 +51,7 @@ public class Starter { .setTagConfig(tagConfig) .setSendMode(sendMode) .build(); - logger.info("初始化tagConfig: {}",tagConfig); +// logger.info("初始化tagConfig: {}",tagConfig); tracerClientStarter.startPipeline(); } diff --git a/example/src/main/resources/application.yml b/example/src/main/resources/application.yml index 3391491..3720117 100644 --- a/example/src/main/resources/application.yml +++ b/example/src/main/resources/application.yml @@ -2,12 +2,8 @@ server: port: 8085 # 数据源配置 spring: - redis: - host: 127.0.0.1 datasource: driver-class-Name: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) url: jdbc:mysql://192.168.3.20:3306/action_log?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: root password: 123456 @@ -31,20 +27,14 @@ spring: # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true # username: SA # password: root -tag-config: - reqTags[0]: uid - reqTags[1]: url - logTags[0]: node - logTags[1]: bizType - respTags[0]: errno - respTags[1]: msg - delimiter: | - extract: 41 - -compress: 68 -threshold: 10 + + + #worker的地址 -workers: ['127.0.0.1:39999','127.0.0.1:10000'] +aLog-workers: + - 127.0.0.1:39999 + + #apollo.meta=http://127.0.0.1:8080 #apollo.config-service=http://127.0.0.1:8080 #app.id=order