diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index 33b26ad1e..ad485f949 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -1,7 +1,3 @@ -cluster: - zookeeper: - hostPort: localhost:2181 - sessionTimeout: 100000 naming: jetty: host: localhost diff --git a/apm-collector/apm-collector-component/pom.xml b/apm-collector/apm-collector-component/pom.xml index d4ab86353..2bf606fb3 100644 --- a/apm-collector/apm-collector-component/pom.xml +++ b/apm-collector/apm-collector-component/pom.xml @@ -14,7 +14,6 @@ client-component server-component - stream-component queue-component diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java deleted file mode 100644 index ef45c8552..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue; - -import java.util.concurrent.ThreadFactory; - -/** - * @author peng-yongsheng - */ -public enum DaemonThreadFactory implements ThreadFactory { - INSTANCE; - - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setDaemon(true); - return t; - } -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/EndOfBatchCommand.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/EndOfBatchCommand.java deleted file mode 100644 index bfa3a6fb7..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/EndOfBatchCommand.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue; - -/** - * @author peng-yongsheng - */ -public class EndOfBatchCommand { -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java deleted file mode 100644 index d0c0333a5..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue; - -/** - * @author peng-yongsheng - */ -public class MessageHolder { - private Object message; - - public Object getMessage() { - return message; - } - - public void setMessage(Object message) { - this.message = message; - } - - public void reset() { - message = null; - } -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueCreator.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueCreator.java deleted file mode 100644 index 6c78d2cb7..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueCreator.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue; - -/** - * @author peng-yongsheng - */ -public interface QueueCreator { - QueueEventHandler create(int queueSize, QueueExecutor executor); -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueEventHandler.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueEventHandler.java deleted file mode 100644 index 194bb15e6..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueEventHandler.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue; - -/** - * @author peng-yongsheng - */ -public interface QueueEventHandler { - void tell(Object message); -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java deleted file mode 100644 index 729b3054d..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue.disruptor; - -import com.lmax.disruptor.EventHandler; -import com.lmax.disruptor.RingBuffer; -import org.skywalking.apm.collector.queue.EndOfBatchCommand; -import org.skywalking.apm.collector.queue.MessageHolder; -import org.skywalking.apm.collector.queue.QueueEventHandler; -import org.skywalking.apm.collector.queue.QueueExecutor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author peng-yongsheng - */ -public class DisruptorEventHandler implements EventHandler, QueueEventHandler { - - private final Logger logger = LoggerFactory.getLogger(DisruptorEventHandler.class); - - private RingBuffer ringBuffer; - private QueueExecutor executor; - - DisruptorEventHandler(RingBuffer ringBuffer, QueueExecutor executor) { - this.ringBuffer = ringBuffer; - this.executor = executor; - } - - /** - * Receive the message from disruptor, when message in disruptor is empty, then send the cached data - * to the next workers. - * - * @param event published to the {@link RingBuffer} - * @param sequence of the event being processed - * @param endOfBatch flag to indicate if this is the last event in a batch from the {@link RingBuffer} - */ - public void onEvent(MessageHolder event, long sequence, boolean endOfBatch) { - Object message = event.getMessage(); - event.reset(); - - executor.execute(message); - if (endOfBatch) { - executor.execute(new EndOfBatchCommand()); - } - } - - /** - * Push the message into disruptor ring buffer. - * - * @param message of the data to process. - */ - public void tell(Object message) { - long sequence = ringBuffer.next(); - try { - ringBuffer.get(sequence).setMessage(message); - } finally { - ringBuffer.publish(sequence); - } - } -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java deleted file mode 100644 index eb3394de3..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue.disruptor; - -import com.lmax.disruptor.RingBuffer; -import com.lmax.disruptor.dsl.Disruptor; -import org.skywalking.apm.collector.queue.DaemonThreadFactory; -import org.skywalking.apm.collector.queue.MessageHolder; -import org.skywalking.apm.collector.queue.QueueCreator; -import org.skywalking.apm.collector.queue.QueueEventHandler; -import org.skywalking.apm.collector.queue.QueueExecutor; - -/** - * @author peng-yongsheng - */ -public class DisruptorQueueCreator implements QueueCreator { - - @Override public QueueEventHandler create(int queueSize, QueueExecutor executor) { - // Specify the size of the ring buffer, must be power of 2. - if (!((((queueSize - 1) & queueSize) == 0) && queueSize != 0)) { - throw new IllegalArgumentException("queue size must be power of 2"); - } - - // Construct the Disruptor - Disruptor disruptor = new Disruptor(MessageHolderFactory.INSTANCE, queueSize, DaemonThreadFactory.INSTANCE); - - RingBuffer ringBuffer = disruptor.getRingBuffer(); - DisruptorEventHandler eventHandler = new DisruptorEventHandler(ringBuffer, executor); - - // Connect the handler - disruptor.handleEventsWith(eventHandler); - - // Start the Disruptor, starts all threads running - disruptor.start(); - return eventHandler; - } -} diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java b/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java deleted file mode 100644 index 04ac2959e..000000000 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.queue.disruptor; - -import com.lmax.disruptor.EventFactory; -import org.skywalking.apm.collector.queue.MessageHolder; - -/** - * @author peng-yongsheng - */ -public class MessageHolderFactory implements EventFactory { - - public static MessageHolderFactory INSTANCE = new MessageHolderFactory(); - - public MessageHolder newInstance() { - return new MessageHolder(); - } -} diff --git a/apm-collector/apm-collector-component/stream-component/pom.xml b/apm-collector/apm-collector-component/stream-component/pom.xml deleted file mode 100644 index bb71c7470..000000000 --- a/apm-collector/apm-collector-component/stream-component/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - apm-collector-component - org.skywalking - 3.2.3-2017 - - 4.0.0 - - stream-component - jar - - \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java similarity index 95% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java index ad0105352..d1accabf8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java index 0384583a5..2549c2059 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java index e8efd260a..cedde598f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java index db87cbc22..92046a30e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/DataDefine.java similarity index 97% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/DataDefine.java index 5e598a8af..bbfcdd7bc 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/DataDefine.java @@ -16,9 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; - -import org.skywalking.apm.collector.core.data.Data; +package org.skywalking.apm.collector.core.data; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java index 1ff63c756..f5c130438 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java similarity index 96% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java index af392396e..d0ca17f7f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; import java.util.LinkedList; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java index d5994a8be..304deb10b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; import org.skywalking.apm.collector.core.define.DefinitionFile; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java similarity index 95% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java index 89d19c92b..662d59251 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define; +package org.skywalking.apm.collector.core.data; import java.util.LinkedList; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java similarity index 92% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java index 584e71c2b..eaa5c7ecd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define.operator; +package org.skywalking.apm.collector.core.data.operator; -import org.skywalking.apm.collector.storage.base.define.Operation; +import org.skywalking.apm.collector.core.data.Operation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java similarity index 91% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java index 531555eae..6f3675819 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define.operator; +package org.skywalking.apm.collector.core.data.operator; -import org.skywalking.apm.collector.storage.base.define.Operation; +import org.skywalking.apm.collector.core.data.Operation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java similarity index 91% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java index eeb5ff7a9..97a261bae 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.base.define.operator; +package org.skywalking.apm.collector.core.data.operator; -import org.skywalking.apm.collector.storage.base.define.Operation; +import org.skywalking.apm.collector.core.data.Operation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml b/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml new file mode 100644 index 000000000..6436a96c4 --- /dev/null +++ b/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-queue + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-queue-datacarrier-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-queue/collector-queue-define/pom.xml b/apm-collector/apm-collector-queue/collector-queue-define/pom.xml new file mode 100644 index 000000000..8b6eb29a9 --- /dev/null +++ b/apm-collector/apm-collector-queue/collector-queue-define/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-queue + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-queue-define + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml new file mode 100644 index 000000000..dd2224077 --- /dev/null +++ b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-queue + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-queue-disruptor-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-queue/pom.xml b/apm-collector/apm-collector-queue/pom.xml new file mode 100644 index 000000000..5735adc52 --- /dev/null +++ b/apm-collector/apm-collector-queue/pom.xml @@ -0,0 +1,39 @@ + + + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-queue + pom + + collector-queue-define + collector-queue-datacarrier-provider + collector-queue-disruptor-provider + + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml new file mode 100644 index 000000000..a06f69fe3 --- /dev/null +++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-remote + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-remote-grpc-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml new file mode 100644 index 000000000..cc37ffa82 --- /dev/null +++ b/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-remote + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-remote-kafka-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-remote/pom.xml b/apm-collector/apm-collector-remote/pom.xml index 42c1efade..fef5aa482 100644 --- a/apm-collector/apm-collector-remote/pom.xml +++ b/apm-collector/apm-collector-remote/pom.xml @@ -14,6 +14,8 @@ collector-remote-define collector-remote-grpc-define + collector-remote-kafka-provider + collector-remote-grpc-provider diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java index 676a3ec53..3ae9f63af 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java @@ -21,8 +21,8 @@ package org.skywalking.apm.collector.storage; import java.util.List; import org.skywalking.apm.collector.client.Client; import org.skywalking.apm.collector.core.define.DefineException; -import org.skywalking.apm.collector.storage.base.define.StorageDefineLoader; -import org.skywalking.apm.collector.storage.base.define.TableDefine; +import org.skywalking.apm.collector.core.data.StorageDefineLoader; +import org.skywalking.apm.collector.core.data.TableDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java index 02b21b23d..2dd7401dd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.storage.base.dao; import org.skywalking.apm.collector.core.data.Data; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java deleted file mode 100644 index 95245d16a..000000000 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2017, OpenSkywalking Organization All rights reserved. - * - * Licensed 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. - * - * Project repository: https://github.com/OpenSkywalking/skywalking - */ - -package org.skywalking.apm.collector.storage.base.define; - -import org.skywalking.apm.collector.core.data.Data; - -/** - * @author peng-yongsheng - */ -public interface Transform { - Data toData(); - - T toSelf(Data data); -} diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java index d53c379e2..be5dcb8d0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.global; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java index 4836a783d..75c6aaff2 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.global; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java index e723d61d0..eca3fa454 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java @@ -18,12 +18,12 @@ package org.skywalking.apm.collector.storage.table.instance; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.AddOperation; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java index ae309ff46..b306a1505 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.instance; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java index 7b9608bb8..8cdea74ca 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java @@ -18,12 +18,12 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.AddOperation; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java index 9a7fcfd62..bb0a6c072 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java index be928554e..1a284ee52 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java index 9cf646b23..6f4c8ea0c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java index bd8f68034..5c31dd132 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java index e2b04d641..cd3e4ed27 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java index 5ef95a348..e5aa9b8cf 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java index c84558667..7409aa71e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java index 46f222c80..faa3682ac 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java index 0c40af9a0..9a1181b58 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java index f301ec019..4046112a6 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java index f4a65a247..a2db99ea1 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java index 8ff7a34e1..71d30fb3b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.noderef; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.AddOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java index f640c96d6..c4fab4541 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.noderef; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java index b2e01e508..d0dec2c9b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java @@ -19,11 +19,11 @@ package org.skywalking.apm.collector.storage.table.register; import org.skywalking.apm.collector.core.data.Data; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java index 8f8d974bb..5de17c701 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java index 835c4366d..15d0da209 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java @@ -19,11 +19,11 @@ package org.skywalking.apm.collector.storage.table.register; import org.skywalking.apm.collector.core.data.Data; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java index bd0a88348..0c62871f3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java index b38139adb..6b56ca657 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java @@ -19,11 +19,11 @@ package org.skywalking.apm.collector.storage.table.register; import org.skywalking.apm.collector.core.data.Data; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java index b6df01621..ec32d1a2e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java index 4f06c06f8..fffb6b85d 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java index 39c9481e9..8ecabffc8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java index 986afef1e..fb040b4fd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java index cec261310..bdbc667d4 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java index 12bb8f6bf..84b023b80 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.service; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.CoverOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java index 9100ad4bc..cc03520d0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.service; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java index c60d35703..b38129f2f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.serviceref; -import org.skywalking.apm.collector.storage.base.define.Attribute; -import org.skywalking.apm.collector.storage.base.define.AttributeType; -import org.skywalking.apm.collector.storage.base.define.DataDefine; -import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; +import org.skywalking.apm.collector.core.data.Attribute; +import org.skywalking.apm.collector.core.data.AttributeType; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.core.data.operator.AddOperation; +import org.skywalking.apm.collector.core.data.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java index f0b5f8b90..8e99f9e99 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.serviceref; -import org.skywalking.apm.collector.storage.base.define.CommonTable; +import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java index 5d3cd63fd..4173fc5c4 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.es.base.define; -import org.skywalking.apm.collector.storage.base.define.ColumnDefine; +import org.skywalking.apm.collector.core.data.ColumnDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java index 81dc3eee3..13563b9bd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java @@ -27,8 +27,8 @@ import org.elasticsearch.index.IndexNotFoundException; import org.skywalking.apm.collector.client.Client; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.storage.StorageInstaller; -import org.skywalking.apm.collector.storage.base.define.ColumnDefine; -import org.skywalking.apm.collector.storage.base.define.TableDefine; +import org.skywalking.apm.collector.core.data.ColumnDefine; +import org.skywalking.apm.collector.core.data.TableDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java index d875319a9..45696db45 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.es.base.define; -import org.skywalking.apm.collector.storage.base.define.TableDefine; +import org.skywalking.apm.collector.core.data.TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsDAO.java index d71574f0d..f9f863257 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsDAO.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.ICpuMetricDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.jvm.CpuMetricTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GCMetricEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GCMetricEsDAO.java index de15de52b..78f28b745 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GCMetricEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GCMetricEsDAO.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IGCMetricDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.jvm.GCMetricTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GlobalTraceEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GlobalTraceEsDAO.java index 56937f384..db16d39b0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GlobalTraceEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GlobalTraceEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.UnexpectedException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IGlobalTraceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.global.GlobalTraceTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstPerformanceEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstPerformanceEsDAO.java index d00be4129..aabfcafc1 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstPerformanceEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstPerformanceEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IInstPerformanceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.instance.InstPerformanceTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsDAO.java index a955ff9e3..79e0e86d8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsDAO.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.UnexpectedException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.register.InstanceTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryMetricEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryMetricEsDAO.java index d67de6e88..dc9662648 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryMetricEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryMetricEsDAO.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IMemoryMetricDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.jvm.MemoryMetricTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryPoolMetricEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryPoolMetricEsDAO.java index da10141c2..3e217d16b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryPoolMetricEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryPoolMetricEsDAO.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetricTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsDAO.java index 050d4bba8..d54dd7dfb 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.INodeComponentDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.node.NodeComponentTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsDAO.java index 8fdd82ba4..aa9c29311 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.INodeReferenceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentCostEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentCostEsDAO.java index 7db9d80f4..f3487112c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentCostEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentCostEsDAO.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.ISegmentCostDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.segment.SegmentCostTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsDAO.java index 615597167..8f049141b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.ISegmentDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.segment.SegmentTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceEntryEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceEntryEsDAO.java index 9b412efe9..5c8caf973 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceEntryEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceEntryEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IServiceEntryDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.service.ServiceEntryTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsDAO.java index 964e7cf3a..d281662b6 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IServiceReferenceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java index cb93aca66..73d1fece7 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.h2.base.define; -import org.skywalking.apm.collector.storage.base.define.ColumnDefine; +import org.skywalking.apm.collector.core.data.ColumnDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java index dc8f78a44..03d181c17 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.storage.StorageException; import org.skywalking.apm.collector.storage.StorageInstallException; import org.skywalking.apm.collector.storage.StorageInstaller; -import org.skywalking.apm.collector.storage.base.define.TableDefine; +import org.skywalking.apm.collector.core.data.TableDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java index 6f97cb0c0..2b7c60f80 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.h2.base.define; -import org.skywalking.apm.collector.storage.base.define.TableDefine; +import org.skywalking.apm.collector.core.data.TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/CpuMetricH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/CpuMetricH2DAO.java index a5dac8e7e..e6ce0d3b0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/CpuMetricH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/CpuMetricH2DAO.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.ICpuMetricDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GCMetricH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GCMetricH2DAO.java index c4053c4b2..4e56f0fdb 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GCMetricH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GCMetricH2DAO.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IGCMetricDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2DAO.java index 5d313b9d2..0525fd453 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2DAO.java @@ -23,7 +23,7 @@ import java.util.Map; import org.skywalking.apm.collector.core.UnexpectedException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IGlobalTraceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstPerformanceH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstPerformanceH2DAO.java index 1609d3840..c0615cdf3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstPerformanceH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstPerformanceH2DAO.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IInstPerformanceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2DAO.java index 09bded4ce..aff6a70f1 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2DAO.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.UnexpectedException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2DAO.java index 1be3e1e02..e9394c86e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2DAO.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IMemoryMetricDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryPoolMetricH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryPoolMetricH2DAO.java index cd3c72898..52861de8e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryPoolMetricH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryPoolMetricH2DAO.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2DAO.java index ec24989e9..849615a12 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2DAO.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.INodeComponentDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2DAO.java index a852289db..9d1c8c3b0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2DAO.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.INodeReferenceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentCostH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentCostH2DAO.java index ed792dd1c..dd30ba849 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentCostH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentCostH2DAO.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.ISegmentCostDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2DAO.java index 11978e868..962a3eacc 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2DAO.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.ISegmentDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceEntryH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceEntryH2DAO.java index d973821f2..d82d96e57 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceEntryH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceEntryH2DAO.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IServiceEntryDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2DAO.java index 21614ad0e..695099085 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2DAO.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.core.data.DataDefine; import org.skywalking.apm.collector.storage.dao.IServiceReferenceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; diff --git a/apm-collector/apm-collector-component/queue-component/pom.xml b/apm-collector/apm-collector-stream/collector-stream-define/pom.xml similarity index 82% rename from apm-collector/apm-collector-component/queue-component/pom.xml rename to apm-collector/apm-collector-stream/collector-stream-define/pom.xml index ad0399870..c1b501cb6 100644 --- a/apm-collector/apm-collector-component/queue-component/pom.xml +++ b/apm-collector/apm-collector-stream/collector-stream-define/pom.xml @@ -21,20 +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"> - apm-collector-component + apm-collector-stream org.skywalking 3.2.3-2017 4.0.0 - queue-component + collector-stream-define jar - com.lmax - disruptor - 3.3.6 + org.skywalking + queue-component + ${project.version} \ No newline at end of file diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java similarity index 97% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java index 66e363199..288d107eb 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java @@ -18,6 +18,8 @@ package org.skywalking.apm.collector.stream; +import org.skywalking.apm.collector.queue.QueueExecutor; + /** * The AbstractLocalAsyncWorker implementations represent workers, * which receive local asynchronous message. diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java similarity index 76% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java index 995408ffc..484604c78 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java @@ -18,14 +18,9 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.core.framework.CollectorContextHelper; -import org.skywalking.apm.collector.core.queue.QueueCreator; -import org.skywalking.apm.collector.core.queue.QueueEventHandler; -import org.skywalking.apm.collector.core.queue.QueueExecutor; -import org.skywalking.apm.collector.queue.QueueModuleContext; -import org.skywalking.apm.collector.queue.QueueModuleGroupDefine; -import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; -import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorkerContainer; +import org.skywalking.apm.collector.queue.QueueCreator; +import org.skywalking.apm.collector.queue.QueueEventHandler; +import org.skywalking.apm.collector.queue.QueueExecutor; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorker.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorker.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorker.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorker.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorkerProvider.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorkerProvider.java similarity index 97% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorkerProvider.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorkerProvider.java index 90e139a07..921759885 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorkerProvider.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractRemoteWorkerProvider.java @@ -18,8 +18,6 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.client.grpc.GRPCClient; - /** * The AbstractRemoteWorkerProvider implementations represent providers, * which create instance of cluster workers whose implemented {@link AbstractRemoteWorker}. diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractWorker.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractWorker.java similarity index 83% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractWorker.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractWorker.java index f60db60c6..647fbae7f 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractWorker.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractWorker.java @@ -18,14 +18,13 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.core.framework.Executor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ -public abstract class AbstractWorker implements Executor { +public abstract class AbstractWorker { private final Logger logger = LoggerFactory.getLogger(AbstractWorker.class); @@ -38,14 +37,6 @@ public abstract class AbstractWorker implements Executor { this.clusterContext = clusterContext; } - @Override public final void execute(Object message) { - try { - onWork(message); - } catch (WorkerException e) { - logger.error(e.getMessage(), e); - } - } - /** * The data process logic in this method. * diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractWorkerProvider.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractWorkerProvider.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractWorkerProvider.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractWorkerProvider.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerContext.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerContext.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerContext.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerContext.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerRefCounter.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerRefCounter.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerRefCounter.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/ClusterWorkerRefCounter.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Context.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Context.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Context.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Context.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerProviderDefineLoader.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerProviderDefineLoader.java similarity index 90% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerProviderDefineLoader.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerProviderDefineLoader.java index 19dc7e617..c7aff2fb8 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerProviderDefineLoader.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerProviderDefineLoader.java @@ -20,9 +20,9 @@ package org.skywalking.apm.collector.stream; import java.util.ArrayList; import java.util.List; -import org.skywalking.apm.collector.core.framework.DefineException; -import org.skywalking.apm.collector.core.framework.Loader; -import org.skywalking.apm.collector.core.util.DefinitionLoader; +import org.skywalking.apm.collector.core.define.DefineException; +import org.skywalking.apm.collector.core.define.DefinitionLoader; +import org.skywalking.apm.collector.core.define.Loader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerRef.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerRef.java similarity index 94% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerRef.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerRef.java index 79834cc6a..9b72d55b4 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerRef.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalAsyncWorkerRef.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.core.queue.QueueEventHandler; +import org.skywalking.apm.collector.queue.QueueEventHandler; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalWorkerProviderDefinitionFile.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalWorkerProviderDefinitionFile.java similarity index 93% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalWorkerProviderDefinitionFile.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalWorkerProviderDefinitionFile.java index 346223af8..1ff3c3d72 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LocalWorkerProviderDefinitionFile.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LocalWorkerProviderDefinitionFile.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.core.framework.DefinitionFile; +import org.skywalking.apm.collector.core.define.DefinitionFile; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LookUp.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LookUp.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/LookUp.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/LookUp.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Provider.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Provider.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Provider.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Provider.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/ProviderNotFoundException.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/ProviderNotFoundException.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/ProviderNotFoundException.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/ProviderNotFoundException.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefineLoader.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefineLoader.java similarity index 90% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefineLoader.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefineLoader.java index 0e3d57441..a37a70acd 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefineLoader.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefineLoader.java @@ -20,9 +20,9 @@ package org.skywalking.apm.collector.stream; import java.util.ArrayList; import java.util.List; -import org.skywalking.apm.collector.core.framework.DefineException; -import org.skywalking.apm.collector.core.framework.Loader; -import org.skywalking.apm.collector.core.util.DefinitionLoader; +import org.skywalking.apm.collector.core.define.DefineException; +import org.skywalking.apm.collector.core.define.DefinitionLoader; +import org.skywalking.apm.collector.core.define.Loader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefinitionFile.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefinitionFile.java similarity index 93% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefinitionFile.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefinitionFile.java index 184da0923..3c70e3a0e 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefinitionFile.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerProviderDefinitionFile.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.core.framework.DefinitionFile; +import org.skywalking.apm.collector.core.define.DefinitionFile; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerRef.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerRef.java similarity index 66% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerRef.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerRef.java index cd80db730..bbeaacf80 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerRef.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/RemoteWorkerRef.java @@ -21,7 +21,6 @@ package org.skywalking.apm.collector.stream; import io.grpc.stub.StreamObserver; import org.skywalking.apm.collector.client.grpc.GRPCClient; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.remote.grpc.proto.Empty; import org.skywalking.apm.collector.remote.grpc.proto.RemoteCommonServiceGrpc; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; import org.skywalking.apm.collector.remote.grpc.proto.RemoteMessage; @@ -80,65 +79,6 @@ public class RemoteWorkerRef extends WorkerRef { return acrossJVM; } - private void createStreamObserver() { - StreamStatus status = new StreamStatus(false); - streamObserver = stub.call(new StreamObserver() { - @Override public void onNext(Empty empty) { - } - - @Override public void onError(Throwable throwable) { - logger.error(throwable.getMessage(), throwable); - } - - @Override public void onCompleted() { - status.finished(); - } - }); - } - - class StreamStatus { - private volatile boolean status; - - public StreamStatus(boolean status) { - this.status = status; - } - - public boolean isFinish() { - return status; - } - - public void finished() { - this.status = true; - } - - /** - * @param maxTimeout max wait time, milliseconds. - */ - public void wait4Finish(long maxTimeout) { - long time = 0; - while (!status) { - if (time > maxTimeout) { - break; - } - try2Sleep(5); - time += 5; - } - } - - /** - * Try to sleep, and ignore the {@link InterruptedException} - * - * @param millis the length of time to sleep in milliseconds - */ - private void try2Sleep(long millis) { - try { - Thread.sleep(millis); - } catch (InterruptedException e) { - - } - } - } - @Override public String toString() { StringBuilder toString = new StringBuilder(); toString.append("acrossJVM: ").append(acrossJVM); diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Role.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Role.java similarity index 86% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Role.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Role.java index c23a15f52..9cf22125c 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/Role.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/Role.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.stream; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; +import org.skywalking.apm.collector.core.data.DataDefine; +import org.skywalking.apm.collector.stream.selector.WorkerSelector; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/UsedRoleNameException.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/UsedRoleNameException.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/UsedRoleNameException.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/UsedRoleNameException.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerContext.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerContext.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerContext.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerContext.java diff --git a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueExecutor.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerCreateListener.java similarity index 86% rename from apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueExecutor.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerCreateListener.java index 40db61fdd..7b3c08eba 100644 --- a/apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueExecutor.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerCreateListener.java @@ -16,11 +16,11 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.queue; +package org.skywalking.apm.collector.stream; /** * @author peng-yongsheng */ -public interface QueueExecutor { - void execute(Object message); +public interface WorkerCreateListener { + void onCreate(W workerx); } diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerException.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerException.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerException.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerException.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerInvokeException.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerInvokeException.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerInvokeException.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerInvokeException.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerNotFoundException.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerNotFoundException.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerNotFoundException.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerNotFoundException.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerRef.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerRef.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerRef.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerRef.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerRefs.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerRefs.java similarity index 96% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerRefs.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerRefs.java index 4a33a2625..ac8ad8480 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/WorkerRefs.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/WorkerRefs.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream; import java.util.List; -import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; +import org.skywalking.apm.collector.stream.selector.WorkerSelector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/ForeverFirstSelector.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/ForeverFirstSelector.java similarity index 100% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/ForeverFirstSelector.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/ForeverFirstSelector.java diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/HashCodeSelector.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/HashCodeSelector.java similarity index 91% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/HashCodeSelector.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/HashCodeSelector.java index c32101a45..38d1bb1fe 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/HashCodeSelector.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/HashCodeSelector.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.stream.selector; import java.util.List; -import org.skywalking.apm.collector.core.stream.AbstractHashMessage; -import org.skywalking.apm.collector.stream.worker.AbstractWorker; -import org.skywalking.apm.collector.stream.worker.WorkerRef; +import org.skywalking.apm.collector.core.data.AbstractHashMessage; +import org.skywalking.apm.collector.stream.WorkerRef; +import org.skywalking.apm.collector.stream.AbstractWorker; /** * The HashCodeSelector is a simple implementation of {@link WorkerSelector}. It choose {@link WorkerRef} diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/RollingSelector.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/RollingSelector.java similarity index 92% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/RollingSelector.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/RollingSelector.java index 85cdee3ca..1a238ece8 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/RollingSelector.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/RollingSelector.java @@ -19,8 +19,8 @@ package org.skywalking.apm.collector.stream.selector; import java.util.List; -import org.skywalking.apm.collector.stream.worker.AbstractWorker; -import org.skywalking.apm.collector.stream.worker.WorkerRef; +import org.skywalking.apm.collector.stream.WorkerRef; +import org.skywalking.apm.collector.stream.AbstractWorker; /** * The RollingSelector is a simple implementation of {@link WorkerSelector}. diff --git a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/WorkerSelector.java b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/WorkerSelector.java similarity index 92% rename from apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/WorkerSelector.java rename to apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/WorkerSelector.java index a9b3463ae..0d25ed8db 100644 --- a/apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/selector/WorkerSelector.java +++ b/apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/selector/WorkerSelector.java @@ -19,8 +19,8 @@ package org.skywalking.apm.collector.stream.selector; import java.util.List; -import org.skywalking.apm.collector.stream.worker.AbstractWorker; -import org.skywalking.apm.collector.stream.worker.WorkerRef; +import org.skywalking.apm.collector.stream.WorkerRef; +import org.skywalking.apm.collector.stream.AbstractWorker; /** * The WorkerSelector should be implemented by any class whose instances diff --git a/apm-collector/apm-collector-stream/collector-stream-provider/pom.xml b/apm-collector/apm-collector-stream/collector-stream-provider/pom.xml new file mode 100644 index 000000000..199971bf2 --- /dev/null +++ b/apm-collector/apm-collector-stream/collector-stream-provider/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector-stream + org.skywalking + 3.2.3-2017 + + 4.0.0 + + collector-stream-provider + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-stream/pom.xml b/apm-collector/apm-collector-stream/pom.xml new file mode 100644 index 000000000..e2debf0f5 --- /dev/null +++ b/apm-collector/apm-collector-stream/pom.xml @@ -0,0 +1,44 @@ + + + + + + apm-collector + org.skywalking + 3.2.3-2017 + + 4.0.0 + + apm-collector-stream + pom + + collector-stream-define + collector-stream-provider + + + + + org.skywalking + apm-collector-core + ${project.version} + + + \ No newline at end of file diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index af360c633..57515cf6c 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -43,6 +43,8 @@ apm-collector-grpc-manager apm-collector-jetty-manager apm-collector-remote + apm-collector-stream + apm-collector-queue