diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml index daa3e206c507..9958d8f37460 100755 --- a/apm-checkstyle/checkStyle.xml +++ b/apm-checkstyle/checkStyle.xml @@ -96,7 +96,7 @@ - + diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java index bafa79902b1b..9d36386aaea0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java @@ -80,7 +80,7 @@ private Tags() { public static final class HTTP { public static final StringTag METHOD = new StringTag(10, "http.method"); - public static final StringTag PARAMS = new StringTag(11, "http.params"); + public static final StringTag PARAMS = new StringTag(11, "http.params", true); } /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java index 37254b0e085b..856f12900260 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java @@ -50,7 +50,12 @@ public ThreadProfiler(TracingContext tracingContext, String traceSegmentId, Thre this.traceSegmentId = traceSegmentId; this.profilingThread = profilingThread; this.executionContext = executionContext; - this.profilingStatus = ProfileStatusReference.createWithPending(); + if (tracingContext.profileStatus() == null) { + this.profilingStatus = ProfileStatusReference.createWithPending(); + } else { + this.profilingStatus = tracingContext.profileStatus(); + this.profilingStatus.updateStatus(ProfileStatus.PENDING); + } this.profilingMaxTimeMills = TimeUnit.MINUTES.toMillis(Config.Profile.MAX_DURATION); } diff --git a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileStackTreeMatcher.java b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileStackTreeMatcher.java index b9eeeaf70cab..a59a7ad71982 100644 --- a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileStackTreeMatcher.java +++ b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileStackTreeMatcher.java @@ -23,7 +23,6 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.skywalking.e2e.verification.AbstractMatcher; -import org.assertj.core.api.Assertions; @Data @ToString(callSuper = true) @@ -34,12 +33,22 @@ public class ProfileStackTreeMatcher extends AbstractMatcher