From 9125933f5653c4b4fb8bd61ff28bde624be4c980 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Sat, 16 Apr 2022 01:38:00 -0400 Subject: [PATCH] instance properties bug fix (#157) --- .../agent/core/plugin/AbstractClassEnhancePluginDefine.java | 4 ++-- .../apm/agent/core/util/InstanceJsonPropertiesUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java index 5fd301235..66147ab89 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java @@ -75,7 +75,7 @@ public abstract class AbstractClassEnhancePluginDefine { if (witnessClasses != null) { for (String witnessClass : witnessClasses) { if (!finder.exist(witnessClass, classLoader)) { - LOGGER.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", transformClassName, interceptorDefineClassName, witnessClass); + LOGGER.warn("enhance class {} by plugin {} is not activated. Witness class {} does not exist.", transformClassName, interceptorDefineClassName, witnessClass); return null; } } @@ -84,7 +84,7 @@ public abstract class AbstractClassEnhancePluginDefine { if (!CollectionUtil.isEmpty(witnessMethods)) { for (WitnessMethod witnessMethod : witnessMethods) { if (!finder.exist(witnessMethod, classLoader)) { - LOGGER.warn("enhance class {} by plugin {} is not working. Because witness method {} is not existed.", transformClassName, interceptorDefineClassName, witnessMethod); + LOGGER.warn("enhance class {} by plugin {} is not activated. Witness method {} does not exist.", transformClassName, interceptorDefineClassName, witnessMethod); return null; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java index 498aa81fc..8be5a794e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/InstanceJsonPropertiesUtil.java @@ -44,7 +44,7 @@ public class InstanceJsonPropertiesUtil { } properties.add(KeyStringValuePair.newBuilder().setKey("namespace").setValue(Config.Agent.NAMESPACE).build()); - properties.add(KeyStringValuePair.newBuilder().setKey("cluster").setValue(Config.Agent.NAMESPACE).build()); + properties.add(KeyStringValuePair.newBuilder().setKey("cluster").setValue(Config.Agent.CLUSTER).build()); return properties; }