This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch collector/instrument
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/collector/instrument by this
push:
new 4a75bf4 Fix a detect bug.
4a75bf4 is described below
commit 4a75bf4564a393f2d725cb27dec076908179f2ec
Author: wu-sheng <[email protected]>
AuthorDate: Tue Jan 9 17:23:26 2018 +0800
Fix a detect bug.
---
.../analysis/segment/parser/provider/parser/SegmentParse.java | 9 ++++-----
.../apache/skywalking/apm/collector/instrument/MetricTree.java | 7 ++++++-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
index 4530400..84eb3b9 100644
---
a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
+++
b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
@@ -36,7 +36,6 @@ import
org.apache.skywalking.apm.collector.analysis.segment.parser.provider.pars
import
org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization.SegmentStandardization;
import
org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization.SpanIdExchanger;
import org.apache.skywalking.apm.collector.core.UnexpectedException;
-import
org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
import org.apache.skywalking.apm.collector.core.graph.Graph;
import org.apache.skywalking.apm.collector.core.graph.GraphManager;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -68,7 +67,7 @@ public class SegmentParse {
this.spanListeners = new LinkedList<>();
}
- @GraphComputingMetric(name = "/segment/parse")
+// @GraphComputingMetric(name = "/segment/parse")
public boolean parse(UpstreamSegment segment, ISegmentParseService.Source
source) {
createSpanListeners();
@@ -97,7 +96,7 @@ public class SegmentParse {
return false;
}
- @GraphComputingMetric(name = "/segment/parse/preBuild")
+// @GraphComputingMetric(name = "/segment/parse/preBuild")
private boolean preBuild(List<UniqueId> traceIds, SegmentDecorator
segmentDecorator) {
StringBuilder segmentIdBuilder = new StringBuilder();
@@ -164,7 +163,7 @@ public class SegmentParse {
return true;
}
- @GraphComputingMetric(name = "/segment/parse/buildSegment")
+// @GraphComputingMetric(name = "/segment/parse/buildSegment")
private void buildSegment(String id, byte[] dataBinary) {
Segment segment = new Segment(id);
segment.setDataBinary(dataBinary);
@@ -173,7 +172,7 @@ public class SegmentParse {
graph.start(segment);
}
- @GraphComputingMetric(name = "/segment/parse/bufferFile/write")
+// @GraphComputingMetric(name = "/segment/parse/bufferFile/write")
private void writeToBufferFile(String id, UpstreamSegment upstreamSegment)
{
logger.debug("push to segment buffer write worker, id: {}", id);
SegmentStandardization standardization = new
SegmentStandardization(id);
diff --git
a/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
b/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
index 86edf9d..c86a7d0 100644
---
a/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
+++
b/apm-collector/apm-collector-instrument/src/main/java/org/apache/skywalking/apm/collector/instrument/MetricTree.java
@@ -122,14 +122,19 @@ public enum MetricTree implements Runnable {
if (annotations != null) {
int index = 0;
for (Annotation[] parameterAnnotation :
annotations) {
+ boolean found = false;
if (parameterAnnotation != null) {
for (Annotation annotation :
parameterAnnotation) {
- if
(annotation.equals(BatchParameter.class)) {
+ if (annotation instanceof
BatchParameter) {
isBatchDetected = true;
+ found = true;
break;
}
}
}
+ if(found){
+ break;
+ }
index++;
}
if (isBatchDetected) {
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
