You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/02/24 02:22:11 UTC
[incubator-skywalking] branch scope-refactor updated: Try to make
CI passed.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch scope-refactor
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/scope-refactor by this push:
new 3fe5377 Try to make CI passed.
3fe5377 is described below
commit 3fe53775f2bc13a3f8b4f4dd8bacff4f6e500056
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Feb 24 10:22:03 2019 +0800
Try to make CI passed.
---
.../oal/tool/parser/DeepAnalysisTest.java | 8 +++---
.../oal/tool/parser/ScriptParserTest.java | 13 ++++++++-
.../core/alarm/provider/WebhookCallbackTest.java | 31 +++++++---------------
.../oap/server/core/source/DefaultScopeDefine.java | 6 ++++-
4 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/DeepAnalysisTest.java b/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/DeepAnalysisTest.java
index ec2bbd6..1482617 100644
--- a/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/DeepAnalysisTest.java
+++ b/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/DeepAnalysisTest.java
@@ -47,7 +47,7 @@ public class DeepAnalysisTest {
EntryMethod method = result.getEntryMethod();
Assert.assertEquals("combine", method.getMethodName());
- Assert.assertEquals("sourceScopeId.getLatency()", method.getArgsExpressions().get(0));
+ Assert.assertEquals("source.getLatency()", method.getArgsExpressions().get(0));
Assert.assertEquals("1", method.getArgsExpressions().get(1));
List<SourceColumn> source = result.getFieldsFromSource();
@@ -71,7 +71,7 @@ public class DeepAnalysisTest {
EntryMethod method = result.getEntryMethod();
Assert.assertEquals("combine", method.getMethodName());
- Assert.assertEquals("sourceScopeId.getLatency()", method.getArgsExpressions().get(0));
+ Assert.assertEquals("source.getLatency()", method.getArgsExpressions().get(0));
Assert.assertEquals("1", method.getArgsExpressions().get(1));
List<SourceColumn> source = result.getFieldsFromSource();
@@ -100,7 +100,7 @@ public class DeepAnalysisTest {
EntryMethod method = result.getEntryMethod();
Assert.assertEquals("combine", method.getMethodName());
- Assert.assertEquals("sourceScopeId.getLatency()", method.getArgsExpressions().get(0));
+ Assert.assertEquals("source.getLatency()", method.getArgsExpressions().get(0));
Assert.assertEquals("1", method.getArgsExpressions().get(1));
List<SourceColumn> source = result.getFieldsFromSource();
@@ -113,7 +113,7 @@ public class DeepAnalysisTest {
Assert.assertEquals(1, filterExpressions.size());
FilterExpression filterExpression = filterExpressions.get(0);
Assert.assertEquals("EqualMatch", filterExpression.getExpressionObject());
- Assert.assertEquals("sourceScopeId.getName()", filterExpression.getLeft());
+ Assert.assertEquals("source.getName()", filterExpression.getLeft());
Assert.assertEquals("\"/service/prod/save\"", filterExpression.getRight());
}
}
diff --git a/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/ScriptParserTest.java b/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/ScriptParserTest.java
index 8ea4a92..58cb838 100644
--- a/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/ScriptParserTest.java
+++ b/oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/ScriptParserTest.java
@@ -21,6 +21,8 @@ package org.apache.skywalking.oal.tool.parser;
import java.io.*;
import java.util.List;
import org.apache.skywalking.oal.tool.meta.*;
+import org.apache.skywalking.oap.server.core.annotation.AnnotationScan;
+import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.junit.*;
public class ScriptParserTest {
@@ -31,6 +33,15 @@ public class ScriptParserTest {
MetaSettings metaSettings = reader.read(stream);
SourceColumnsFactory.setSettings(metaSettings);
Indicators.init();
+
+ AnnotationScan scopeScan = new AnnotationScan();
+ scopeScan.registerListener(new DefaultScopeDefine.Listener());
+ scopeScan.scan(null);
+ }
+
+ @AfterClass
+ public static void clear() {
+ DefaultScopeDefine.reset();
}
@Test
@@ -71,7 +82,7 @@ public class ScriptParserTest {
EntryMethod entryMethod = endpointPercent.getEntryMethod();
List<String> methodArgsExpressions = entryMethod.getArgsExpressions();
Assert.assertEquals(3, methodArgsExpressions.size());
- Assert.assertEquals("sourceScopeId.isStatus()", methodArgsExpressions.get(1));
+ Assert.assertEquals("source.isStatus()", methodArgsExpressions.get(1));
Assert.assertEquals("true", methodArgsExpressions.get(2));
}
diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
index 949cf09..097a77f 100644
--- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
+++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
@@ -18,30 +18,17 @@
package org.apache.skywalking.oap.server.core.alarm.provider;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import com.google.gson.*;
+import java.io.*;
import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
import org.apache.skywalking.oap.server.core.alarm.AlarmMessage;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.eclipse.jetty.servlet.*;
+import org.junit.*;
public class WebhookCallbackTest implements Servlet {
private Server server;
@@ -74,11 +61,11 @@ public class WebhookCallbackTest implements Servlet {
WebhookCallback webhookCallback = new WebhookCallback(remoteEndpoints);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScope(DefaultScopeDefine.All);
+ alarmMessage.setScopeId(DefaultScopeDefine.ALL);
alarmMessage.setAlarmMessage("alarmMessage with [DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
AlarmMessage anotherAlarmMessage = new AlarmMessage();
- anotherAlarmMessage.setScope(DefaultScopeDefine.Endpoint);
+ anotherAlarmMessage.setScopeId(DefaultScopeDefine.ENDPOINT);
anotherAlarmMessage.setAlarmMessage("anotherAlarmMessage with [DefaultScopeDefine.Endpoint]");
alarmMessages.add(anotherAlarmMessage);
webhookCallback.doAlarm(alarmMessages);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
index 69257aa..6d8d3f4 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
@@ -72,7 +72,6 @@ public class DefaultScopeDefine {
public static final int DATABASE_SLOW_STATEMENT = 18;
public static class Listener implements AnnotationListener {
-
@Override public Class<? extends Annotation> annotation() {
return ScopeDeclarations.class;
}
@@ -118,4 +117,9 @@ public class DefaultScopeDefine {
}
return id;
}
+
+ public static void reset() {
+ NAME_2_ID.clear();
+ ID_2_NAME.clear();
+ }
}