From 6a449f49ce63821b34e41c4826efbe6179ee68e9 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Sun, 17 Dec 2017 16:35:41 +0800 Subject: [PATCH] Delete collector queue module. --- .../analysis-worker-model/pom.xml | 5 ++ .../AbstractLocalAsyncWorkerProvider.java | 13 +--- .../model/base/LocalAsyncWorkerRef.java | 34 ++++++--- .../model/base/UsedRoleNameException.java | 25 ------ .../model/base/WorkerInvokeException.java | 36 --------- .../model/base/WorkerNotFoundException.java | 25 ------ .../worker/model/impl}/MessageHolder.java | 2 +- .../pom.xml | 40 ---------- .../QueueModuleDataCarrierProvider.java | 58 -------------- .../DataCarrierQueueCreatorService.java | 34 --------- ...g.apm.collector.core.module.ModuleProvider | 20 ----- .../collector-queue-define/pom.xml | 33 -------- .../apm/collector/queue/QueueModule.java | 39 ---------- .../queue/base/DaemonThreadFactory.java | 36 --------- .../collector/queue/base/QueueCreator.java | 27 ------- .../queue/base/QueueEventHandler.java | 27 ------- .../collector/queue/base/QueueExecutor.java | 28 ------- .../queue/service/QueueCreatorService.java | 31 -------- ...kywalking.apm.collector.core.module.Module | 20 ----- .../pom.xml | 45 ----------- .../QueueModuleDisruptorProvider.java | 58 -------------- .../disruptor/base/DisruptorEventHandler.java | 76 ------------------- .../disruptor/base/DisruptorQueueCreator.java | 72 ------------------ .../disruptor/base/MessageHolderFactory.java | 35 --------- .../service/DisruptorQueueCreatorService.java | 41 ---------- ...g.apm.collector.core.module.ModuleProvider | 20 ----- apm-collector/apm-collector-queue/pom.xml | 45 ----------- apm-collector/pom.xml | 1 - 28 files changed, 34 insertions(+), 892 deletions(-) delete mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java delete mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java delete mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java rename apm-collector/{apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl}/MessageHolder.java (94%) delete mode 100644 apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml delete mode 100644 apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/QueueModuleDataCarrierProvider.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/service/DataCarrierQueueCreatorService.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/pom.xml delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/QueueModule.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/DaemonThreadFactory.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueCreator.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueEventHandler.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueExecutor.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/service/QueueCreatorService.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/QueueModuleDisruptorProvider.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorQueueCreator.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/MessageHolderFactory.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/service/DisruptorQueueCreatorService.java delete mode 100644 apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider delete mode 100644 apm-collector/apm-collector-queue/pom.xml diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml index 29013db29..8a32c350c 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml @@ -36,5 +36,10 @@ collector-storage-define ${project.version} + + org.apache.skywalking + apm-datacarrier + 5.0.0-alpha + \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java index b67b31192..102bed5db 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java @@ -19,8 +19,7 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.base; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; +import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; /** * @author peng-yongsheng @@ -29,12 +28,8 @@ public abstract class AbstractLocalAsyncWorkerProvider queueCreatorService; - - public AbstractLocalAsyncWorkerProvider(ModuleManager moduleManager, - QueueCreatorService queueCreatorService) { + public AbstractLocalAsyncWorkerProvider(ModuleManager moduleManager) { super(moduleManager); - this.queueCreatorService = queueCreatorService; } @Override @@ -43,8 +38,8 @@ public abstract class AbstractLocalAsyncWorkerProvider localAsyncWorkerRef = new LocalAsyncWorkerRef<>(localAsyncWorker); - QueueEventHandler queueEventHandler = queueCreatorService.create(queueSize(), localAsyncWorkerRef); - localAsyncWorkerRef.setQueueEventHandler(queueEventHandler); + DataCarrier dataCarrier = new DataCarrier<>(1, queueSize()); + localAsyncWorkerRef.setQueueEventHandler(dataCarrier); return localAsyncWorkerRef; } } diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java index 11cdecea5..36f3d39cc 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java @@ -18,32 +18,46 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.base; -import org.apache.skywalking.apm.collector.core.CollectorException; +import java.util.List; import org.apache.skywalking.apm.collector.core.graph.NodeProcessor; -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -import org.apache.skywalking.apm.collector.queue.base.QueueExecutor; +import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ -public class LocalAsyncWorkerRef extends WorkerRef implements QueueExecutor { +public class LocalAsyncWorkerRef extends WorkerRef implements IConsumer { - private QueueEventHandler queueEventHandler; + private final Logger logger = LoggerFactory.getLogger(LocalAsyncWorkerRef.class); + + private DataCarrier dataCarrier; LocalAsyncWorkerRef(NodeProcessor destinationHandler) { super(destinationHandler); } - public void setQueueEventHandler(QueueEventHandler queueEventHandler) { - this.queueEventHandler = queueEventHandler; + public void setQueueEventHandler(DataCarrier dataCarrier) { + this.dataCarrier = dataCarrier; } - @Override public void execute(INPUT input) throws CollectorException { - out(input); + @Override public void consume(List data) { + data.forEach(this::out); + } + + @Override public void init() { + } + + @Override public void onError(List data, Throwable t) { + logger.error(t.getMessage(), t); + } + + @Override public void onExit() { } @Override protected void in(INPUT input) { - queueEventHandler.tell(input); + dataCarrier.produce(input); } @Override protected void out(INPUT input) { diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java deleted file mode 100644 index e27653c8e..000000000 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.collector.analysis.worker.model.base; - -public class UsedRoleNameException extends Exception { - public UsedRoleNameException(String message) { - super(message); - } -} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java deleted file mode 100644 index 3e7c85a7c..000000000 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.collector.analysis.worker.model.base; - -/** - * This exception is raised when worker fails to process job during "call" or "ask" - * - * @author peng-yongsheng - * @since v3.1-2017 - */ -public class WorkerInvokeException extends WorkerException { - - public WorkerInvokeException(String message) { - super(message); - } - - public WorkerInvokeException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java deleted file mode 100644 index 8efd2095c..000000000 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.collector.analysis.worker.model.base; - -public class WorkerNotFoundException extends WorkerException { - public WorkerNotFoundException(String message) { - super(message); - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/MessageHolder.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MessageHolder.java similarity index 94% rename from apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/MessageHolder.java rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MessageHolder.java index 0da7ed9e8..b990b8d72 100644 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/MessageHolder.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MessageHolder.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.queue.base; +package org.apache.skywalking.apm.collector.analysis.worker.model.impl; import org.apache.skywalking.apm.collector.core.data.EndOfBatchQueueMessage; 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 deleted file mode 100644 index a306b6006..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - apm-collector-queue - org.apache.skywalking - 5.0.0-alpha - - 4.0.0 - - collector-queue-datacarrier-provider - jar - - - - org.apache.skywalking - collector-queue-define - ${project.version} - - - diff --git a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/QueueModuleDataCarrierProvider.java b/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/QueueModuleDataCarrierProvider.java deleted file mode 100644 index 6b9590498..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/QueueModuleDataCarrierProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.datacarrier; - -import java.util.Properties; -import org.apache.skywalking.apm.collector.core.module.ModuleProvider; -import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException; -import org.apache.skywalking.apm.collector.queue.QueueModule; -import org.apache.skywalking.apm.collector.core.module.Module; -import org.apache.skywalking.apm.collector.queue.datacarrier.service.DataCarrierQueueCreatorService; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; - -/** - * @author peng-yongsheng - */ -public class QueueModuleDataCarrierProvider extends ModuleProvider { - - @Override public String name() { - return "datacarrier"; - } - - @Override public Class module() { - return QueueModule.class; - } - - @Override public void prepare(Properties config) throws ServiceNotProvidedException { - this.registerServiceImplementation(QueueCreatorService.class, new DataCarrierQueueCreatorService()); - } - - @Override public void start(Properties config) throws ServiceNotProvidedException { - - } - - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { - - } - - @Override public String[] requiredModules() { - return new String[0]; - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/service/DataCarrierQueueCreatorService.java b/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/service/DataCarrierQueueCreatorService.java deleted file mode 100644 index 0d677c4e8..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/java/org/apache/skywalking/apm/collector/queue/datacarrier/service/DataCarrierQueueCreatorService.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.datacarrier.service; - -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -import org.apache.skywalking.apm.collector.queue.base.QueueExecutor; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; - -/** - * @author peng-yongsheng - */ -public class DataCarrierQueueCreatorService implements QueueCreatorService { - - @Override public QueueEventHandler create(int queueSize, QueueExecutor executor) { - return null; - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider deleted file mode 100644 index 1e1786937..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - - -org.apache.skywalking.apm.collector.queue.datacarrier.QueueModuleDataCarrierProvider diff --git a/apm-collector/apm-collector-queue/collector-queue-define/pom.xml b/apm-collector/apm-collector-queue/collector-queue-define/pom.xml deleted file mode 100644 index 2c573a0ad..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - apm-collector-queue - org.apache.skywalking - 5.0.0-alpha - - 4.0.0 - - collector-queue-define - jar - - diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/QueueModule.java b/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/QueueModule.java deleted file mode 100644 index c91a745a7..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/QueueModule.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue; - -import org.apache.skywalking.apm.collector.core.module.Module; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; - -/** - * @author peng-yongsheng - */ -public class QueueModule extends Module { - - public static final String NAME = "queue"; - - @Override public String name() { - return NAME; - } - - @Override public Class[] services() { - return new Class[] {QueueCreatorService.class}; - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/DaemonThreadFactory.java b/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/DaemonThreadFactory.java deleted file mode 100644 index 451406570..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/DaemonThreadFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.base; - -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-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueCreator.java b/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueCreator.java deleted file mode 100644 index 530afed14..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueCreator.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.base; - -/** - * @author peng-yongsheng - */ -public interface QueueCreator { - QueueEventHandler create(int queueSize, QueueExecutor executor); -} diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueEventHandler.java b/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueEventHandler.java deleted file mode 100644 index 715d974ec..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueEventHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.base; - -/** - * @author peng-yongsheng - */ -public interface QueueEventHandler { - void tell(MESSAGE message); -} diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueExecutor.java b/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueExecutor.java deleted file mode 100644 index aa3677725..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/base/QueueExecutor.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.base; - -import org.apache.skywalking.apm.collector.core.framework.Executor; - -/** - * @author peng-yongsheng - */ -public interface QueueExecutor extends Executor { -} diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/service/QueueCreatorService.java b/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/service/QueueCreatorService.java deleted file mode 100644 index 93f7b12b4..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/apache/skywalking/apm/collector/queue/service/QueueCreatorService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.service; - -import org.apache.skywalking.apm.collector.core.module.Service; -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -import org.apache.skywalking.apm.collector.queue.base.QueueExecutor; - -/** - * @author peng-yongsheng - */ -public interface QueueCreatorService extends Service { - QueueEventHandler create(int queueSize, QueueExecutor executor); -} diff --git a/apm-collector/apm-collector-queue/collector-queue-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-queue/collector-queue-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module deleted file mode 100644 index 4d9205c38..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - - -org.apache.skywalking.apm.collector.queue.QueueModule 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 deleted file mode 100644 index d28345a24..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - apm-collector-queue - org.apache.skywalking - 5.0.0-alpha - - 4.0.0 - - collector-queue-disruptor-provider - jar - - - - org.apache.skywalking - collector-queue-define - ${project.version} - - - com.lmax - disruptor - 3.3.6 - - - diff --git a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/QueueModuleDisruptorProvider.java b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/QueueModuleDisruptorProvider.java deleted file mode 100644 index a824353f8..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/QueueModuleDisruptorProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.disruptor; - -import java.util.Properties; -import org.apache.skywalking.apm.collector.queue.disruptor.service.DisruptorQueueCreatorService; -import org.apache.skywalking.apm.collector.core.module.Module; -import org.apache.skywalking.apm.collector.core.module.ModuleProvider; -import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException; -import org.apache.skywalking.apm.collector.queue.QueueModule; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; - -/** - * @author peng-yongsheng - */ -public class QueueModuleDisruptorProvider extends ModuleProvider { - - @Override public String name() { - return "disruptor"; - } - - @Override public Class module() { - return QueueModule.class; - } - - @Override public void prepare(Properties config) throws ServiceNotProvidedException { - this.registerServiceImplementation(QueueCreatorService.class, new DisruptorQueueCreatorService()); - } - - @Override public void start(Properties config) throws ServiceNotProvidedException { - - } - - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { - - } - - @Override public String[] requiredModules() { - return new String[0]; - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java deleted file mode 100644 index c7c760e46..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.disruptor.base; - -import com.lmax.disruptor.EventHandler; -import com.lmax.disruptor.RingBuffer; -import org.apache.skywalking.apm.collector.core.CollectorException; -import org.apache.skywalking.apm.collector.core.data.EndOfBatchQueueMessage; -import org.apache.skywalking.apm.collector.queue.base.QueueExecutor; -import org.apache.skywalking.apm.collector.queue.base.MessageHolder; -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -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) throws CollectorException { - MESSAGE message = event.getMessage(); - event.reset(); - - message.setEndOfBatch(endOfBatch); - executor.execute(message); - } - - /** - * Push the message into disruptor ring buffer. - * - * @param message of the data to process. - */ - public void tell(MESSAGE message) { - long sequence = ringBuffer.next(); - try { - ringBuffer.get(sequence).setMessage(message); - } finally { - ringBuffer.publish(sequence); - } - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorQueueCreator.java b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorQueueCreator.java deleted file mode 100644 index 89b74d2f8..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/DisruptorQueueCreator.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.disruptor.base; - -import com.lmax.disruptor.ExceptionHandler; -import com.lmax.disruptor.RingBuffer; -import com.lmax.disruptor.dsl.Disruptor; -import org.apache.skywalking.apm.collector.queue.base.DaemonThreadFactory; -import org.apache.skywalking.apm.collector.queue.base.MessageHolder; -import org.apache.skywalking.apm.collector.queue.base.QueueCreator; -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -import org.apache.skywalking.apm.collector.queue.base.QueueExecutor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author peng-yongsheng - */ -public class DisruptorQueueCreator implements QueueCreator { - - private final Logger logger = LoggerFactory.getLogger(DisruptorQueueCreator.class); - - @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); - disruptor.setDefaultExceptionHandler(new ExceptionHandler() { - @Override public void handleEventException(Throwable ex, long sequence, MessageHolder event) { - logger.error("Handle disruptor error event! message: {}.", event.getMessage(), ex); - } - - @Override public void handleOnStartException(Throwable ex) { - logger.error("create disruptor queue failed!", ex); - } - - @Override public void handleOnShutdownException(Throwable ex) { - logger.error("shutdown disruptor queue failed!", ex); - } - }); - - 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-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/MessageHolderFactory.java b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/MessageHolderFactory.java deleted file mode 100644 index d177b8103..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/base/MessageHolderFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.disruptor.base; - -import com.lmax.disruptor.EventFactory; -import org.apache.skywalking.apm.collector.queue.base.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-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/service/DisruptorQueueCreatorService.java b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/service/DisruptorQueueCreatorService.java deleted file mode 100644 index b0d36056e..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/apache/skywalking/apm/collector/queue/disruptor/service/DisruptorQueueCreatorService.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.collector.queue.disruptor.service; - -import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler; -import org.apache.skywalking.apm.collector.queue.base.QueueExecutor; -import org.apache.skywalking.apm.collector.queue.disruptor.base.DisruptorQueueCreator; -import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService; - -/** - * @author peng-yongsheng - */ -public class DisruptorQueueCreatorService implements QueueCreatorService { - - private final DisruptorQueueCreator creator; - - public DisruptorQueueCreatorService() { - this.creator = new DisruptorQueueCreator(); - } - - @Override public QueueEventHandler create(int queueSize, QueueExecutor executor) { - return creator.create(queueSize, executor); - } -} diff --git a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider deleted file mode 100644 index 1fe4381fe..000000000 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - - -org.apache.skywalking.apm.collector.queue.disruptor.QueueModuleDisruptorProvider diff --git a/apm-collector/apm-collector-queue/pom.xml b/apm-collector/apm-collector-queue/pom.xml deleted file mode 100644 index 46dcff4d4..000000000 --- a/apm-collector/apm-collector-queue/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - apm-collector - org.apache.skywalking - 5.0.0-alpha - - 4.0.0 - - apm-collector-queue - pom - - collector-queue-define - collector-queue-datacarrier-provider - collector-queue-disruptor-provider - - - - - org.apache.skywalking - apm-collector-core - ${project.version} - - - diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index 8f1f76264..6282aa322 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -42,7 +42,6 @@ apm-collector-grpc-manager apm-collector-jetty-manager apm-collector-remote - apm-collector-queue apm-collector-instrument apm-collector-agent-stream apm-collector-configuration