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

Fix the version issue. And remove the duplicate definition of ConfigInitializer.

This commit is contained in:
wusheng 2017-01-09 15:27:48 +08:00
parent 5e6634d637
commit 39f597f1ec
49 changed files with 165 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.a.eye</groupId>
<artifactId>skywalking</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
<modules>
<module>skywalking-commons</module>

9
skywalking-alarm/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>skywalking</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-alarm</artifactId>
@ -70,6 +70,11 @@
<artifactId>HikariCP</artifactId>
<version>2.4.3</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-util</artifactId>
<version>2.1-2017</version>
</dependency>
</dependencies>
<build>
<finalName>skywalking-alarm</finalName>
@ -110,7 +115,7 @@
<dockerDirectory>${project.basedir}/docker</dockerDirectory>
<imageName>skywalking/skywalking-alarm</imageName>
<imageTags>
<imageTag>${skywalking.version}</imageTag>
<imageTag>2.1-2017</imageTag>
</imageTags>
<resources>
<resource>

2
skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmProcessServer.java
View File

@ -1,8 +1,8 @@
package com.a.eye.skywalking.alarm;
import com.a.eye.skywalking.alarm.conf.ConfigInitializer;
import com.a.eye.skywalking.alarm.conf.Config;
import com.a.eye.skywalking.alarm.util.ZKUtil;
import com.a.eye.skywalking.util.ConfigInitializer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

69
skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/conf/ConfigInitializer.java
View File

@ -1,69 +0,0 @@
package com.a.eye.skywalking.alarm.conf;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.LinkedList;
import java.util.Properties;
import java.util.logging.Logger;
public class ConfigInitializer {
private static Logger logger = Logger.getLogger(ConfigInitializer.class.getName());
public static void initialize(Properties properties, Class<?> rootConfigType) throws IllegalAccessException {
initNextLevel(properties, rootConfigType, new ConfigDesc());
}
private static void initNextLevel(Properties properties, Class<?> recentConfigType, ConfigDesc parentDesc) throws NumberFormatException, IllegalArgumentException, IllegalAccessException {
for (Field field : recentConfigType.getFields()) {
if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
String configKey = (parentDesc + "." +
field.getName()).toLowerCase();
String value = properties.getProperty(configKey);
if (value != null) {
if (field.getType().equals(int.class))
field.set(null, Integer.valueOf(value));
if (field.getType().equals(String.class))
field.set(null, value);
if (field.getType().equals(long.class))
field.set(null, Long.valueOf(value));
if (field.getType().equals(boolean.class))
field.set(null, Boolean.valueOf(value));
}
}
}
for (Class<?> innerConfiguration : recentConfigType.getClasses()) {
parentDesc.append(innerConfiguration.getSimpleName());
initNextLevel(properties, innerConfiguration, parentDesc);
parentDesc.removeLastDesc();
}
}
}
class ConfigDesc {
private LinkedList<String> descs = new LinkedList<String>();
void append(String currentDesc) {
descs.addLast(currentDesc);
}
void removeLastDesc() {
descs.removeLast();
}
@Override
public String toString() {
if (descs.size() == 0) {
return "";
}
StringBuilder ret = new StringBuilder(descs.getFirst());
boolean first = true;
for (String desc : descs) {
if (first) {
first = false;
continue;
}
ret.append(".").append(desc);
}
return ret.toString();
}
}

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

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>skywalking-application-toolkit</artifactId>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-application-toolkit</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-application-toolkit</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-application-toolkit</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-application-toolkit</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>skywalking-application-toolkit</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
skywalking-commons/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
skywalking-commons/skywalking-health-report/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-commons</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
skywalking-commons/skywalking-logging/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-commons</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-logging</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-logging</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
skywalking-commons/skywalking-registry/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-commons</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,7 +21,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-logging-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>

4
skywalking-commons/skywalking-util/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-commons</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,7 +21,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-network</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
</project>

13
skywalking-webui/src/main/java/com/a/eye/skywalking/web/config/ConfigInitializer.java → skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/util/ConfigInitializer.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.web.config;
package com.a.eye.skywalking.util;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@ -6,6 +6,12 @@ import java.util.LinkedList;
import java.util.Properties;
import java.util.logging.Logger;
/**
* Init a class's static fields by a {@link Properties},
* including static fields and static inner classes.
* <p>
* Created by wusheng on 2017/1/9.
*/
public class ConfigInitializer {
private static Logger logger = Logger.getLogger(ConfigInitializer.class.getName());
@ -13,11 +19,10 @@ public class ConfigInitializer {
initNextLevel(properties, rootConfigType, new ConfigDesc());
}
private static void initNextLevel(Properties properties, Class<?> recentConfigType, ConfigDesc parentDesc) throws NumberFormatException, IllegalArgumentException, IllegalAccessException {
private static void initNextLevel(Properties properties, Class<?> recentConfigType, ConfigDesc parentDesc) throws IllegalArgumentException, IllegalAccessException {
for (Field field : recentConfigType.getFields()) {
if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
String configKey = (parentDesc + "." +
field.getName()).toLowerCase();
String configKey = (parentDesc + "." + field.getName()).toLowerCase();
String value = properties.getProperty(configKey);
if (value != null) {
if (field.getType().equals(int.class))

4
skywalking-sniffer/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-util</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
</project>

2
skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-sniffer</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>skywalking-agent</artifactId>

22
skywalking-sniffer/skywalking-agent/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-sniffer</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-agent</artifactId>
@ -30,56 +30,56 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-jedis-2.x-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-jdbc-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-httpClient-4.x-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-dubbo-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>tomcat-7.x-8.x-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>motan-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<!-- activation -->
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-toolkit-log4j-1.x-activation</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-toolkit-log4j-2.x-activation</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-toolkit-logback-1.x-activation</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-toolkit-trace-context-activation</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>

4
skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java
View File

@ -2,7 +2,7 @@ package com.a.eye.skywalking.agent;
import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher;
import com.a.eye.skywalking.conf.Config;
import com.a.eye.skywalking.conf.ConfigInitializer;
import com.a.eye.skywalking.conf.SnifferConfigInitializer;
import com.a.eye.skywalking.logging.EasyLogResolver;
import com.a.eye.skywalking.logging.api.ILog;
import com.a.eye.skywalking.logging.api.LogManager;
@ -98,7 +98,7 @@ public class SkyWalkingAgent {
Config.SkyWalking.IS_PREMAIN_MODE = true;
Config.SkyWalking.AGENT_BASE_PATH = initAgentBasePath();
ConfigInitializer.initialize();
SnifferConfigInitializer.initialize();
}
/**

4
skywalking-sniffer/skywalking-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-sniffer</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
@ -29,7 +29,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-network</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.lmax</groupId>

114
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java
View File

@ -1,114 +0,0 @@
package com.a.eye.skywalking.conf;
import com.a.eye.skywalking.logging.api.ILog;
import com.a.eye.skywalking.logging.api.LogManager;
import com.a.eye.skywalking.util.StringUtil;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.LinkedList;
import java.util.Properties;
public class ConfigInitializer {
private static ILog logger = LogManager.getLogger(ConfigInitializer.class);
public static void initialize() {
InputStream configFileStream;
if (Config.SkyWalking.IS_PREMAIN_MODE) {
configFileStream = fetchAuthFileInputStream();
} else {
configFileStream = ConfigInitializer.class.getResourceAsStream("/sky-walking.config");
}
if (configFileStream == null) {
logger.info("Not provide sky-walking certification documents, sky-walking api run in default config.");
} else {
try {
Properties properties = new Properties();
properties.load(configFileStream);
initNextLevel(properties, Config.class, new ConfigDesc());
} catch (Exception e) {
logger.error("Failed to read the config file, sky-walking api run in default config.", e);
}
}
Config.SkyWalking.USERNAME = System.getProperty("username");
Config.SkyWalking.APPLICATION_CODE = System.getProperty("applicationCode");
Config.SkyWalking.SERVERS = System.getProperty("servers");
if(StringUtil.isEmpty(Config.SkyWalking.USERNAME)){
throw new ExceptionInInitializerError("'-Dusername=' is missing.");
}
if(StringUtil.isEmpty(Config.SkyWalking.APPLICATION_CODE)){
throw new ExceptionInInitializerError("'-DapplicationCode=' is missing.");
}
if(StringUtil.isEmpty(Config.SkyWalking.SERVERS)){
throw new ExceptionInInitializerError("'-Dservers=' is missing.");
}
}
private static void initNextLevel(Properties properties, Class<?> recentConfigType, ConfigDesc parentDesc) throws NumberFormatException, IllegalArgumentException, IllegalAccessException {
for (Field field : recentConfigType.getFields()) {
if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
String configKey = (parentDesc + "." +
field.getName()).toLowerCase();
String value = properties.getProperty(configKey);
if (value != null) {
if (field.getType().equals(int.class))
field.set(null, Integer.valueOf(value));
if (field.getType().equals(String.class))
field.set(null, value);
if (field.getType().equals(long.class))
field.set(null, Long.valueOf(value));
if (field.getType().equals(boolean.class))
field.set(null, Boolean.valueOf(value));
}
}
}
for (Class<?> innerConfiguration : recentConfigType.getClasses()) {
parentDesc.append(innerConfiguration.getSimpleName());
initNextLevel(properties, innerConfiguration, parentDesc);
parentDesc.removeLastDesc();
}
}
private static InputStream fetchAuthFileInputStream() {
try {
return new FileInputStream(Config.SkyWalking.AGENT_BASE_PATH + File.separator + "/sky-walking.config");
} catch (Exception e) {
logger.warn("sky-walking.config is missing, use default config.");
return null;
}
}
}
class ConfigDesc {
private LinkedList<String> descs = new LinkedList<String>();
void append(String currentDesc) {
descs.addLast(currentDesc);
}
void removeLastDesc() {
descs.removeLast();
}
@Override
public String toString() {
if (descs.size() == 0) {
return "";
}
StringBuilder ret = new StringBuilder(descs.getFirst());
boolean first = true;
for (String desc : descs) {
if (first) {
first = false;
continue;
}
ret.append(".").append(desc);
}
return ret.toString();
}
}

58
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/SnifferConfigInitializer.java Normal file
View File

@ -0,0 +1,58 @@
package com.a.eye.skywalking.conf;
import com.a.eye.skywalking.logging.api.ILog;
import com.a.eye.skywalking.logging.api.LogManager;
import com.a.eye.skywalking.util.ConfigInitializer;
import com.a.eye.skywalking.util.StringUtil;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Properties;
public class SnifferConfigInitializer {
private static ILog logger = LogManager.getLogger(SnifferConfigInitializer.class);
public static void initialize() {
InputStream configFileStream;
if (Config.SkyWalking.IS_PREMAIN_MODE) {
configFileStream = fetchAuthFileInputStream();
} else {
configFileStream = SnifferConfigInitializer.class.getResourceAsStream("/sky-walking.config");
}
if (configFileStream == null) {
logger.info("Not provide sky-walking certification documents, sky-walking api run in default config.");
} else {
try {
Properties properties = new Properties();
properties.load(configFileStream);
ConfigInitializer.initialize(properties, Config.class);
} catch (Exception e) {
logger.error("Failed to read the config file, sky-walking api run in default config.", e);
}
}
Config.SkyWalking.USERNAME = System.getProperty("username");
Config.SkyWalking.APPLICATION_CODE = System.getProperty("applicationCode");
Config.SkyWalking.SERVERS = System.getProperty("servers");
if(StringUtil.isEmpty(Config.SkyWalking.USERNAME)){
throw new ExceptionInInitializerError("'-Dusername=' is missing.");
}
if(StringUtil.isEmpty(Config.SkyWalking.APPLICATION_CODE)){
throw new ExceptionInInitializerError("'-DapplicationCode=' is missing.");
}
if(StringUtil.isEmpty(Config.SkyWalking.SERVERS)){
throw new ExceptionInInitializerError("'-Dservers=' is missing.");
}
}
private static InputStream fetchAuthFileInputStream() {
try {
return new FileInputStream(Config.SkyWalking.AGENT_BASE_PATH + File.separator + "/sky-walking.config");
} catch (Exception e) {
logger.warn("sky-walking.config is missing, use default config.");
return null;
}
}
}

4
skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-sdk-plugin</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,7 +21,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

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

@ -6,7 +6,7 @@
<parent>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-sdk-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-httpClient-4.x-plugin</artifactId>
@ -23,7 +23,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>

4
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-sdk-plugin</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,7 +21,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>mysql</groupId>

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

@ -6,7 +6,7 @@
<parent>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-sdk-plugin</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-jedis-2.x-plugin</artifactId>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-sdk-plugin</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
skywalking-sniffer/skywalking-sdk-plugin/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-sniffer</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-sdk-plugin</artifactId>
@ -31,7 +31,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>

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

@ -3,7 +3,7 @@
<parent>
<artifactId>skywalking-sdk-plugin</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
skywalking-sniffer/skywalking-toolkit-activation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-sniffer</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
@ -23,7 +23,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
</project>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-toolkit-activation</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-toolkit-activation</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-toolkit-activation</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-toolkit-activation</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>skywalking-toolkit-activation</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -16,7 +16,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-api</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
</project>

10
skywalking-storage-center/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -22,7 +22,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-network</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
@ -32,17 +32,17 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-registry</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-logging-impl-log4j2</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-health-report</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>

6
skywalking-storage-center/skywalking-routing/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>skywalking-storage-center</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -28,7 +28,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-util</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
@ -74,7 +74,7 @@
<dockerDirectory>${project.basedir}/docker</dockerDirectory>
<imageName>skywalking/skywalking-routing</imageName>
<imageTags>
<imageTag>${skywalking.version}</imageTag>
<imageTag>2.1-2017</imageTag>
</imageTags>
<resources>
<resource>

12
skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java
View File

@ -9,15 +9,25 @@ import com.a.eye.skywalking.registry.api.RegistryCenter;
import com.a.eye.skywalking.registry.assist.NetUtils;
import com.a.eye.skywalking.registry.impl.zookeeper.ZookeeperConfig;
import com.a.eye.skywalking.routing.config.Config;
import com.a.eye.skywalking.routing.config.ConfigInitializer;
import com.a.eye.skywalking.routing.listener.SpanStorageListenerImpl;
import com.a.eye.skywalking.routing.listener.TraceSearchListenerImpl;
import com.a.eye.skywalking.routing.router.RoutingService;
import com.a.eye.skywalking.util.ConfigInitializer;
import java.io.IOException;
import java.util.Map;
import java.util.Properties;
/**
* Main Class of the routing server.
* It starts server in a sequence:
* 1. init config
* 2. init logManager
* 3. registry server
* 4. open service, and start listening port.
*
* @author wusheng
*/
public class Main {
private static final ILog logger = LogManager.getLogger(Main.class);

70
skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/config/ConfigInitializer.java
View File

@ -1,70 +0,0 @@
package com.a.eye.skywalking.routing.config;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.LinkedList;
import java.util.Properties;
import java.util.logging.Logger;
public class ConfigInitializer {
private static Logger logger = Logger.getLogger(ConfigInitializer.class.getName());
public static void initialize(Properties properties, Class<?> rootConfigType) throws IllegalAccessException {
initNextLevel(properties, rootConfigType, new ConfigDesc());
}
private static void initNextLevel(Properties properties, Class<?> recentConfigType, ConfigDesc parentDesc) throws NumberFormatException, IllegalArgumentException, IllegalAccessException {
for (Field field : recentConfigType.getFields()) {
if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
String configKey = (parentDesc + "." +
field.getName()).toLowerCase();
String value = properties.getProperty(configKey);
if (value != null) {
if (field.getType().equals(int.class))
field.set(null, Integer.valueOf(value));
if (field.getType().equals(String.class))
field.set(null, value);
if (field.getType().equals(long.class))
field.set(null, Long.valueOf(value));
if (field.getType().equals(boolean.class))
field.set(null, Boolean.valueOf(value));
}
}
}
for (Class<?> innerConfiguration : recentConfigType.getClasses()) {
parentDesc.append(innerConfiguration.getSimpleName());
initNextLevel(properties, innerConfiguration, parentDesc);
parentDesc.removeLastDesc();
}
}
}
class ConfigDesc {
private LinkedList<String> descs = new LinkedList<String>();
void append(String currentDesc) {
descs.addLast(currentDesc);
}
void removeLastDesc() {
descs.removeLast();
}
@Override
public String toString() {
if (descs.size() == 0) {
return "";
}
StringBuilder ret = new StringBuilder(descs.getFirst());
boolean first = true;
for (String desc : descs) {
if (first) {
first = false;
continue;
}
ret.append(".").append(desc);
}
return ret.toString();
}
}

4
skywalking-storage-center/skywalking-storage/null/data/file/2017_01_09_15_24_02_220_1000 Normal file
View File

@ -0,0 +1,4 @@
2
username_612
application_code_9app

4
skywalking-storage-center/skywalking-storage/null/data/file/2017_01_09_15_27_09_291_1000 Normal file
View File

@ -0,0 +1,4 @@
2
username_612
application_code_9app

6
skywalking-storage-center/skywalking-storage/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>skywalking-storage-center</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-storage</artifactId>
@ -36,7 +36,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-util</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
@ -116,7 +116,7 @@
<dockerDirectory>${project.basedir}/docker</dockerDirectory>
<imageName>skywalking/skywalking-storage</imageName>
<imageTags>
<imageTag>${skywalking.version}</imageTag>
<imageTag>2.1-2017</imageTag>
</imageTags>
<resources>
<resource>

5
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java
View File

@ -8,17 +8,16 @@ import com.a.eye.skywalking.network.Server;
import com.a.eye.skywalking.registry.RegistryCenterFactory;
import com.a.eye.skywalking.registry.api.CenterType;
import com.a.eye.skywalking.registry.api.RegistryCenter;
import com.a.eye.skywalking.registry.assist.NetUtils;
import com.a.eye.skywalking.registry.impl.zookeeper.ZookeeperConfig;
import com.a.eye.skywalking.storage.boot.ElasticBootstrap;
import com.a.eye.skywalking.storage.config.Config;
import com.a.eye.skywalking.storage.config.ConfigInitializer;
import com.a.eye.skywalking.storage.data.file.DataFilesManager;
import com.a.eye.skywalking.storage.data.index.IndexOperatorFactory;
import com.a.eye.skywalking.storage.listener.SearchListener;
import com.a.eye.skywalking.storage.listener.StorageListener;
import com.a.eye.skywalking.registry.assist.NetUtils;
import com.a.eye.skywalking.util.ConfigInitializer;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.Properties;

70
skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/config/ConfigInitializer.java
View File

@ -1,70 +0,0 @@
package com.a.eye.skywalking.storage.config;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.LinkedList;
import java.util.Properties;
import java.util.logging.Logger;
public class ConfigInitializer {
private static Logger logger = Logger.getLogger(ConfigInitializer.class.getName());
public static void initialize(Properties properties, Class<?> rootConfigType) throws IllegalAccessException {
initNextLevel(properties, rootConfigType, new ConfigDesc());
}
private static void initNextLevel(Properties properties, Class<?> recentConfigType, ConfigDesc parentDesc) throws NumberFormatException, IllegalArgumentException, IllegalAccessException {
for (Field field : recentConfigType.getFields()) {
if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
String configKey = (parentDesc + "." +
field.getName()).toLowerCase();
String value = properties.getProperty(configKey);
if (value != null) {
if (field.getType().equals(int.class))
field.set(null, Integer.valueOf(value));
if (field.getType().equals(String.class))
field.set(null, value);
if (field.getType().equals(long.class))
field.set(null, Long.valueOf(value));
if (field.getType().equals(boolean.class))
field.set(null, Boolean.valueOf(value));
}
}
}
for (Class<?> innerConfiguration : recentConfigType.getClasses()) {
parentDesc.append(innerConfiguration.getSimpleName());
initNextLevel(properties, innerConfiguration, parentDesc);
parentDesc.removeLastDesc();
}
}
}
class ConfigDesc {
private LinkedList<String> descs = new LinkedList<String>();
void append(String currentDesc) {
descs.addLast(currentDesc);
}
void removeLastDesc() {
descs.removeLast();
}
@Override
public String toString() {
if (descs.size() == 0) {
return "";
}
StringBuilder ret = new StringBuilder(descs.getFirst());
boolean first = true;
for (String desc : descs) {
if (first) {
first = false;
continue;
}
ret.append(".").append(desc);
}
return ret.toString();
}
}

8
skywalking-webui/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>skywalking</artifactId>
<groupId>com.a.eye</groupId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</parent>
<artifactId>skywalking-webui</artifactId>
@ -20,7 +20,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-network</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
@ -111,7 +111,7 @@
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-util</artifactId>
<version>${skywalking.version}</version>
<version>2.1-2017</version>
</dependency>
</dependencies>
@ -128,7 +128,7 @@
<dockerDirectory>${project.basedir}/docker</dockerDirectory>
<imageName>skywalking/skywalking-webui</imageName>
<imageTags>
<imageTag>${skywalking.version}</imageTag>
<imageTag>2.1-2017</imageTag>
</imageTags>
<resources>
<resource>

2
skywalking-webui/src/main/java/com/a/eye/skywalking/web/controller/SearchController.java
View File

@ -3,11 +3,11 @@ package com.a.eye.skywalking.web.controller;
import com.a.eye.skywalking.registry.RegistryCenterFactory;
import com.a.eye.skywalking.registry.api.RegistryCenter;
import com.a.eye.skywalking.registry.impl.zookeeper.ZookeeperConfig;
import com.a.eye.skywalking.util.ConfigInitializer;
import com.a.eye.skywalking.util.StringUtil;
import com.a.eye.skywalking.web.client.routing.RoutingServerWatcher;
import com.a.eye.skywalking.web.common.BaseController;
import com.a.eye.skywalking.web.config.Config;
import com.a.eye.skywalking.web.config.ConfigInitializer;
import com.a.eye.skywalking.web.dto.TraceTreeInfo;
import com.a.eye.skywalking.web.service.inter.ITraceTreeService;
import com.alibaba.fastjson.JSON;