kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #472 from ascrutae/fix/log-encode-issue 

fix log encode issue and check style failured
This commit is contained in:
吴晟 Wu Sheng 2017-09-27 18:44:25 +08:00 committed by GitHub
parent 96593af366 d68fa5f6e0
commit edaaa305bf
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
View File

@ -1,15 +1,13 @@
package org.skywalking.apm.agent.core.logging;
import org.skywalking.apm.agent.core.conf.Config;
import org.skywalking.apm.agent.core.conf.Constants;
import org.skywalking.apm.util.StringUtil;
import org.skywalking.apm.logging.ILog;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.skywalking.apm.agent.core.conf.Config;
import org.skywalking.apm.agent.core.conf.Constants;
import org.skywalking.apm.logging.ILog;
import org.skywalking.apm.util.StringUtil;
/**
* The <code>EasyLogger</code> is a simple implementation of {@link ILog}.
@ -38,7 +36,7 @@ public class EasyLogger implements ILog {
break;
}
tmpMessage = tmpMessage.replaceFirst("\\{\\}", URLEncoder.encode(String.valueOf(parameters[parametersIndex++])));
tmpMessage = tmpMessage.replaceFirst("\\{\\}", String.valueOf(parameters[parametersIndex++]));
startSize = index + 2;
}
return tmpMessage;

3
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptor.java
View File

@ -2,9 +2,6 @@ package org.skywalking.apm.plugin.jetty.v9.client;
import java.lang.reflect.Method;
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.http.HttpFields;
import org.skywalking.apm.agent.core.context.CarrierItem;
import org.skywalking.apm.agent.core.context.ContextCarrier;
import org.skywalking.apm.agent.core.context.ContextManager;
import org.skywalking.apm.agent.core.context.ContextSnapshot;
import org.skywalking.apm.agent.core.context.tag.Tags;

20
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptorTest.java
View File

@ -13,13 +13,10 @@ import org.mockito.Mock;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import org.skywalking.apm.agent.core.context.ContextSnapshot;
import org.skywalking.apm.agent.core.context.SW3CarrierItem;
import org.skywalking.apm.agent.core.context.ids.DistributedTraceId;
import org.skywalking.apm.agent.core.context.ids.ID;
import org.skywalking.apm.agent.core.context.trace.TraceSegment;
import org.skywalking.apm.agent.core.context.trace.TraceSegmentRef;
import org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import org.skywalking.apm.agent.test.helper.SegmentRefHelper;
import org.skywalking.apm.agent.test.tools.AgentServiceRule;
import org.skywalking.apm.agent.test.tools.SegmentStorage;
import org.skywalking.apm.agent.test.tools.SegmentStoragePoint;
@ -110,21 +107,4 @@ public class CompleteListenerInterceptorTest {
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
assertThat(traceSegment.getRefs().size(), is(1));
}
@Test
public void testMethodAroundWithSnapshotAndHeader() throws Throwable {
HttpFields fields = new HttpFields();
fields.put(SW3CarrierItem.HEADER_NAME, "1.234.111|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*");
when(httpResponse.getHeaders()).thenReturn(fields);
interceptor.beforeMethod(objectInstanceWithSnapshot, null, allArguments, argumentTypes, null);
interceptor.afterMethod(objectInstanceWithSnapshot, null, allArguments, argumentTypes, null);
assertThat(segmentStorage.getTraceSegments().size(), is(1));
TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0);
assertThat(traceSegment.getRefs().size(), is(1));
TraceSegmentRef ref = traceSegment.getRefs().get(0);
assertThat(SegmentRefHelper.getEntryApplicationInstanceId(ref), is(1));
assertThat(SegmentRefHelper.getSpanId(ref), is(3));
assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.234.111"));
}
}