save

i6000/NmsMonMsProto.proto

@@ -1,4 +1,5 @@
-option java_package = "com.nrxt.nms.mon.ms.proto"; 
+option java_package = "com.nrxt.nms.mon.ms.proto";
+option go_package = "git.cestong.com.cn/cecf/i6000pusher/pkg/pb";
 option java_outer_classname = "NmsMonMsProto";
 
 package com.nrxt.nms.mon.ms.proto;

i6000/NmsRecvSendMetricProto.proto

@@ -1,4 +1,5 @@
 option java_package = "com.nrxt.nms.mon.ms.proto"; 
+option go_package = "git.cestong.com.cn/cecf/i6000pusher/pkg/pb";
 option java_outer_classname = "NmsRecvSendMetricProto";
 
 package com.nrxt.nms.mon.ms.proto;

i6000/新一代应急指挥端点.csv

@@ -0,0 +1,9 @@
+ecs-backend-warning,/ecs-backend-warning-service/warningManagement/selectAllByPcNew
+ecs-backend-warning,/ecs-backend-warning-service/warningManagement/insert
+ecs-common-gateway,/ecs-backend-warning-service/warningManagement/starterSendNew
+ecs-backend-warning,/ecs-backend-warning-service/warningManagement/starterSendNew
+ecs-common-msg-service,/ecs-common-msg-service/message/insert
+ecs-common-sys-service,/ecs-common-sys-service/bpm/getCurrentTaskIds
+ecs-common-bpm,/ecs-common-sys-service/bpm/getCurrentTaskIds
+ecs-common-sys-service,/ecs-common-sys-service/bpm/send
+ecs-backend-disasterrepair,/ecs-backend-disasterrepair-service/emergencyevents/selectAll

src/main/java/com/cecf/observe/agentstream/i6000/Topo2BytesMapper.java

@@ -74,6 +74,7 @@ public class Topo2BytesMapper implements FlatMapFunction<Tuple2<List<ServiceTopo
                     .setDestNodeType(TopoMessage.NodeType.SERVICE)
                     .setDestApmServiceCode(destServiceName)
                     .setDestApmEndpointName(destEndpoint)
+
                     .setDestAppCmdbId(destCmdbID)
 
                     .setAPMServiceCallCount(String.valueOf(requestCount))

src/main/java/com/cecf/observe/agentstream/otel/PojoSpan.java

@@ -280,7 +280,7 @@ public class PojoSpan {
             URL url = (new URI(rawUrl)).toURL();
             return url.getPath();
         } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
-            logger.warn("解析http route失败: ss: {}", (Object) SpanAttributes);
+//            logger.warn("解析http route失败: ss: {}", (Object) SpanAttributes);
             return "";
         }
     }
@@ -294,7 +294,7 @@ public class PojoSpan {
         if (url.isEmpty()) {
             String host = getAttribute("", "http.host").trim();
             if (host.isEmpty()) { // 没有host，返回空url
-                logger.warn("解析http url失败: ss: {}", (Object) SpanAttributes);
+//                logger.warn("解析http url失败: ss: {}", (Object) SpanAttributes);
                 return "";
             }
             String target = getAttribute("", "http.target").trim();
@@ -316,7 +316,7 @@ public class PojoSpan {
         }
         String rawUrl = this.getHttpUrl().trim();
         if (rawUrl.isEmpty()) {
-            logger.warn("解析http target失败: ss: {}", (Object) SpanAttributes);
+//            logger.warn("解析http target失败: ss: {}", (Object) SpanAttributes);
             return "";
         }
         try {
@@ -328,7 +328,7 @@ public class PojoSpan {
             }
             return String.format("%s?%s", pt, rawQuery);
         } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
-            logger.warn("解析http target失败: ss: {}", (Object) SpanAttributes);
+//            logger.warn("解析http target失败: ss: {}", (Object) SpanAttributes);
             return target;
         }
     }
@@ -336,7 +336,7 @@ public class PojoSpan {
     public String getHttpFlavor() {
         String flavor = getAttribute("", "http.flavor", "http.protocol").trim();
         if (flavor.isEmpty()) {
-            logger.warn("解析http flavor失败: ss: {}", (Object) SpanAttributes);
+//            logger.warn("解析http flavor失败: ss: {}", (Object) SpanAttributes);
             return "";
         }
         String[] arr = flavor.split("/");
@@ -356,7 +356,7 @@ public class PojoSpan {
             URL url = (new URI(rawUrl)).toURL();
             return url.getHost();
         } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
-            logger.warn("解析httpHost失败:{} ss: {}", e, this.SpanAttributes);
+//            logger.warn("解析httpHost失败:{} ss: {}", e, this.SpanAttributes);
             return host;
         }
     }
@@ -368,13 +368,13 @@ public class PojoSpan {
     public long getHttpStatusCode() {
         String code = getAttribute("", "http.status_code", "http.response.status_code").trim();
         if (code.isEmpty()) {
-            logger.warn("解析http code失败: spanAttribute: {}", (Object) SpanAttributes);
+//            logger.warn("解析http code失败: spanAttribute: {}", (Object) SpanAttributes);
             return -1;
         }
         try {
             return Long.parseLong(code);
         } catch (NumberFormatException e) {
-            logger.warn("http status code:[{}] not a number:{}", code, e);
+//            logger.warn("http status code:[{}] not a number:{}", code, e);
             return -1;
         }
     }

version

@@ -1 +1 @@
-v2.3.4
+v2.4.4