Merge branch 'dev' of chenweida/jkzl-starter into dev

admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/HibernateFilter.java

@@ -47,7 +47,7 @@ public class HibernateFilter extends EmptyInterceptor {
            event.setSql(sql);
            event.setEventStartTime(endTime);
            event.setEventEndTime(endTime);
            event.setEventName("system_sql_tracer");
            event.setEventName("system_sql_hibernate_tracer");
            event.setExcuteTime(-1L);
            event.setSpanName(spanrName);
            event.setSpanId(tracer.getCurrentSpan().getSpanId() + "");

admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/ZuulPostFilter.java

@@ -71,7 +71,7 @@ public class ZuulPostFilter extends ZuulFilter {
            event.setEventEndTime(startTime);
            event.setExcuteTime(0L);
            event.setHeader(headerObj.toString());
            event.setEventName("system_http_tracer");
            event.setEventName("system_zuul_tracer");
            event.setSpanName(spanrName);
            event.setSpanId(tracer.getCurrentSpan().getSpanId() + "");
            event.setTraceId(tracer.getCurrentSpan().traceIdString());

admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/ZuulPreFilter.java

@@ -71,7 +71,7 @@ public class ZuulPreFilter extends ZuulFilter {
            event.setEventEndTime(startTime);
            event.setExcuteTime(0L);
            event.setHeader(headerObj.toString());
            event.setEventName("system_http_tracer");
            event.setEventName("system_zuul_tracer");
            event.setSpanName(spanrName);
            event.setSpanId(tracer.getCurrentSpan().getSpanId() + "");
            event.setTraceId(tracer.getCurrentSpan().traceIdString());

demo/demo-socket-client/src/main/resources/application.yml

@@ -17,7 +17,7 @@ yihu:
      advice:
        sql: true #默认false
        http: true #默认true
        hibernateSql: true #默认false
        hibernateSql: true #默认false 如果是true需要客户端代码手动添加监听器
        zuul:
          pre: true #默认false
          post: true #默认false