提交 d61297d6 编写于 作者: wu-sheng's avatar wu-sheng

Merge branch 'master' into feature/multi-enhance

* master:
  Change version for next iteration.
  add more special chars
  fix unit test
  fix Illegal group reference
  Update TraceSegmentServiceClient.java
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -4,7 +4,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-application-toolkit</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-collector</artifactId>
<packaging>pom</packaging>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-agent-core</artifactId>
......
......@@ -4,6 +4,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.regex.Matcher;
import org.skywalking.apm.agent.core.conf.Config;
import org.skywalking.apm.agent.core.conf.Constants;
import org.skywalking.apm.logging.ILog;
......@@ -35,8 +37,10 @@ public class EasyLogger implements ILog {
if (parametersIndex >= parameters.length) {
break;
}
tmpMessage = tmpMessage.replaceFirst("\\{\\}", String.valueOf(parameters[parametersIndex++]));
/**
* @Fix the Illegal group reference issue
*/
tmpMessage = tmpMessage.replaceFirst("\\{\\}", Matcher.quoteReplacement(String.valueOf(parameters[parametersIndex++])));
startSize = index + 2;
}
return tmpMessage;
......
......@@ -112,7 +112,7 @@ public class TraceSegmentServiceClient implements BootService, IConsumer<TraceSe
private void printUplinkStatus() {
long currentTimeMillis = System.currentTimeMillis();
if (lastLogTime - currentTimeMillis > 30 * 1000) {
if (currentTimeMillis - lastLogTime > 30 * 1000) {
lastLogTime = currentTimeMillis;
if (segmentUplinkedCounter > 0) {
logger.debug("{} trace segments have been sent to collector.", segmentUplinkedCounter);
......
......@@ -53,6 +53,34 @@ public class EasyLoggerTest {
.println(anyString());
}
@Test
public void testLogWithSpecialChar() {
PrintStream output = Mockito.mock(PrintStream.class);
System.setOut(output);
PrintStream err = Mockito.mock(PrintStream.class);
System.setErr(err);
EasyLogger logger = new EasyLogger(EasyLoggerTest.class);
Assert.assertTrue(logger.isDebugEnable());
Assert.assertTrue(logger.isInfoEnable());
Assert.assertTrue(logger.isWarnEnable());
Assert.assertTrue(logger.isErrorEnable());
logger.debug("$^!@#*()");
logger.debug("hello {}", "!@#$%^&*(),./[]:;");
logger.info("{}{}");
logger.info("hello {}", "{}{}");
logger.warn("hello {}", "\\");
logger.warn("hello \\");
logger.error("hello <>..");
logger.error("hello ///\\\\", new NullPointerException());
logger.error(new NullPointerException(), "hello {}", "&&&**%%");
Mockito.verify(output, times(9))
.println(anyString());
}
@Test
public void testFormat() {
NullPointerException exception = new NullPointerException();
......@@ -60,7 +88,7 @@ public class EasyLoggerTest {
String formatLines = logger.format(exception);
String[] lines = formatLines.split(Constants.LINE_SEPARATOR);
Assert.assertEquals("java.lang.NullPointerException", lines[1]);
Assert.assertEquals("\tat org.skywalking.apm.agent.core.logging.EasyLoggerTest.testFormat(EasyLoggerTest.java:58)", lines[2]);
Assert.assertEquals("\tat org.skywalking.apm.agent.core.logging.EasyLoggerTest.testFormat(EasyLoggerTest.java:86)", lines[2]);
}
@AfterClass
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-agent</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-httpClient-4.x-plugin</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-jedis-2.x-plugin</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>jetty-plugins</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-mongodb-3.x-plugin</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>nutz-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>nutz-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>nutz-plugins</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-sdk-plugin</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-resin-3.x-plugin</artifactId>
......
......@@ -7,7 +7,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-resin-4.x-plugin</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>spring-plugins</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>spring-cloud</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>netflix-plugins</artifactId>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>netflix-plugins</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-spring-cloud-feign-1.x-plugin</artifactId>
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>spring-plugins</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>spring-cloud</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<artifactId>apm-test-tools</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-sniffer</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -28,7 +28,7 @@
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>apm-util</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
</dependency>
</dependencies>
</project>
version: '2.1'
services:
skywalking-webui:
image: skywalking/skywalking-ui:3.2.2-2017
image: skywalking/skywalking-ui:3.2.3-2017
expose:
- "8080"
ports:
......@@ -15,7 +15,7 @@ services:
- COLLECTOR_SERVERS=skywalking-collector:10800
skywalking-collector:
image: skywalking/skywalking-collector:3.2.2-2017
image: skywalking/skywalking-collector:3.2.3-2017
expose:
- "10800"
- "11800"
......
......@@ -5,7 +5,7 @@
<groupId>org.skywalking</groupId>
<artifactId>apm</artifactId>
<version>3.2.2-2017</version>
<version>3.2.3-2017</version>
<licenses>
<license>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册