update

wangning
Commit 8a3aa117eeadc117d24b3aba11b57751260a0eda 1 parent 9cc481c3
Showing 3 changed files with 10 additions and 4 deletions
monitor-service-javaserver/src/main/java/com/monitor/javaserver/ctrl/NewJavaApiInfoCtrl.java
monitor-service-javaserver/src/main/java/com/monitor/javaserver/service/impl/NewJavaApiInfoServiceImpl.java
monitor-service-model/src/main/java/com/monitor/model/request/NewJavaApiInfoReq.java
--- a/monitor-service-javaserver/src/main/java/com/monitor/javaserver/ctrl/NewJavaApiInfoCtrl.java
View file @8a3aa11
+++ b/monitor-service-javaserver/src/main/java/com/monitor/javaserver/ctrl/NewJavaApiInfoCtrl.java
View file @8a3aa11
@@ -150,9 +150,9 @@ public class NewJavaApiInfoCtrl {
         for(int i = 0;i<strs.length;i++){
             String ip = strs[i];
             Point point = Point.measurement("service_access")
-                    .tag("context","gateway").tag("event","/gateway3").tag("host","/gateway")
+                    .tag("context","gateway").tag("event","/gateway2").tag("host","/gateway")
                     .tag("hostAddress",ip).tag("src_service","app.product.promotion").tag("status_code","200")
-                    .addField("cost", RandomUtils.nextInt(199) + 3000).addField("ip",ip)
+                    .addField("cost", RandomUtils.nextInt(199) + 2000).addField("ip",ip)
                     .addField("stack","Total Delay [15004ms] /gateway +---[15004ms] - com.yoho.core.common.monitor.ThreadProfileInterceptor.preHandle - [enter:1476930300814,exit:1476930315818] +---[15004ms] - app.product.data. - [enter:1476930300814,exit:1476930315818]")
                     .build();
             inluxDBSingle.getInfluxDBByName(InfluxDBContants.AWS).getInfluxDB()
@@ -170,7 +170,7 @@ public class NewJavaApiInfoCtrl {
         for(int i = 0;i<strs.length;i++){
             String ip = strs[i];
             Point point = Point.measurement("service_server_exception")
-                    .tag("context","gateway").tag("event","/gateway1").tag("host","/brower/favorite/isFavorite")
+                    .tag("context","gateway").tag("event","/gateway").tag("host","/brower/favorite/isFavorite")
                     .tag("hostAddress",ip).tag("service_name","brower/favorite/isFavorite")
                     .addField("ip",ip)
                     .addField("stack","org.apache.catalina\\n.connector.ClientAbortException: java.io.IOException: 断开的管道\\n\\tat org.apache.catalina.connector.OutputBuffer\\n.realWriteBytes(OutputBuffer.java:393)\\n\\tat org.apache.tomcat.util.buf.ByteChunk.flushBuffer(ByteChunk\\n.java:426)\\n\\tat org.apache.catalina.connector.OutputBuffer.doFlush(OutputBuffer.java:342)\\n\\tat org\\n.apache.catalina.connector.OutputBuffer.flush(OutputBuffer.java:317)\\n\\tat org.apache.catalina.connector\\n.CoyoteOutputStream.flush(CoyoteOutputStream.java:110)\\n\\tat com.fasterxml.jackson.core.json.UTF8JsonGenerator\\n.flush(UTF8JsonGenerator.java:1022)\\n\\tat com.fasterxml.jackson.databind.ObjectWriter.writeValue(ObjectWriter\\n.java:891)\\n\\tat org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter.writeInternal\\n(AbstractJackson2HttpMessageConverter.java:264)\\n\\tat org.springframework.http.converter.AbstractGenericHttpMessageConverter\\n.write(AbstractGenericHttpMessageConverter.java:100)\\n\\tat org.springframework.web.servlet.mvc.method\\n.annotation.AbstractMessageConverterMethodProcessor.writeWithMessageConverters(AbstractMessageConverterMethodProcessor\\n.java:202)\\n\\tat org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor\\n.writeWithMessageConverters(AbstractMessageConverterMethodProcessor.java:133)\\n\\tat org.springframework\\n.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor.handleReturnValue(RequestResponseBodyMethodProcessor\\n.java:165)\\n\\tat org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite.handleReturnValue\\n(HandlerMethodReturnValueHandlerComposite.java:80)\\n\\tat org.springframework.web.servlet.mvc.method.annotation\\n.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:126)\\n\\tat org.springframework\\n.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter\\n.java:806)\\n\\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal\\n(RequestMappingHandlerAdapter.java:729)\\n\\tat org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter\\n.handle(AbstractHandlerMethodAdapter.java:85)\\n\\tat org.springframework.web.servlet.DispatcherServlet\\n.doDispatch(DispatcherServlet.java:959)\\n\\tat org.springframework.web.servlet.DispatcherServlet.doService\\n(DispatcherServlet.java:893)\\n\\tat org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet\\n.java:970)\\n\\tat org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:872)\\n\\n\\tat javax.servlet.http.HttpServlet.service(HttpServlet.java:648)\\n\\tat org.springframework.web.servlet\\n.FrameworkServlet.service(FrameworkServlet.java:846)\\n\\tat javax.servlet.http.HttpServlet.service(HttpServlet\\n.java:729)\\n\\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain\\n.java:291)\\n\\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java\\n:206)\\n\\tat org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)\\n\\tat org.apache.catalina\\n.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)\\n\\tat org.apache.catalina\\n.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)\\n\\tat org.springframework.web\\n.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:85)\\n\\tat org.springframework\\n.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\\n\\tat org.apache.catalina.core\\n.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)\\n\\tat org.apache.catalina.core\\n.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)\\n\\tat org.apache.catalina.core.StandardWrapperValve\\n.invoke(StandardWrapperValve.java:217)\\n\\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve\\n.java:106)\\n\\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:502\\n)\\n\\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:142)\\n\\tat org.apache\\n.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)\\n\\tat org.apache.catalina.core.StandardEngineValve\\n.invoke(StandardEngineValve.java:88)\\n\\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter\\n.java:518)\\n\\tat org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java\\n:1091)\\n\\tat org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java\\n:673)\\n\\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1500)\\n\\tat\\n org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1456)\\n\\tat java.util.concurrent\\n.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)\\n\\tat java.util.concurrent.ThreadPoolExecutor$Worker\\n.run(ThreadPoolExecutor.java:617)\\n\\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run\\n(TaskThread.java:61)\\n\\tat java.lang.Thread.run(Thread.java:745)\\nCaused by: java.io.IOException: 断开\\n的管道\\n\\tat sun.nio.ch.FileDispatcherImpl.write0(Native Method)\\n\\tat sun.nio.ch.SocketDispatcher.write\\n(SocketDispatcher.java:47)\\n\\tat sun.nio.ch.IOUtil.writeFromNativeBuffer(IOUtil.java:93)\\n\\tat sun.nio\\n.ch.IOUtil.write(IOUtil.java:65)\\n\\tat sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:471\\n)\\n\\tat org.apache.tomcat.util.net.NioChannel.write(NioChannel.java:124)\\n\\tat org.apache.tomcat.util\\n.net.NioBlockingSelector.write(NioBlockingSelector.java:101)\\n\\tat org.apache.tomcat.util.net.NioSelectorPool\\n.write(NioSelectorPool.java:172)\\n\\tat org.apache.coyote.http11.InternalNioOutputBuffer.writeToSocket\\n(InternalNioOutputBuffer.java:139)\\n\\tat org.apache.coyote.http11.InternalNioOutputBuffer.addToBB(InternalNioOutputBuffer\\n.java:197)\\n\\tat org.apache.coyote.http11.InternalNioOutputBuffer.access$000(InternalNioOutputBuffer\\n.java:41)\\n\\tat org.apache.coyote.http11.InternalNioOutputBuffer$SocketOutputBuffer.doWrite(InternalNioOutputBuffer\\n.java:320)\\n\\tat org.apache.coyote.http11.filters.ChunkedOutputFilter.doWrite(ChunkedOutputFilter.java\\n:118)\\n\\tat org.apache.coyote.http11.AbstractOutputBuffer.doWrite(AbstractOutputBuffer.java:256)\\n\\tat\\n org.apache.coyote.Response.doWrite(Response.java:501)\\n\\tat org.apache.catalina.connector.OutputBuffer\\n.realWriteBytes(OutputBuffer.java:388)\\n\\t... 47 more\\n")
--- a/monitor-service-javaserver/src/main/java/com/monitor/javaserver/service/impl/NewJavaApiInfoServiceImpl.java
View file @8a3aa11
+++ b/monitor-service-javaserver/src/main/java/com/monitor/javaserver/service/impl/NewJavaApiInfoServiceImpl.java
View file @8a3aa11
@@ -119,6 +119,11 @@ public class NewJavaApiInfoServiceImpl implements NewJavaApiInfoService {
             }
             dataMap.put("name",ip);
+            if(ip.startsWith("172")){
+                dataMap.put("cloudType",1);
+            }else{
+                dataMap.put("cloudType",2);
+            }
             contentList.add(dataMap);
         }
@@ -201,7 +206,7 @@ public class NewJavaApiInfoServiceImpl implements NewJavaApiInfoService {
         //获取总请求次数和平均耗时
         Map<String,NewJavaApiInfoRep> infoMap = serviceAccessMapper.getDataByContextAndApiName(req);
         //获取超时数据
-        Map<String,List<String>> timeoutInfoMap = serviceAccessMapper.getTimeoutInfoByContextAndIp(req);
+        Map<String,List<String>> timeoutInfoMap = serviceAccessMapper.getTimeoutInfoByContextAndApiName(req);
         //获取异常数据
         Map<String,List<String>> errorInfoMap = serviceServerExceptionMapper.getErrorDataByContextAndApiName(req);
--- a/monitor-service-model/src/main/java/com/monitor/model/request/NewJavaApiInfoReq.java
View file @8a3aa11
+++ b/monitor-service-model/src/main/java/com/monitor/model/request/NewJavaApiInfoReq.java
View file @8a3aa11
@@ -22,6 +22,7 @@ public class NewJavaApiInfoReq {
     //1:aws 2:qcloud
     private int cloudType;
+    //接口名
     private String apiName;
     public int getServiceType() {