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

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
This commit is contained in:
wusheng 2017-09-29 17:23:35 +08:00
parent a75d6bdce1 b16963a4bf
commit d61297d6b4
67 changed files with 102 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
View File

@ -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>

2
apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
View File

@ -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>

2
apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
View File

@ -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>

2
apm-application-toolkit/apm-toolkit-opentracing/pom.xml
View File

@ -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>

2
apm-application-toolkit/apm-toolkit-trace/pom.xml
View File

@ -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>

2
apm-application-toolkit/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-agentjvm/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-agentregister/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-agentserver/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-agentstream/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-boot/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-client/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-cluster/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-core/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-queue/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-remote/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-server/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-storage/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-stream/pom.xml
View File

@ -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>

2
apm-collector/apm-collector-ui/pom.xml
View File

@ -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>

2
apm-collector/pom.xml
View File

@ -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>

2
apm-commons/apm-datacarrier/pom.xml
View File

@ -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>

2
apm-commons/apm-logging-api/pom.xml
View File

@ -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>

2
apm-commons/apm-util/pom.xml
View File

@ -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>

2
apm-commons/pom.xml
View File

@ -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>

2
apm-network/pom.xml
View File

@ -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>

2
apm-sniffer/apm-agent-core/pom.xml
View File

@ -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>

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

@ -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;

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
View File

@ -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);

30
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/logging/EasyLoggerTest.java
View File

@ -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

2
apm-sniffer/apm-agent/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/jdbc-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
View File

@ -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>

2
apm-sniffer/apm-test-tools/pom.xml
View File

@ -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>

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
View File

@ -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>

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
View File

@ -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>

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml
View File

@ -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>

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml
View File

@ -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>

2
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml
View File

@ -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>

2
apm-sniffer/apm-toolkit-activation/pom.xml
View File

@ -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>

4
apm-sniffer/pom.xml
View File

@ -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>

4
docker-compose.yml
View File

@ -1,7 +1,7 @@
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"

2
pom.xml
View File

@ -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>