Skip to content

Commit c2dd183

Browse files
intr3p1dintr3p1d
committed
[#noissue] Fix some typos
1 parent 2e081b6 commit c2dd183

File tree

8 files changed

+192
-192
lines changed

8 files changed

+192
-192
lines changed

‎commons-profiler/src/main/java/com/navercorp/pinpoint/common/profiler/trace/StaticFieldLookUp.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ public List<T> lookup(Filter<T> filter) {
8282
if (!field.getType().equals(findClazz)) {
8383
continue;
8484
}
85-
final Object filedObject = getObject(field);
85+
final Object fieldObject = getObject(field);
8686

87-
if (findClazz.isInstance(filedObject)) {
88-
T type = findClazz.cast(filedObject);
87+
if (findClazz.isInstance(fieldObject)) {
88+
T type = findClazz.cast(fieldObject);
8989
if (filter.filter(type) == Filter.FILTERED) {
9090
continue;
9191
}

‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanDecoderV0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.navercorp.pinpoint.common.server.bo.SpanEventBo;
2828
import com.navercorp.pinpoint.common.server.bo.filter.SequenceSpanEventFilter;
2929
import com.navercorp.pinpoint.common.server.bo.filter.SpanEventFilter;
30-
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanBitFiled;
30+
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanBitField;
3131
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanEventBitField;
3232
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanEventQualifierBitField;
3333
import com.navercorp.pinpoint.io.SpanVersion;
@@ -120,7 +120,7 @@ public void readSpanValue(Buffer buffer, SpanBo span, SpanDecodingContext decodi
120120

121121
span.setVersion(version);
122122

123-
final SpanBitFiled bitFiled = new SpanBitFiled(buffer.readByte());
123+
final SpanBitField bitFiled = new SpanBitField(buffer.readByte());
124124

125125
final short serviceType = buffer.readShort();
126126
span.setServiceType(serviceType);

‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoderV0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.navercorp.pinpoint.common.server.bo.SpanBo;
99
import com.navercorp.pinpoint.common.server.bo.SpanChunkBo;
1010
import com.navercorp.pinpoint.common.server.bo.SpanEventBo;
11-
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanBitFiled;
11+
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanBitField;
1212
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanEventBitField;
1313
import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield.SpanEventQualifierBitField;
1414
import com.navercorp.pinpoint.common.server.bo.AnnotationTranscoder;
@@ -129,7 +129,7 @@ private void writeSpanEventList(Buffer buffer, List<SpanEventBo> spanEventBoList
129129
public ByteBuffer encodeSpanColumnValue(SpanEncodingContext<SpanBo> encodingContext) {
130130
final SpanBo span = encodingContext.getValue();
131131

132-
final SpanBitFiled bitField = SpanBitFiled.build(span);
132+
final SpanBitField bitField = SpanBitField.build(span);
133133

134134
final Buffer buffer = new AutomaticBuffer(256);
135135

‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitFiled.java renamed to ‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitField.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* @author Woonduk Kang(emeroad)
2828
*/
29-
public class SpanBitFiled {
29+
public class SpanBitField {
3030

3131
// 1bit
3232
public static final int SET_APPLICATION_SERVICE_TYPE_ENCODING_STRATEGY = 0;
@@ -43,47 +43,47 @@ public class SpanBitFiled {
4343
// reserved : 1 bit
4444
private byte bitField = 0;
4545

46-
public static SpanBitFiled build(SpanBo spanBo) {
46+
public static SpanBitField build(SpanBo spanBo) {
4747
Objects.requireNonNull(spanBo, "spanBo");
4848

49-
final SpanBitFiled spanBitFiled = new SpanBitFiled();
49+
final SpanBitField spanBitField = new SpanBitField();
5050

5151

5252
if (spanBo.getServiceType() == spanBo.getApplicationServiceType()) {
53-
spanBitFiled.setApplicationServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.PREV_EQUALS);
53+
spanBitField.setApplicationServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.PREV_EQUALS);
5454
} else {
55-
spanBitFiled.setApplicationServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.RAW);
55+
spanBitField.setApplicationServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.RAW);
5656
}
5757

5858
if (spanBo.getParentSpanId() == ROOT_PARENT_SPAN_ID) {
59-
spanBitFiled.setRoot(true);
59+
spanBitField.setRoot(true);
6060
}
6161
if (spanBo.getErrCode() != 0) {
62-
spanBitFiled.setErrorCode(true);
62+
spanBitField.setErrorCode(true);
6363
}
6464

6565
if (spanBo.hasException()) {
66-
spanBitFiled.setHasException(true);
66+
spanBitField.setHasException(true);
6767
}
6868

6969
if (spanBo.getFlag() != 0) {
70-
spanBitFiled.setFlag(true);
70+
spanBitField.setFlag(true);
7171
}
7272

7373
if (spanBo.getLoggingTransactionInfo() != LoggingInfo.NOT_LOGGED.getCode()) {
74-
spanBitFiled.setLoggingTransactionInfo(true);
74+
spanBitField.setLoggingTransactionInfo(true);
7575
}
7676
if (CollectionUtils.isNotEmpty(spanBo.getAnnotationBoList())) {
77-
spanBitFiled.setAnnotation(true);
77+
spanBitField.setAnnotation(true);
7878
}
7979

80-
return spanBitFiled;
80+
return spanBitField;
8181
}
8282

83-
public SpanBitFiled() {
83+
public SpanBitField() {
8484
}
8585

86-
public SpanBitFiled(byte bitField) {
86+
public SpanBitField(byte bitField) {
8787
this.bitField = bitField;
8888
}
8989

‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanEventBitField.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -54,80 +54,80 @@ public class SpanEventBitField {
5454
public static SpanEventBitField buildFirst(SpanEventBo spanEventBo) {
5555
Objects.requireNonNull(spanEventBo, "spanEventBo");
5656

57-
final SpanEventBitField bitFiled = new SpanEventBitField();
57+
final SpanEventBitField bitField = new SpanEventBitField();
5858

5959
if (spanEventBo.getRpc() != null) {
60-
bitFiled.setRpc(true);
60+
bitField.setRpc(true);
6161
}
6262
if (spanEventBo.getEndPoint() != null) {
63-
bitFiled.setEndPoint(true);
63+
bitField.setEndPoint(true);
6464
}
6565

6666
if (spanEventBo.getDestinationId() != null) {
67-
bitFiled.setDestinationId(true);
67+
bitField.setDestinationId(true);
6868
}
6969

7070
if (spanEventBo.getNextSpanId() != -1) {
71-
bitFiled.setNextSpanId(true);
71+
bitField.setNextSpanId(true);
7272
}
7373

7474
if (spanEventBo.hasException()) {
75-
bitFiled.setHasException(true);
75+
bitField.setHasException(true);
7676
}
7777

7878
final List<AnnotationBo> annotationBoList = spanEventBo.getAnnotationBoList();
7979
if (CollectionUtils.isNotEmpty(annotationBoList)) {
80-
bitFiled.setAnnotation(true);
80+
bitField.setAnnotation(true);
8181
}
8282

8383
if (spanEventBo.getNextAsyncId() != -1) {
84-
bitFiled.setNextAsyncId(true);
84+
bitField.setNextAsyncId(true);
8585
}
8686

8787

8888
if (spanEventBo.getAsyncId() == -1 && spanEventBo.getAsyncSequence() == -1) {
89-
bitFiled.setAsyncId(false);
89+
bitField.setAsyncId(false);
9090
} else {
91-
bitFiled.setAsyncId(true);
91+
bitField.setAsyncId(true);
9292
}
93-
return bitFiled;
93+
return bitField;
9494
}
9595

9696
public static SpanEventBitField build(SpanEventBo spanEventBo, SpanEventBo prevSpanEventBo) {
9797
Objects.requireNonNull(spanEventBo, "spanEventBo");
9898
Objects.requireNonNull(prevSpanEventBo, "prevSpanEventBo");
9999

100-
final SpanEventBitField bitFiled = buildFirst(spanEventBo);
100+
final SpanEventBitField bitField = buildFirst(spanEventBo);
101101

102102
if (spanEventBo.getStartElapsed() == prevSpanEventBo.getStartElapsed()) {
103-
bitFiled.setStartElapsedEncodingStrategy(StartElapsedTimeEncodingStrategy.PREV_EQUALS);
103+
bitField.setStartElapsedEncodingStrategy(StartElapsedTimeEncodingStrategy.PREV_EQUALS);
104104
} else {
105-
bitFiled.setStartElapsedEncodingStrategy(StartElapsedTimeEncodingStrategy.PREV_DELTA);
105+
bitField.setStartElapsedEncodingStrategy(StartElapsedTimeEncodingStrategy.PREV_DELTA);
106106
}
107107

108108
// sequence prev: 5 current: 6 = 6 - 5= delta 1
109109
final short sequenceDelta = (short) (spanEventBo.getSequence() - prevSpanEventBo.getSequence());
110110
if (sequenceDelta == 1) {
111-
bitFiled.setSequenceEncodingStrategy(SequenceEncodingStrategy.PREV_ADD1);
111+
bitField.setSequenceEncodingStrategy(SequenceEncodingStrategy.PREV_ADD1);
112112
} else {
113-
bitFiled.setSequenceEncodingStrategy(SequenceEncodingStrategy.PREV_DELTA);
113+
bitField.setSequenceEncodingStrategy(SequenceEncodingStrategy.PREV_DELTA);
114114
}
115115

116116
if (spanEventBo.getDepth() == prevSpanEventBo.getDepth()) {
117-
bitFiled.setDepthEncodingStrategy(DepthEncodingStrategy.PREV_EQUALS);
117+
bitField.setDepthEncodingStrategy(DepthEncodingStrategy.PREV_EQUALS);
118118
} else {
119-
bitFiled.setDepthEncodingStrategy(DepthEncodingStrategy.RAW);
119+
bitField.setDepthEncodingStrategy(DepthEncodingStrategy.RAW);
120120
}
121121

122122

123123
if (prevSpanEventBo.getServiceType() == spanEventBo.getServiceType()) {
124-
bitFiled.setServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.PREV_EQUALS);
124+
bitField.setServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.PREV_EQUALS);
125125
} else {
126-
bitFiled.setServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.RAW);
126+
bitField.setServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.RAW);
127127
}
128128

129129

130-
return bitFiled;
130+
return bitField;
131131
}
132132

133133
public SpanEventBitField() {

‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/config/AnnotationVisitor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void visit(Object object, FieldVisitor fieldVisitor) {
5050
if (!annotation) {
5151
continue;
5252
}
53-
final Object fieldValue = getFiledValue(object, field);
53+
final Object fieldValue = getFieldValue(object, field);
5454
fieldVisitor.visit(field, fieldValue);
5555
}
5656
}
@@ -66,7 +66,7 @@ protected Class<?> getClazz(Object object) {
6666
}
6767

6868

69-
private Object getFiledValue(Object object, Field field) {
69+
private Object getFieldValue(Object object, Field field) {
7070
ReflectionUtils.makeAccessible(field);
7171
return ReflectionUtils.getField(field, object);
7272
}

‎commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitFieldTest.java

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
package com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.bitfield;
2+
3+
import com.navercorp.pinpoint.common.server.bo.SpanBo;
4+
import com.navercorp.pinpoint.common.trace.LoggingInfo;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
7+
import org.junit.jupiter.api.Assertions;
8+
import org.junit.jupiter.api.Test;
9+
10+
/**
11+
* @author Woonduk Kang(emeroad)
12+
*/
13+
public class SpanBitFieldTest {
14+
private final Logger logger = LogManager.getLogger(this.getClass());
15+
16+
@Test
17+
public void testRoot_1() throws Exception {
18+
SpanBo spanBo = new SpanBo();
19+
spanBo.setParentSpanId(-1);
20+
21+
SpanBitField spanBitField = SpanBitField.build(spanBo);
22+
Assertions.assertTrue(spanBitField.isRoot());
23+
24+
spanBitField.setRoot(false);
25+
Assertions.assertFalse(spanBitField.isRoot());
26+
27+
}
28+
29+
@Test
30+
public void testRoot_2() throws Exception {
31+
SpanBo spanBo = new SpanBo();
32+
spanBo.setParentSpanId(0);
33+
34+
SpanBitField spanBitField = SpanBitField.build(spanBo);
35+
Assertions.assertFalse(spanBitField.isRoot());
36+
37+
spanBitField.maskAll();
38+
spanBitField.setRoot(false);
39+
Assertions.assertFalse(spanBitField.isRoot());
40+
}
41+
42+
@Test
43+
public void testErrorCode_1() {
44+
SpanBo spanBo = new SpanBo();
45+
spanBo.setErrCode(1);
46+
SpanBitField spanBitField = SpanBitField.build(spanBo);
47+
48+
Assertions.assertTrue(spanBitField.isSetErrorCode());
49+
50+
spanBitField.setErrorCode(false);
51+
Assertions.assertFalse(spanBitField.isSetErrorCode());
52+
}
53+
54+
@Test
55+
public void testErrorCode_2() {
56+
SpanBo spanBo = new SpanBo();
57+
spanBo.setErrCode(0);
58+
SpanBitField spanBitField = SpanBitField.build(spanBo);
59+
60+
Assertions.assertFalse(spanBitField.isSetErrorCode());
61+
62+
spanBitField.maskAll();
63+
spanBitField.setErrorCode(false);
64+
Assertions.assertFalse(spanBitField.isSetErrorCode());
65+
}
66+
67+
@Test
68+
public void testApplicationServiceTypeEncodingStrategy_PREV_TYPE_EQUALS() {
69+
SpanBo spanBo = new SpanBo();
70+
spanBo.setServiceType((short) 1000);
71+
spanBo.setApplicationServiceType((short) 1000);
72+
73+
SpanBitField spanBitField = SpanBitField.build(spanBo);
74+
75+
Assertions.assertEquals(spanBitField.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS);
76+
}
77+
78+
@Test
79+
public void testApplicationServiceTypeEncodingStrategy_RAW() {
80+
SpanBo spanBo = new SpanBo();
81+
spanBo.setServiceType((short) 1000);
82+
spanBo.setApplicationServiceType((short) 2000);
83+
84+
SpanBitField spanBitField = SpanBitField.build(spanBo);
85+
86+
Assertions.assertEquals(spanBitField.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW);
87+
88+
spanBitField.maskAll();
89+
Assertions.assertEquals(spanBitField.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW);
90+
spanBitField.setApplicationServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.PREV_EQUALS);
91+
Assertions.assertEquals(spanBitField.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS);
92+
}
93+
94+
95+
@Test
96+
public void testHasException_1() {
97+
SpanBo spanBo = new SpanBo();
98+
spanBo.setExceptionInfo(1, "error");
99+
100+
SpanBitField spanBitField = SpanBitField.build(spanBo);
101+
102+
Assertions.assertTrue(spanBitField.isSetHasException());
103+
104+
spanBitField.setHasException(false);
105+
Assertions.assertFalse(spanBitField.isSetHasException());
106+
}
107+
108+
@Test
109+
public void testHasException_2() {
110+
SpanBo spanBo = new SpanBo();
111+
112+
SpanBitField spanBitField = SpanBitField.build(spanBo);
113+
114+
Assertions.assertFalse(spanBitField.isSetHasException());
115+
116+
spanBitField.maskAll();
117+
spanBitField.setHasException(false);
118+
Assertions.assertFalse(spanBitField.isSetHasException());
119+
}
120+
121+
122+
@Test
123+
public void testLoggingTransactionInfo_1() {
124+
SpanBo spanBo = new SpanBo();
125+
spanBo.setLoggingTransactionInfo(LoggingInfo.INFO.getCode());
126+
127+
SpanBitField spanBitField = SpanBitField.build(spanBo);
128+
129+
Assertions.assertTrue(spanBitField.isSetLoggingTransactionInfo());
130+
131+
spanBitField.setLoggingTransactionInfo(false);
132+
Assertions.assertFalse(spanBitField.isSetLoggingTransactionInfo());
133+
}
134+
135+
@Test
136+
public void testLoggingTransactionInfo_2() {
137+
SpanBo spanBo = new SpanBo();
138+
139+
SpanBitField spanBitField = SpanBitField.build(spanBo);
140+
141+
Assertions.assertFalse(spanBitField.isSetLoggingTransactionInfo());
142+
143+
spanBitField.maskAll();
144+
spanBitField.setLoggingTransactionInfo(false);
145+
Assertions.assertFalse(spanBitField.isSetLoggingTransactionInfo());
146+
}
147+
148+
}

0 commit comments

Comments
 (0)