From 91d598374e9c6b3a6b21685e1cd9b06f63c259fe Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 5 Sep 2023 17:54:53 +0800 Subject: [PATCH] fix trace plugin missing org tags --- .../src/main/java/cloud/erda/agent/core/utils/Constants.java | 4 ++++ .../app/insight/transaction/TransactionMetricBuilder.java | 3 +++ .../app/insight/transaction/TransactionMetricUtils.java | 2 ++ .../cloud/erda/agent/plugin/asf/dubbo/DubboInterceptor.java | 2 ++ .../java/cloud/erda/agent/plugin/dubbo/DubboInterceptor.java | 2 ++ .../erda/agent/plugin/jdbc/ExecuteMethodsInterceptor.java | 2 ++ .../erda/agent/plugin/jedis/v2/JedisMethodInterceptor.java | 2 ++ .../plugin/lettuce/v5/RedisChannelWriterInterceptor.java | 2 ++ .../plugin/redisson/v3/RedisConnectionSendInterceptor.java | 2 ++ .../erda/agent/plugin/rocketmq/v4/MessageSendInterceptor.java | 2 ++ .../agent/plugin/servlet/BaseServletInvokeInterceptor.java | 2 ++ scripts/build.sh | 1 + 12 files changed, 26 insertions(+) diff --git a/agent-core/src/main/java/cloud/erda/agent/core/utils/Constants.java b/agent-core/src/main/java/cloud/erda/agent/core/utils/Constants.java index cc7d764..de29b29 100644 --- a/agent-core/src/main/java/cloud/erda/agent/core/utils/Constants.java +++ b/agent-core/src/main/java/cloud/erda/agent/core/utils/Constants.java @@ -185,6 +185,10 @@ public static class Metrics { public static final String SOURCE_ORG_ID = "source_org_id"; + public static final String ORG_ID = "org_id"; + + public static final String ORG_NAME = "org_name"; + public static final String SOURCE_PROJECT_ID = "source_project_id"; public static final String SOURCE_PROJECT_NAME = "source_project_name"; diff --git a/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricBuilder.java b/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricBuilder.java index 1dc4e36..b3e0a04 100644 --- a/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricBuilder.java +++ b/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricBuilder.java @@ -113,6 +113,7 @@ private void recordContextSourceTag() { String sourceInstanceId = baggage.get(Constants.Metrics.SOURCE_INSTANCE_ID); String sourceTerminusKey = baggage.get(Constants.Metrics.SOURCE_TERMINUS_KEY); String sourceServiceId = baggage.get(Constants.Metrics.SOURCE_SERVICE_ID); + String sourceOrgName = System.getenv("DICE_ORG_NAME"); tags.put(Constants.Metrics.SOURCE_ADDON_TYPE_METRIC, sourceAddonType); tags.put(Constants.Metrics.SOURCE_ADDON_ID_METRIC, sourceAddonId); @@ -128,6 +129,8 @@ private void recordContextSourceTag() { tags.put(Constants.Metrics.SOURCE_INSTANCE_ID, sourceInstanceId); tags.put(Constants.Metrics.SOURCE_TERMINUS_KEY, sourceTerminusKey); tags.put(Constants.Metrics.SOURCE_SERVICE_ID, sourceServiceId); + tags.put(Constants.Metrics.ORG_NAME, sourceOrgName); + tags.put(Constants.Metrics.ORG_ID, sourceOrgId); } } diff --git a/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricUtils.java b/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricUtils.java index 6fbce6c..b20619d 100644 --- a/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricUtils.java +++ b/agent-plugins/agent-app-insight-common/src/main/java/cloud/erda/agent/plugin/app/insight/transaction/TransactionMetricUtils.java @@ -32,6 +32,8 @@ public static TransactionMetricBuilder createHttpMetric(String host) { public static TransactionMetricBuilder createMiroServiceMetric(String addonType) { return (TransactionMetricBuilder)new TransactionMetricBuilder(Constants.Metrics.APPLICATION_MICRO_SERVICE, false) .tag(Constants.Metrics.TARGET_ADDON_TYPE, addonType) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Metrics.TARGET_ADDON_ID, addonType); } diff --git a/agent-plugins/agent-dubbo-2.7.x-plugin/src/main/java/cloud/erda/agent/plugin/asf/dubbo/DubboInterceptor.java b/agent-plugins/agent-dubbo-2.7.x-plugin/src/main/java/cloud/erda/agent/plugin/asf/dubbo/DubboInterceptor.java index 9c6f4bc..bffb248 100644 --- a/agent-plugins/agent-dubbo-2.7.x-plugin/src/main/java/cloud/erda/agent/plugin/asf/dubbo/DubboInterceptor.java +++ b/agent-plugins/agent-dubbo-2.7.x-plugin/src/main/java/cloud/erda/agent/plugin/asf/dubbo/DubboInterceptor.java @@ -104,6 +104,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(Constants.Tags.PEER_SERVICE, invoker.getInterface().getName() + "." + invocation.getMethodName()) .tag(Constants.Tags.DB_HOST, rpcContext.getLocalAddressString()) .tag(Constants.Tags.DUBBO_SERVICE, invoker.getInterface().getName()) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Tags.DUBBO_METHOD, invocation.getMethodName()); } diff --git a/agent-plugins/agent-dubbo-plugin/src/main/java/cloud/erda/agent/plugin/dubbo/DubboInterceptor.java b/agent-plugins/agent-dubbo-plugin/src/main/java/cloud/erda/agent/plugin/dubbo/DubboInterceptor.java index 9460c8e..1e51d48 100644 --- a/agent-plugins/agent-dubbo-plugin/src/main/java/cloud/erda/agent/plugin/dubbo/DubboInterceptor.java +++ b/agent-plugins/agent-dubbo-plugin/src/main/java/cloud/erda/agent/plugin/dubbo/DubboInterceptor.java @@ -99,6 +99,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(Constants.Tags.PEER_SERVICE, invoker.getInterface().getName() + "." + invocation.getMethodName()) .tag(Constants.Tags.DB_HOST, rpcContext.getLocalAddressString()) .tag(Constants.Tags.DUBBO_SERVICE, invoker.getInterface().getName()) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Tags.DUBBO_METHOD, invocation.getMethodName()); } diff --git a/agent-plugins/agent-jdbc-plugins/agent-jdbc-commons/src/main/java/cloud/erda/agent/plugin/jdbc/ExecuteMethodsInterceptor.java b/agent-plugins/agent-jdbc-plugins/agent-jdbc-commons/src/main/java/cloud/erda/agent/plugin/jdbc/ExecuteMethodsInterceptor.java index 6c27b76..bfbc8b4 100644 --- a/agent-plugins/agent-jdbc-plugins/agent-jdbc-commons/src/main/java/cloud/erda/agent/plugin/jdbc/ExecuteMethodsInterceptor.java +++ b/agent-plugins/agent-jdbc-plugins/agent-jdbc-commons/src/main/java/cloud/erda/agent/plugin/jdbc/ExecuteMethodsInterceptor.java @@ -80,6 +80,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(Constants.Tags.DB_HOST, connectInfo.getDatabasePeer()) .tag(Constants.Tags.DB_INSTANCE, connectInfo.getDatabaseName()) .tag(Constants.Tags.DB_STATEMENT, statement) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Tags.DB_SYSTEM, connectInfo.getDBType()); } } diff --git a/agent-plugins/agent-jedis-2.x-plugin/src/main/java/cloud/erda/agent/plugin/jedis/v2/JedisMethodInterceptor.java b/agent-plugins/agent-jedis-2.x-plugin/src/main/java/cloud/erda/agent/plugin/jedis/v2/JedisMethodInterceptor.java index df526e5..eb7377a 100644 --- a/agent-plugins/agent-jedis-2.x-plugin/src/main/java/cloud/erda/agent/plugin/jedis/v2/JedisMethodInterceptor.java +++ b/agent-plugins/agent-jedis-2.x-plugin/src/main/java/cloud/erda/agent/plugin/jedis/v2/JedisMethodInterceptor.java @@ -79,6 +79,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(Constants.Tags.PEER_HOSTNAME, peer) .tag(Constants.Tags.DB_HOST, peer) .tag(Constants.Tags.DB_STATEMENT, statement) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Tags.DB_SYSTEM, Constants.Tags.DB_TYPE_REDIS); } diff --git a/agent-plugins/agent-lettuce-plugins/agent-lettuce-5.x-plugin/src/main/java/cloud/erda/agent/plugin/lettuce/v5/RedisChannelWriterInterceptor.java b/agent-plugins/agent-lettuce-plugins/agent-lettuce-5.x-plugin/src/main/java/cloud/erda/agent/plugin/lettuce/v5/RedisChannelWriterInterceptor.java index cdb15c0..0876e3e 100644 --- a/agent-plugins/agent-lettuce-plugins/agent-lettuce-5.x-plugin/src/main/java/cloud/erda/agent/plugin/lettuce/v5/RedisChannelWriterInterceptor.java +++ b/agent-plugins/agent-lettuce-plugins/agent-lettuce-5.x-plugin/src/main/java/cloud/erda/agent/plugin/lettuce/v5/RedisChannelWriterInterceptor.java @@ -86,6 +86,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(Constants.Tags.PEER_SERVICE, peer) .tag(Constants.Tags.DB_HOST, peer) .tag(Constants.Tags.DB_STATEMENT, dbStatement.toString()) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Tags.DB_SYSTEM, Constants.Tags.DB_TYPE_REDIS); } diff --git a/agent-plugins/agent-redisson-3.x-plugin/src/main/java/cloud/erda/agent/plugin/redisson/v3/RedisConnectionSendInterceptor.java b/agent-plugins/agent-redisson-3.x-plugin/src/main/java/cloud/erda/agent/plugin/redisson/v3/RedisConnectionSendInterceptor.java index 07b9091..ea2cf1a 100644 --- a/agent-plugins/agent-redisson-3.x-plugin/src/main/java/cloud/erda/agent/plugin/redisson/v3/RedisConnectionSendInterceptor.java +++ b/agent-plugins/agent-redisson-3.x-plugin/src/main/java/cloud/erda/agent/plugin/redisson/v3/RedisConnectionSendInterceptor.java @@ -123,6 +123,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(Constants.Tags.PEER_HOSTNAME, peer) .tag(Constants.Tags.DB_HOST, peer) .tag(Constants.Tags.DB_STATEMENT, dbStatement.toString()) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(Constants.Tags.DB_SYSTEM, Constants.Tags.DB_TYPE_REDIS); } diff --git a/agent-plugins/agent-rocketmq-4.x-plugin/src/main/java/cloud/erda/agent/plugin/rocketmq/v4/MessageSendInterceptor.java b/agent-plugins/agent-rocketmq-4.x-plugin/src/main/java/cloud/erda/agent/plugin/rocketmq/v4/MessageSendInterceptor.java index b28a767..b1d9426 100644 --- a/agent-plugins/agent-rocketmq-4.x-plugin/src/main/java/cloud/erda/agent/plugin/rocketmq/v4/MessageSendInterceptor.java +++ b/agent-plugins/agent-rocketmq-4.x-plugin/src/main/java/cloud/erda/agent/plugin/rocketmq/v4/MessageSendInterceptor.java @@ -107,6 +107,8 @@ public void beforeMethod(IMethodInterceptContext context, MethodInterceptResult .tag(SPAN_KIND, SPAN_KIND_PRODUCER) .tag(PEER_ADDRESS, nameServerAddress) .tag(DB_HOST, nameServerAddress) + .tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")) + .tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")) .tag(MESSAGE_BUS_DESTINATION, message.getTopic()); if (IS_SYNC.get()) { context.setAttachment(Constants.Keys.METRIC_BUILDER, transactionMetricBuilder); diff --git a/agent-plugins/agent-servlet-plugins/agent-servlet-commons/src/main/java/cloud/erda/agent/plugin/servlet/BaseServletInvokeInterceptor.java b/agent-plugins/agent-servlet-plugins/agent-servlet-commons/src/main/java/cloud/erda/agent/plugin/servlet/BaseServletInvokeInterceptor.java index f3a6b66..03c4c36 100644 --- a/agent-plugins/agent-servlet-plugins/agent-servlet-commons/src/main/java/cloud/erda/agent/plugin/servlet/BaseServletInvokeInterceptor.java +++ b/agent-plugins/agent-servlet-plugins/agent-servlet-commons/src/main/java/cloud/erda/agent/plugin/servlet/BaseServletInvokeInterceptor.java @@ -112,6 +112,8 @@ private void preRequest(IMethodInterceptContext context, HttpServletRequest requ span.tag(Constants.Tags.SPAN_LAYER, Constants.Tags.SPAN_LAYER_HTTP); span.tag(Constants.Tags.SPAN_KIND, Constants.Tags.SPAN_KIND_SERVER); span.tag(Constants.Tags.COMPONENT, getComponent()); + span.tag(Constants.Metrics.ORG_NAME, System.getenv("DICE_ORG_NAME")); + span.tag(Constants.Metrics.ORG_ID, System.getenv("DICE_ORG_ID")); span.log(DateTime.currentTimeNano()).event(LogFields.Event, "server received"); if (Strings.isEmpty(request.getRequestURI())) { return; diff --git a/scripts/build.sh b/scripts/build.sh index 4aa4488..ad62a19 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -29,4 +29,5 @@ cat > "dist/erda-java-agent/build" <