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 2021/10/10 15:32:06 UTC
[skywalking] branch remove-legacy created (now 1a38d46)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch remove-legacy
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 1a38d46 Remove component definitions in Java codes. component-libraries.yml controls the ownership now.
This branch includes the following new commits:
new 1a38d46 Remove component definitions in Java codes. component-libraries.yml controls the ownership now.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Remove component definitions in Java codes.
component-libraries.yml controls the ownership now.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch remove-legacy
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 1a38d4683bf575a3ded22f6d5cdbbb18435571c4
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Oct 10 23:31:04 2021 +0800
Remove component definitions in Java codes. component-libraries.yml controls the ownership now.
---
.../oap/server/receiver/trace/mock}/Component.java | 2 +-
.../receiver/trace/mock}/ComponentsDefine.java | 2 +-
.../receiver/trace/mock}/OfficialComponent.java | 2 +-
.../server/receiver/trace/mock/ServiceAMock.java | 1 -
.../server/receiver/trace/mock/ServiceBMock.java | 1 -
.../server/receiver/trace/mock/ServiceCMock.java | 1 -
.../oap/server/starter/ComponentLibrariesTest.java | 59 ----------------------
7 files changed, 3 insertions(+), 65 deletions(-)
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/Component.java
similarity index 94%
rename from apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
rename to oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/Component.java
index 1a6d2db..732e6f4 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/Component.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.network.trace.component;
+package org.apache.skywalking.oap.server.receiver.trace.mock;
/**
* The <code>Component</code> represents component library, which has been supported by skywalking sniffer.
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ComponentsDefine.java
similarity index 99%
rename from apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
rename to oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ComponentsDefine.java
index 8fb8ddb..2976b43 100755
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ComponentsDefine.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.network.trace.component;
+package org.apache.skywalking.oap.server.receiver.trace.mock;
/**
* The supported list of skywalking java sniffer.
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/OfficialComponent.java
similarity index 94%
rename from apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
rename to oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/OfficialComponent.java
index 57be115..002a1de 100644
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/OfficialComponent.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.network.trace.component;
+package org.apache.skywalking.oap.server.receiver.trace.mock;
public class OfficialComponent implements Component {
private int id;
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
index 41d6b3c..0230720 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceAMock.java
@@ -24,7 +24,6 @@ import org.apache.skywalking.apm.network.language.agent.v3.SegmentObject;
import org.apache.skywalking.apm.network.language.agent.v3.SpanLayer;
import org.apache.skywalking.apm.network.language.agent.v3.SpanObject;
import org.apache.skywalking.apm.network.language.agent.v3.SpanType;
-import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
class ServiceAMock {
public static String SERVICE_NAME = "mock_a_service";
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
index 78c160c..8840069 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceBMock.java
@@ -26,7 +26,6 @@ import org.apache.skywalking.apm.network.language.agent.v3.SegmentReference;
import org.apache.skywalking.apm.network.language.agent.v3.SpanLayer;
import org.apache.skywalking.apm.network.language.agent.v3.SpanObject;
import org.apache.skywalking.apm.network.language.agent.v3.SpanType;
-import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
class ServiceBMock {
public static String SERVICE_NAME = "mock_b_service";
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
index 7d7a1a9..7bb7ac9 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ServiceCMock.java
@@ -25,7 +25,6 @@ import org.apache.skywalking.apm.network.language.agent.v3.SegmentReference;
import org.apache.skywalking.apm.network.language.agent.v3.SpanLayer;
import org.apache.skywalking.apm.network.language.agent.v3.SpanObject;
import org.apache.skywalking.apm.network.language.agent.v3.SpanType;
-import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
class ServiceCMock {
public static String SERVICE_NAME = "mock_c_service";
diff --git a/oap-server/server-starter/src/test/java/org/apache/skywalking/oap/server/starter/ComponentLibrariesTest.java b/oap-server/server-starter/src/test/java/org/apache/skywalking/oap/server/starter/ComponentLibrariesTest.java
deleted file mode 100644
index a119947..0000000
--- a/oap-server/server-starter/src/test/java/org/apache/skywalking/oap/server/starter/ComponentLibrariesTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.oap.server.starter;
-
-import java.io.Reader;
-import java.lang.reflect.Field;
-import java.util.Map;
-import org.apache.commons.collections4.map.CaseInsensitiveMap;
-import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
-import org.apache.skywalking.apm.network.trace.component.OfficialComponent;
-import org.apache.skywalking.oap.server.library.util.ResourceUtils;
-import org.junit.Test;
-import org.yaml.snakeyaml.Yaml;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * Guarantee that the components defined in {@link ComponentsDefine} are in sync with those in file {@code
- * component-libraries.yml}, note that this test only verifies Java components.
- */
-@SuppressWarnings("rawtypes")
-public class ComponentLibrariesTest {
- @Test
- public void testComponentsAreInSync() throws Exception {
- final Reader reader = ResourceUtils.read("component-libraries.yml");
- final Map map = new Yaml().loadAs(reader, Map.class);
- final CaseInsensitiveMap<String, Object> caseInsensitiveMap = new CaseInsensitiveMap<>(map);
- for (final Field field : ComponentsDefine.class.getFields()) {
- final OfficialComponent component = (OfficialComponent) field.get(null);
- final String normalizedComponentName = component.getName().replaceAll("\\.", "");
- if (!caseInsensitiveMap.containsKey(normalizedComponentName)) {
- fail("Component " + component.getName() + " is not registered in component-libraries.yml");
- }
- final Map componentInMap = (Map) caseInsensitiveMap.get(normalizedComponentName);
- final int id = (Integer) componentInMap.get("id");
- assertEquals(
- "Component id defined in class ComponentsDefine should be the same as that in component-libraries.yml",
- id, component.getId()
- );
- }
- }
-}