Skip to content

Commit b2b36fe

Browse files
Change groupId and artifactId
1 parent 4da209a commit b2b36fe

File tree

722 files changed

+4616
-4921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

722 files changed

+4616
-4921
lines changed

skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>skywalking-application-toolkit</artifactId>
7-
<groupId>com.a.eye</groupId>
6+
<artifactId>apm-application-toolkit</artifactId>
7+
<groupId>org.skywalking</groupId>
88
<version>3.1-2017</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>skywalking-toolkit-log4j-1.x</artifactId>
12+
<artifactId>apm-toolkit-log4j-1.x</artifactId>
1313

1414
<dependencies>
1515
<dependency>
@@ -45,7 +45,7 @@
4545
<repository>
4646
<id>bintray-wu-sheng-sky-walking-repository</id>
4747
<name>wu-sheng-sky-walking-repository</name>
48-
<url>https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-log4j-1.x/;publish=1
48+
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-log4j-1.x/;publish=1
4949
</url>
5050
</repository>
5151
</distributionManagement>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.log4j.v1.x;
1+
package org.skywalking.apm.toolkit.log.log4j.v1.x;
22

33
import org.apache.log4j.helpers.PatternConverter;
44
import org.apache.log4j.spi.LoggingEvent;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.log4j.v1.x;
1+
package org.skywalking.apm.toolkit.log.log4j.v1.x;
22

33
import org.apache.log4j.PatternLayout;
44
import org.apache.log4j.helpers.PatternParser;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.log4j.v1.x;
1+
package org.skywalking.apm.toolkit.log.log4j.v1.x;
22

33
import org.apache.log4j.helpers.PatternParser;
44

skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>skywalking-application-toolkit</artifactId>
7-
<groupId>com.a.eye</groupId>
6+
<artifactId>apm-application-toolkit</artifactId>
7+
<groupId>org.skywalking</groupId>
88
<version>3.1-2017</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>skywalking-toolkit-log4j-2.x</artifactId>
12+
<artifactId>apm-toolkit-log4j-2.x</artifactId>
1313

1414
<dependencies>
1515
<dependency>
@@ -45,7 +45,7 @@
4545
<repository>
4646
<id>bintray-wu-sheng-sky-walking-repository</id>
4747
<name>wu-sheng-sky-walking-repository</name>
48-
<url>https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-log4j-2.x/;publish=1
48+
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-log4j-2.x/;publish=1
4949
</url>
5050
</repository>
5151
</distributionManagement>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.log4j.v2.x;
1+
package org.skywalking.apm.toolkit.log.log4j.v2.x;
22

33
/**
44
* Created by wusheng on 2016/12/11.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.log4j.v2.x;
1+
package org.skywalking.apm.toolkit.log.log4j.v2.x;
22

33
import org.apache.logging.log4j.core.LogEvent;
44
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -10,17 +10,17 @@
1010
* It convert the pattern key: traceId.
1111
* Use '%traceId' in log4j2's config: <PatternLayout pattern="%d [%traceId] %-5p %c{1}:%L - %m%n"/>,
1212
* '%traceId' will output as TID:xxxx
13-
*
13+
* <p>
1414
* Created by wusheng on 2016/12/7.
1515
*/
1616
@Plugin(name = "TraceIdConverter", category = "Converter")
17-
@ConverterKeys({"traceId"})
17+
@ConverterKeys( {"traceId"})
1818
public class TraceIdConverter extends LogEventPatternConverter {
1919

2020
/**
2121
* Constructs an instance of LoggingEventPatternConverter.
2222
*
23-
* @param name name of converter.
23+
* @param name name of converter.
2424
* @param style CSS style for output.
2525
*/
2626
protected TraceIdConverter(String name, String style) {

skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>skywalking-application-toolkit</artifactId>
7-
<groupId>com.a.eye</groupId>
6+
<artifactId>apm-application-toolkit</artifactId>
7+
<groupId>org.skywalking</groupId>
88
<version>3.1-2017</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>skywalking-toolkit-logback-1.x</artifactId>
12+
<artifactId>apm-toolkit-logback-1.x</artifactId>
1313

1414
<dependencies>
1515
<dependency>
@@ -45,7 +45,7 @@
4545
<repository>
4646
<id>bintray-wu-sheng-sky-walking-repository</id>
4747
<name>wu-sheng-sky-walking-repository</name>
48-
<url>https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-logback-1.x/;publish=1
48+
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-logback-1.x/;publish=1
4949
</url>
5050
</repository>
5151
</distributionManagement>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.logback.v1.x;
1+
package org.skywalking.apm.toolkit.log.logback.v1.x;
22

33
import ch.qos.logback.classic.pattern.ClassicConverter;
44
import ch.qos.logback.classic.spi.ILoggingEvent;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.log.logback.v1.x;
1+
package org.skywalking.apm.toolkit.log.logback.v1.x;
22

33
import ch.qos.logback.classic.PatternLayout;
44

skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml apm-application-toolkit/apm-toolkit-opentracing/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>skywalking-application-toolkit</artifactId>
7-
<groupId>com.a.eye</groupId>
6+
<artifactId>apm-application-toolkit</artifactId>
7+
<groupId>org.skywalking</groupId>
88
<version>3.1-2017</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>skywalking-toolkit-opentracing</artifactId>
12+
<artifactId>apm-toolkit-opentracing</artifactId>
1313

1414
<dependencies>
1515
<dependency>
@@ -28,7 +28,7 @@
2828
<repository>
2929
<id>bintray-wu-sheng-sky-walking-repository</id>
3030
<name>wu-sheng-sky-walking-repository</name>
31-
<url>https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-opentracing/;publish=1
31+
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-opentracing/;publish=1
3232
</url>
3333
</repository>
3434
</distributionManagement>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.opentracing;
1+
package org.skywalking.apm.toolkit.opentracing;
22

33
import io.opentracing.SpanContext;
44

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.opentracing;
1+
package org.skywalking.apm.toolkit.opentracing;
22

33
import io.opentracing.Span;
44
import io.opentracing.SpanContext;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.opentracing;
1+
package org.skywalking.apm.toolkit.opentracing;
22

33
import io.opentracing.References;
44
import io.opentracing.Span;
@@ -13,7 +13,7 @@
1313
* All source code in SkyWalkingSpanBuilder acts like an NoopSpanBuilder.
1414
* Actually, it is NOT.
1515
* The whole logic will be added after toolkit-activation.
16-
*
16+
* <p>
1717
* Created by wusheng on 2016/12/20.
1818
*/
1919
public class SkyWalkingSpanBuilder implements Tracer.SpanBuilder {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.opentracing;
1+
package org.skywalking.apm.toolkit.opentracing;
22

33
import io.opentracing.SpanContext;
44
import io.opentracing.Tracer;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.opentracing;
1+
package org.skywalking.apm.toolkit.opentracing;
22

33
import io.opentracing.SpanContext;
44
import io.opentracing.propagation.TextMap;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SkyWalkingTracer
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.opentracing;
1+
package org.skywalking.apm.toolkit.opentracing;
22

33
import io.opentracing.Span;
44
import io.opentracing.SpanContext;

skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml apm-application-toolkit/apm-toolkit-trace-context/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<parent>
5-
<artifactId>skywalking-application-toolkit</artifactId>
6-
<groupId>com.a.eye</groupId>
5+
<artifactId>apm-application-toolkit</artifactId>
6+
<groupId>org.skywalking</groupId>
77
<version>3.1-2017</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

11-
<artifactId>skywalking-toolkit-trace-context</artifactId>
11+
<artifactId>apm-toolkit-trace-context</artifactId>
1212
<packaging>jar</packaging>
1313

1414
<url>http://maven.apache.org</url>
@@ -38,7 +38,7 @@
3838
<id>bintray-wu-sheng-sky-walking-repository</id>
3939
<name>wu-sheng-sky-walking-repository</name>
4040
<url>
41-
https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-trace-context/;publish=1
41+
https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-trace-context/;publish=1
4242
</url>
4343
</repository>
4444
</distributionManagement>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.a.eye.skywalking.toolkit.trace;
1+
package org.skywalking.apm.toolkit.trace;
22

33
/**
44
* Try to access the sky-walking tracer context.
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
33
<parent>
4-
<artifactId>skywalking</artifactId>
5-
<groupId>com.a.eye</groupId>
4+
<artifactId>apm</artifactId>
5+
<groupId>org.skywalking</groupId>
66
<version>3.1-2017</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
9-
<artifactId>skywalking-application-toolkit</artifactId>
9+
<artifactId>apm-application-toolkit</artifactId>
1010
<packaging>pom</packaging>
1111

1212
<properties>
1313
<compiler.version>1.6</compiler.version>
1414
</properties>
1515

1616
<modules>
17-
<module>skywalking-toolkit-log4j-1.x</module>
18-
<module>skywalking-toolkit-log4j-2.x</module>
19-
<module>skywalking-toolkit-logback-1.x</module>
20-
<module>skywalking-toolkit-trace-context</module>
21-
<module>skywalking-toolkit-opentracing</module>
17+
<module>apm-toolkit-log4j-1.x</module>
18+
<module>apm-toolkit-log4j-2.x</module>
19+
<module>apm-toolkit-logback-1.x</module>
20+
<module>apm-toolkit-trace-context</module>
21+
<module>apm-toolkit-opentracing</module>
2222
</modules>
2323
</project>

skywalking-collector/skywalking-collector-cluster/pom.xml apm-collector/apm-collector-cluster/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>skywalking-collector</artifactId>
7-
<groupId>com.a.eye</groupId>
6+
<artifactId>apm-collector</artifactId>
7+
<groupId>org.skywalking</groupId>
88
<version>3.1-2017</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>skywalking-collector-cluster</artifactId>
12+
<artifactId>apm-collector-cluster</artifactId>
1313
<packaging>jar</packaging>
1414

1515
<properties>
@@ -22,8 +22,8 @@
2222
<version>3.3.6</version>
2323
</dependency>
2424
<dependency>
25-
<groupId>com.a.eye</groupId>
26-
<artifactId>skywalking-util</artifactId>
25+
<groupId>org.skywalking</groupId>
26+
<artifactId>apm-util</artifactId>
2727
<version>${project.version}</version>
2828
</dependency>
2929
</dependencies>
+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.a.eye.skywalking.collector;
1+
package org.skywalking.apm.collector;
22

33
import akka.actor.ActorSystem;
4-
import com.a.eye.skywalking.api.util.StringUtil;
5-
import com.a.eye.skywalking.collector.cluster.ClusterConfig;
6-
import com.a.eye.skywalking.collector.cluster.Const;
74
import com.typesafe.config.Config;
85
import com.typesafe.config.ConfigFactory;
96
import org.apache.logging.log4j.Level;
107
import org.apache.logging.log4j.LogManager;
118
import org.apache.logging.log4j.Logger;
9+
import org.skywalking.apm.api.util.StringUtil;
10+
import org.skywalking.apm.collector.cluster.ClusterConfig;
11+
import org.skywalking.apm.collector.cluster.Const;
1212

1313
/**
1414
* @author pengys5
@@ -21,11 +21,11 @@ public ActorSystem create() {
2121
Level logLevel = logger.getLevel();
2222

2323
final Config config = ConfigFactory.parseString("akka.remote.netty.tcp.HOSTNAME=" + ClusterConfig.Cluster.Current.HOSTNAME).
24-
withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.PORT=" + ClusterConfig.Cluster.Current.PORT)).
25-
withFallback(ConfigFactory.parseString("akka.loggers=[\"akka.event.slf4j.Slf4jLogger\"]")).
26-
withFallback(ConfigFactory.parseString("akka.loglevel=\"" + logLevel.name() + "\"")).
24+
withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.PORT=" + ClusterConfig.Cluster.Current.PORT)).
25+
withFallback(ConfigFactory.parseString("akka.loggers=[\"akka.event.slf4j.Slf4jLogger\"]")).
26+
withFallback(ConfigFactory.parseString("akka.loglevel=\"" + logLevel.name() + "\"")).
2727

28-
withFallback(ConfigFactory.load("application.conf"));
28+
withFallback(ConfigFactory.load("application.conf"));
2929
if (!StringUtil.isEmpty(ClusterConfig.Cluster.SEED_NODES)) {
3030
config.withFallback(ConfigFactory.parseString("akka.cluster.seed-nodes=" + generateSeedNodes()));
3131
}
+7-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
package com.a.eye.skywalking.collector;
1+
package org.skywalking.apm.collector;
22

33
import akka.actor.ActorSystem;
44
import akka.actor.Props;
5-
import com.a.eye.skywalking.collector.actor.AbstractClusterWorkerProvider;
6-
import com.a.eye.skywalking.collector.actor.AbstractLocalWorkerProvider;
7-
import com.a.eye.skywalking.collector.actor.AbstractWorker;
8-
import com.a.eye.skywalking.collector.actor.ClusterWorkerContext;
9-
import com.a.eye.skywalking.collector.actor.LookUp;
10-
import com.a.eye.skywalking.collector.actor.ProviderNotFoundException;
11-
import com.a.eye.skywalking.collector.actor.UsedRoleNameException;
12-
import com.a.eye.skywalking.collector.cluster.WorkersListener;
13-
import com.a.eye.skywalking.collector.config.ConfigInitializer;
14-
import java.io.IOException;
15-
import java.util.ServiceLoader;
165
import org.apache.logging.log4j.LogManager;
176
import org.apache.logging.log4j.Logger;
7+
import org.skywalking.apm.collector.actor.*;
8+
import org.skywalking.apm.collector.cluster.WorkersListener;
9+
import org.skywalking.apm.collector.config.ConfigInitializer;
10+
11+
import java.io.IOException;
12+
import java.util.ServiceLoader;
1813

1914
/**
2015
* @author pengys5

0 commit comments

Comments
 (0)