From 87e46477064197d7ca3a001340a583356da4a8e5 Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 18 Apr 2017 13:19:57 +0800 Subject: [PATCH] Fix ci-fail. --- .../collector/worker/node/NodeCompIndex.java | 2 +- .../worker/tracedag/TraceDagDataBuilder.java | 2 +- .../worker/node/NodeCompIndexTestCase.java | 6 +- .../tracedag/TraceDagDataBuilderTestCase.java | 4 +- .../skywalking/logging/LogManagerTest.java | 2 +- .../dependency-reduced-pom.xml | 261 +++++++++--------- .../assist/NoConcurrencyAccessObject.java | 2 +- 7 files changed, 138 insertions(+), 141 deletions(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java index 16621dfdb..69f795b4c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java @@ -12,7 +12,7 @@ import java.io.IOException; public class NodeCompIndex extends AbstractIndex { public static final String INDEX = "node_comp_idx"; - public static final String NAME = "NAME"; + public static final String NAME = "name"; public static final String PEERS = "peers"; @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java index b9a57cb17..ccdb1212c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java @@ -51,7 +51,7 @@ public class TraceDagDataBuilder { } JsonObject dagJsonObj = new JsonObject(); - dagJsonObj.add("NODES", pointArray); + dagJsonObj.add("nodes", pointArray); dagJsonObj.add("nodeRefs", lineArray); return dagJsonObj; } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java index c8f02c606..edab2511e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java @@ -1,11 +1,9 @@ package com.a.eye.skywalking.collector.worker.node; -import com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceIndex; +import java.io.IOException; import org.junit.Assert; import org.junit.Test; -import java.io.IOException; - /** * @author pengys5 */ @@ -21,6 +19,6 @@ public class NodeCompIndexTestCase { @Test public void testBuilder() throws IOException { NodeCompIndex index = new NodeCompIndex(); - Assert.assertEquals("{\"properties\":{\"NAME\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"peers\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"aggId\":{\"type\":\"string\",\"index\":\"not_analyzed\"}}}", index.createMappingBuilder().string()); + Assert.assertEquals("{\"properties\":{\"name\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"peers\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"aggId\":{\"type\":\"string\",\"index\":\"not_analyzed\"}}}", index.createMappingBuilder().string()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilderTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilderTestCase.java index 839e3f2e5..1bf956c24 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilderTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilderTestCase.java @@ -22,7 +22,7 @@ public class TraceDagDataBuilderTestCase { TraceDagDataBuilder builder = new TraceDagDataBuilder(); JsonObject dagJsonObj = builder.build(nodeCompArray, nodeMappingArray, nodeRefArray, resSumArray); - JsonArray pointArray = dagJsonObj.getAsJsonArray("NODES"); + JsonArray pointArray = dagJsonObj.getAsJsonArray("nodes"); JsonArray lineArray = dagJsonObj.getAsJsonArray("nodeRefs"); for (int i = 0; i < pointArray.size(); i++) { @@ -47,7 +47,7 @@ public class TraceDagDataBuilderTestCase { } private JsonArray nodeCompArrayData() { - String str = "[{\"NAME\":\"Tomcat\",\"peers\":\"portal-service\"},{\"NAME\":\"Motan\",\"peers\":\"cache-service\"},{\"NAME\":\"H2\",\"peers\":\"[localhost:-1]\"},{\"NAME\":\"Tomcat\",\"peers\":\"[10.128.35.80:57818]\"},{\"NAME\":\"Redis\",\"peers\":\"[127.0.0.1:6379]\"},{\"NAME\":\"Mysql\",\"peers\":\"[127.0.0.1:3307]\"},{\"NAME\":\"Tomcat\",\"peers\":\"persistence-service\"},{\"NAME\":\"HttpClient\",\"peers\":\"[10.128.35.80:20880]\"},{\"NAME\":\"Motan\",\"peers\":\"[127.0.0.1:8002]\"},{\"NAME\":\"Tomcat\",\"peers\":\"[0:0:0:0:0:0:0:1:57837]\"}]"; + String str = "[{\"name\":\"Tomcat\",\"peers\":\"portal-service\"},{\"name\":\"Motan\",\"peers\":\"cache-service\"},{\"name\":\"H2\",\"peers\":\"[localhost:-1]\"},{\"name\":\"Tomcat\",\"peers\":\"[10.128.35.80:57818]\"},{\"name\":\"Redis\",\"peers\":\"[127.0.0.1:6379]\"},{\"name\":\"Mysql\",\"peers\":\"[127.0.0.1:3307]\"},{\"name\":\"Tomcat\",\"peers\":\"persistence-service\"},{\"name\":\"HttpClient\",\"peers\":\"[10.128.35.80:20880]\"},{\"name\":\"Motan\",\"peers\":\"[127.0.0.1:8002]\"},{\"name\":\"Tomcat\",\"peers\":\"[0:0:0:0:0:0:0:1:57837]\"}]"; JsonArray jsonArray = gson.fromJson(str, JsonArray.class); return jsonArray; } diff --git a/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java b/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java index cfd145902..c4a8ccdd2 100644 --- a/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java +++ b/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java @@ -20,7 +20,7 @@ public class LogManagerTest { @Before @After public void clear() throws IllegalAccessException { - MemberModifier.field(LogManager.class, "resolver").set(null, null); + MemberModifier.field(LogManager.class, "RESOLVER").set(null, null); } public class TestLogger implements ILog { diff --git a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml index 56a5271d4..32423811d 100644 --- a/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml +++ b/skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml @@ -1,134 +1,133 @@ - - - skywalking-sniffer - com.a.eye - 3.0.1-2017 - - 4.0.0 - skywalking-agent - skywalking-agent - http://maven.apache.org - - ${artifactId} - - - maven-shade-plugin - 2.4.1 - - - package - - shade - - - false - true - true - true - - - skywalking-plugin.def - - - - ${premain.class} - - - - - - com.lmax:* - org.apache.httpcomponents:* - commons-logging:* - commons-codec:* - *:gson - - - - - ${shade.net.bytebuddy.source} - ${shade.net.bytebuddy.target} - - - - - - - - - - - com.google.code.gson - gson - 2.8.0 - compile - - - junit - junit - 4.12 - test - - - hamcrest-core - org.hamcrest - - - - - org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - powermock-module-junit4-common - org.powermock - - - - - org.powermock - powermock-api-mockito - 1.6.4 - test - - - mockito-core - org.mockito - - - powermock-api-support - org.powermock - - - hamcrest-core - org.hamcrest - - - - - - - bintray-wu-sheng-sky-walking-repository - wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-agent/;publish=1 - - - - ${shade.package}.${shade.net.bytebuddy.source} - com.a.eye.skywalking.dependencies - UTF-8 - net.bytebuddy - com.a.eye.skywalking.agent.SkyWalkingAgent - + + + skywalking-sniffer + com.a.eye + 3.0.1-2017 + + 4.0.0 + skywalking-agent + skywalking-agent + http://maven.apache.org + + ${artifactId} + + + maven-shade-plugin + 2.4.1 + + + package + + shade + + + false + true + true + true + + + skywalking-plugin.def + + + + ${premain.class} + + + + + + com.lmax:* + org.apache.httpcomponents:* + commons-logging:* + commons-codec:* + *:gson + + + + + ${shade.net.bytebuddy.source} + ${shade.net.bytebuddy.target} + + + + + + + + + + + com.google.code.gson + gson + 2.8.0 + compile + + + junit + junit + 4.12 + test + + + hamcrest-core + org.hamcrest + + + + + org.mockito + mockito-all + 1.10.19 + test + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + powermock-module-junit4-common + org.powermock + + + + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + mockito-core + org.mockito + + + powermock-api-support + org.powermock + + + hamcrest-core + org.hamcrest + + + + + + + bintray-wu-sheng-sky-walking-repository + wu-sheng-sky-walking-repository + https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-agent/;publish=1 + + + + ${shade.package}.${shade.net.bytebuddy.source} + com.a.eye.skywalking.dependencies + UTF-8 + net.bytebuddy + com.a.eye.skywalking.agent.SkyWalkingAgent + diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java index fb78a2348..47a3d8857 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java @@ -13,7 +13,7 @@ import com.a.eye.skywalking.api.plugin.interceptor.InterceptorException; * @author wusheng */ public class NoConcurrencyAccessObject { - private static final String INVOKE_COUNTER_KEY = "__$INVOKE_COUNTER_KEY"; + private static final String INVOKE_COUNTER_KEY = "__$invokeCounterKey"; public void whenEnter(EnhancedClassInstanceContext context, Runnable runnable) { if (!context.isContain(INVOKE_COUNTER_KEY)) {