This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/6.0 by this push:
new e7ce4d7 Add service mesh receiver.
e7ce4d7 is described below
commit e7ce4d757c93847579d6d212a13383f4b70e0d2e
Author: Wu Sheng <[email protected]>
AuthorDate: Tue Jul 24 16:12:24 2018 +0800
Add service mesh receiver.
---
oap-server/server-receiver-plugin/pom.xml | 3 +-
.../mesh-receiver-module}/pom.xml | 7 +--
.../receiver/mesh/module/MeshReceiverModule.java | 33 +++++++++++++
...ywalking.oap.server.library.module.ModuleDefine | 20 ++++++++
.../mesh-receiver-provider}/pom.xml | 14 ++++--
.../mesh/provider/MeshReceiverProvider.java | 55 ++++++++++++++++++++++
...alking.oap.server.library.module.ModuleProvider | 20 ++++++++
.../pom.xml | 9 +++-
.../pom.xml | 2 +-
oap-server/server-starter/pom.xml | 2 +-
.../src/main/resources/application.yml | 2 +
11 files changed, 156 insertions(+), 11 deletions(-)
diff --git a/oap-server/server-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/pom.xml
index 9de85a4..16320ef 100644
--- a/oap-server/server-receiver-plugin/pom.xml
+++ b/oap-server/server-receiver-plugin/pom.xml
@@ -30,8 +30,9 @@
<artifactId>server-receiver-plugin</artifactId>
<packaging>pom</packaging>
<modules>
- <module>skywalking-receiver-plugin</module>
+ <module>skywalking-trace-receiver-plugin</module>
<module>zipkin-receiver-plugin</module>
+ <module>skywalking-mesh-receiver-plugin</module>
</modules>
<dependencies>
diff --git
a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/pom.xml
similarity index 89%
copy from oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
copy to
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/pom.xml
index 61066ca..874e25c 100644
--- a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/pom.xml
@@ -21,12 +21,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>server-receiver-plugin</artifactId>
+ <artifactId>skywalking-mesh-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>skywalking-receiver-plugin</artifactId>
- <packaging>jar</packaging>
+ <artifactId>mesh-receiver-module</artifactId>
+
+
</project>
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/module/MeshReceiverModule.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/module/MeshReceiverModule.java
new file mode 100644
index 0000000..23e50cd
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/module/MeshReceiverModule.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.aop.server.receiver.mesh.module;
+
+import org.apache.skywalking.oap.server.library.module.ModuleDefine;
+
+public class MeshReceiverModule extends ModuleDefine {
+ public static final String NAME = "service-mesh";
+
+ @Override public String name() {
+ return NAME;
+ }
+
+ @Override public Class[] services() {
+ return new Class[0];
+ }
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
new file mode 100644
index 0000000..017617b
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-module/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+
+org.apache.skywalking.aop.server.receiver.mesh.module.MeshReceiverModule
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
similarity index 77%
copy from oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
copy to
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
index 61066ca..185b227 100644
--- a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
@@ -21,12 +21,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>server-receiver-plugin</artifactId>
+ <artifactId>skywalking-mesh-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>skywalking-receiver-plugin</artifactId>
- <packaging>jar</packaging>
+ <artifactId>mesh-receiver-provider</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>mesh-receiver-module</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+
</project>
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
new file mode 100644
index 0000000..d4dcd3c
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.aop.server.receiver.mesh.provider;
+
+import
org.apache.skywalking.aop.server.receiver.mesh.module.MeshReceiverModule;
+import org.apache.skywalking.oap.server.library.module.ModuleConfig;
+import org.apache.skywalking.oap.server.library.module.ModuleDefine;
+import org.apache.skywalking.oap.server.library.module.ModuleProvider;
+import org.apache.skywalking.oap.server.library.module.ModuleStartException;
+import
org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException;
+
+public class MeshReceiverProvider extends ModuleProvider {
+ @Override public String name() {
+ return "default";
+ }
+
+ @Override public Class<? extends ModuleDefine> module() {
+ return MeshReceiverModule.class;
+ }
+
+ @Override public ModuleConfig createConfigBeanIfAbsent() {
+ return null;
+ }
+
+ @Override public void prepare() throws ServiceNotProvidedException,
ModuleStartException {
+
+ }
+
+ @Override public void start() throws ServiceNotProvidedException,
ModuleStartException {
+ }
+
+ @Override public void notifyAfterCompleted() throws
ServiceNotProvidedException, ModuleStartException {
+
+ }
+
+ @Override public String[] requiredModules() {
+ return new String[0];
+ }
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
new file mode 100644
index 0000000..d804905
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+
+org.apache.skywalking.aop.server.receiver.mesh.provider.MeshReceiverProvider
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
similarity index 85%
copy from oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
copy to
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
index 61066ca..c8ec9e3 100644
--- a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
+++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
@@ -27,6 +27,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>skywalking-receiver-plugin</artifactId>
- <packaging>jar</packaging>
+ <artifactId>skywalking-mesh-receiver-plugin</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>mesh-receiver-module</module>
+ <module>mesh-receiver-provider</module>
+ </modules>
+
</project>
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml
similarity index 94%
rename from oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
rename to
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml
index 61066ca..c32295a 100644
--- a/oap-server/server-receiver-plugin/skywalking-receiver-plugin/pom.xml
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml
@@ -27,6 +27,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>skywalking-receiver-plugin</artifactId>
+ <artifactId>skywalking-trace-receiver-plugin</artifactId>
<packaging>jar</packaging>
</project>
\ No newline at end of file
diff --git a/oap-server/server-starter/pom.xml
b/oap-server/server-starter/pom.xml
index d3aacb3..6f4335b 100644
--- a/oap-server/server-starter/pom.xml
+++ b/oap-server/server-starter/pom.xml
@@ -56,7 +56,7 @@
<!-- receiver module -->
<dependency>
<groupId>org.apache.skywalking</groupId>
- <artifactId>skywalking-receiver-plugin</artifactId>
+ <artifactId>mesh-receiver-provider</artifactId>
<version>${project.version}</version>
</dependency>
<!-- receiver module -->
diff --git a/oap-server/server-starter/src/main/resources/application.yml
b/oap-server/server-starter/src/main/resources/application.yml
index 1faf0e2..fac7415 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -30,3 +30,5 @@ core:
gRPCPort: 11800
storage:
elasticsearch:
+service-mesh:
+ default:
