home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-16 08:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #253 from jaehong-kim/is-252

Browse Source 
patch web annotation logic bug
This commit is contained in:
koo-taejin
2015-03-24 18:32:07 +09:00
parent 666448a0ec 88bacc36ed
commit e644c58233
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
+10 -3
View File
@@ -116,7 +116,7 @@ public class SpanEventBo implements Span {
this.nextSpanId = tSpanEvent.getNextSpanId();
}
setAnnotationBoList(tSpanEvent.getAnnotations());
setAnnotationList(tSpanEvent.getAnnotations());
final TIntStringValue exceptionInfo = tSpanEvent.getExceptionInfo();
if (exceptionInfo != null) {
@@ -168,7 +168,7 @@ public class SpanEventBo implements Span {
this.nextSpanId = spanEvent.getNextSpanId();
}
setAnnotationBoList(spanEvent.getAnnotations());
setAnnotationList(spanEvent.getAnnotations());
final TIntStringValue exceptionInfo = spanEvent.getExceptionInfo();
if (exceptionInfo != null) {
@@ -321,7 +321,7 @@ public class SpanEventBo implements Span {
this.nextSpanId = nextSpanId;
}
private void setAnnotationBoList(List<TAnnotation> annotations) {
public void setAnnotationList(List<TAnnotation> annotations) {
if (annotations == null) {
return;
}
@@ -332,6 +332,13 @@ public class SpanEventBo implements Span {
this.annotationBoList = boList;
}
public void setAnnotationBoList(List<AnnotationBo> anoList) {
if (anoList == null) {
return;
}
this.annotationBoList = anoList;
}
public boolean hasException() {
return hasException;
}
web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
+1 -2
View File
@@ -74,7 +74,6 @@ public class SpanServiceImpl implements SpanService {
SpanResult result = order(spans, selectedSpanHint);
List<SpanAlign> order = result.getSpanAlignList();
// transitionApiId(order);
transitionDynamicApiId(order);
transitionSqlId(order);
transitionCachedString(order);
@@ -99,7 +98,7 @@ public class SpanServiceImpl implements SpanService {
annotationBoList = spanAlign.getSpanEventBo().getAnnotationBoList();
if (annotationBoList == null) {
annotationBoList = new ArrayList<AnnotationBo>();
spanAlign.getSpanBo().setAnnotationBoList(annotationBoList);
spanAlign.getSpanEventBo().setAnnotationBoList(annotationBoList);
}
annotationReplacementCallback.replacement(spanAlign, annotationBoList);
}