diff --git a/CHANGES.md b/CHANGES.md index c6e0a45ce53e420745e802f49eb5a46b0202593e..d63f0cfb2c748e77ef20be3b44417f03ef9c63d7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ Release Notes. * Fix ArrayBlockingQueueBuffer's useless `IF_POSSIBLE` mode list * Support building gRPC TLS channel but CA file is not required. * Add Dolphinscheduler plugin definition. +* Make sampling still works when the trace ignores plug-in activation. * Fix mssql-plugin occur ClassCastException when call the method of return generate key. #### OAP-Backend diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java index 71341cd10ec80a2a310018e4fdb267b514e574ae..f8268383a9377e2edcd25d3374632c3b68d4519a 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java @@ -37,6 +37,8 @@ public class TraceIgnoreExtendService extends SamplingService { @Override public void boot() { + super.boot(); + IgnoreConfigInitializer.initialize(); if (StringUtil.isNotEmpty(IgnoreConfig.Trace.IGNORE_PATH)) { patterns = IgnoreConfig.Trace.IGNORE_PATH.split(PATTERN_SEPARATOR); @@ -53,6 +55,7 @@ public class TraceIgnoreExtendService extends SamplingService { @Override public void shutdown() { + super.shutdown(); } @Override @@ -65,10 +68,11 @@ public class TraceIgnoreExtendService extends SamplingService { } } } - return true; + return super.trySampling(operationName); } @Override public void forceSampled() { + super.forceSampled(); } } diff --git a/docs/en/setup/service-agent/java-agent/agent-optional-plugins/trace-ignore-plugin.md b/docs/en/setup/service-agent/java-agent/agent-optional-plugins/trace-ignore-plugin.md index 6da90cf83393aafe7a59c7ba3f11188e34c7c34e..86889f4b5743e96f3390e73ed7a4f75bffb8d4a1 100644 --- a/docs/en/setup/service-agent/java-agent/agent-optional-plugins/trace-ignore-plugin.md +++ b/docs/en/setup/service-agent/java-agent/agent-optional-plugins/trace-ignore-plugin.md @@ -1,6 +1,9 @@ ## Support custom trace ignore Here is an optional plugin `apm-trace-ignore-plugin` +**Notice:** +Sampling still works when the trace ignores plug-in activation. + ## Introduce - The purpose of this plugin is to filter endpoint which are expected to be ignored by the tracing system. - You can setup multiple URL path patterns, The endpoints match these patterns wouldn't be traced.