You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/04/08 15:14:45 UTC
[incubator-servicecomb-java-chassis] branch master updated (49d8249
-> f65a9b3)
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 49d8249 [SCB-444]try to optimize autoDiscovery function
new f9eed1b SCB-422 add chassis close event
new f1a110e SCB-422 metrics shutdown when chassis close
new 8a7cc9f SCB-422 split create registry and create invocation meters to different initializer
new eb9587a SCB-422 init threadPool meters from schema operations
new 02e392a SCB-422 define threadPool publish model
new eb4de3f SCB-422 convert threadPool measurements to publish model
new b8cb6f8 SCB-422 log publisher output threadPool informations
new 7ecb066 SCB-422 avoid random UT fail
new f65a9b3 SCB-422 delete random failed test case
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/servicecomb/core/BootListener.java | 4 +-
.../servicecomb/core/CseApplicationListener.java | 2 +
.../core/executor/FixedThreadExecutor.java | 4 +
.../core/TestCseApplicationListener.java | 30 +++-
.../foundation/metrics/MetricsBootstrap.java | 8 +
.../foundation/metrics/MetricsInitializer.java | 8 +
.../metrics/publish/spectator/MeasurementTree.java | 3 +-
.../foundation/metrics/TestMetricsBootstrap.java | 58 +++++++-
.../publish/spectator/TestMeasurementTree.java | 3 +-
.../ThreadPoolMonitorPublishModelFactory.java | 98 +++++++++++++
.../metrics/core/DefaultRegistryInitializer.java | 64 ++++++++
...lizer.java => InvocationMetersInitializer.java} | 24 +--
.../metrics/core/MetricsBootListener.java | 2 +
.../metrics/core/ThreadPoolMetersInitializer.java | 99 +++++++++++++
.../metrics/core/publish/DefaultLogPublisher.java | 25 ++++
.../metrics/core/publish/PublishModelFactory.java | 10 +-
.../core/publish/model/DefaultPublishModel.java | 21 +++
.../core/publish/model/ThreadPoolPublishModel.java | 89 +++++++++++
...rvicecomb.foundation.metrics.MetricsInitializer | 4 +-
.../metrics/core/TestAnMonitorManager.java | 114 +++++++--------
...er.java => TestDefaultRegistryInitializer.java} | 44 +++---
...r.java => TestInvocationMetersInitializer.java} | 39 ++---
.../core/TestThreadPoolMetersInitializer.java | 162 +++++++++++++++++++++
.../core/publish/TestDefaultLogPublisher.java | 6 +
...java => TestInvocationPublishModelFactory.java} | 59 ++++----
.../metrics/core/publish/TestPublishUtils.java | 15 +-
.../publish/TestThreadPoolPublishModelFactory.java | 78 ++++++++++
.../client/http/TestAbstractClientPool.java | 102 +++++++++++++
.../client/http/TestClientPool.java | 59 --------
.../client/http/TestHttpClientPool.java | 88 +++++++++++
.../client/http/TestServiceRegistryClientImpl.java | 13 --
.../client/http/TestWebsocketClientPool.java | 43 +++---
32 files changed, 1120 insertions(+), 258 deletions(-)
create mode 100644 metrics/metrics-core/src/main/java/com/netflix/spectator/api/patterns/ThreadPoolMonitorPublishModelFactory.java
create mode 100644 metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultRegistryInitializer.java
rename metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/{DefaultMetricsInitializer.java => InvocationMetersInitializer.java} (78%)
create mode 100644 metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/ThreadPoolMetersInitializer.java
create mode 100644 metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/ThreadPoolPublishModel.java
copy metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/{publish/TestMetricsRestPublisher.java => TestDefaultRegistryInitializer.java} (50%)
rename metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/{TestDefaultMetricsInitializer.java => TestInvocationMetersInitializer.java} (82%)
create mode 100644 metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestThreadPoolMetersInitializer.java
rename metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/{TestPublishModelFactory.java => TestInvocationPublishModelFactory.java} (56%)
create mode 100644 metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java
create mode 100644 service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestAbstractClientPool.java
delete mode 100644 service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientPool.java
create mode 100644 service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestHttpClientPool.java
copy transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletConfig.java => service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestWebsocketClientPool.java (50%)
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 01/09: SCB-422 add chassis
close event
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit f9eed1b5569679eb52cc6231cdfff1115552119f
Author: wujimin <wu...@huawei.com>
AuthorDate: Mon Apr 2 11:10:42 2018 +0800
SCB-422 add chassis close event
---
.../org/apache/servicecomb/core/BootListener.java | 4 ++-
.../servicecomb/core/CseApplicationListener.java | 2 ++
.../core/TestCseApplicationListener.java | 30 ++++++++++++++++++----
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/BootListener.java b/core/src/main/java/org/apache/servicecomb/core/BootListener.java
index f6e50cc..b3b8755 100644
--- a/core/src/main/java/org/apache/servicecomb/core/BootListener.java
+++ b/core/src/main/java/org/apache/servicecomb/core/BootListener.java
@@ -28,7 +28,9 @@ public interface BootListener {
BEFORE_TRANSPORT,
AFTER_TRANSPORT,
BEFORE_REGISTRY,
- AFTER_REGISTRY
+ AFTER_REGISTRY,
+ BEFORE_CLOSE,
+ AFTER_CLOSE
}
class BootEvent {
diff --git a/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java b/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java
index 5cff9ca..4952f35 100644
--- a/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java
+++ b/core/src/main/java/org/apache/servicecomb/core/CseApplicationListener.java
@@ -147,7 +147,9 @@ public class CseApplicationListener
}
} else if (event instanceof ContextClosedEvent) {
LOGGER.warn("cse is closing now...");
+ triggerEvent(EventType.BEFORE_CLOSE);
RegistryUtils.destroy();
+ triggerEvent(EventType.AFTER_CLOSE);
isInit = false;
}
}
diff --git a/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java b/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java
index fb473b7..e5eaec8 100644
--- a/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java
+++ b/core/src/test/java/org/apache/servicecomb/core/TestCseApplicationListener.java
@@ -22,11 +22,17 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import javax.xml.ws.Holder;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.servicecomb.core.BootListener.BootEvent;
+import org.apache.servicecomb.core.BootListener.EventType;
import org.apache.servicecomb.core.definition.loader.SchemaListenerManager;
import org.apache.servicecomb.core.endpoint.AbstractEndpointsCache;
import org.apache.servicecomb.core.provider.consumer.ConsumerProviderManager;
@@ -39,6 +45,7 @@ import org.apache.servicecomb.foundation.common.utils.ReflectUtils;
import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.task.MicroserviceInstanceRegisterTask;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -53,6 +60,8 @@ import org.springframework.context.support.AbstractApplicationContext;
import mockit.Deencapsulation;
import mockit.Expectations;
import mockit.Injectable;
+import mockit.Mock;
+import mockit.MockUp;
import mockit.Mocked;
public class TestCseApplicationListener {
@@ -147,15 +156,26 @@ public class TestCseApplicationListener {
}
@Test
- public void testCseApplicationListenerShutdown(@Injectable ContextClosedEvent event,
- @Mocked RegistryUtils ru) {
- new Expectations() {
- {
- RegistryUtils.destroy();
+ public void testCseApplicationListenerShutdown(@Mocked ApplicationContext context) throws IllegalAccessException {
+ Holder<Boolean> destroyHolder = new Holder<>();
+ new MockUp<RegistryUtils>() {
+ @Mock
+ void destroy() {
+ destroyHolder.value = true;
}
};
CseApplicationListener cal = new CseApplicationListener();
+ ContextClosedEvent event = new ContextClosedEvent(context);
+
+ List<EventType> eventTypes = new ArrayList<>();
+ BootListener bootListener = e -> {
+ eventTypes.add(e.getEventType());
+ };
+ FieldUtils.writeField(cal, "bootListenerList", Arrays.asList(bootListener), true);
cal.onApplicationEvent(event);
+
+ Assert.assertTrue(destroyHolder.value);
+ Assert.assertThat(eventTypes, Matchers.contains(EventType.BEFORE_CLOSE, EventType.AFTER_CLOSE));
}
@Test
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 07/09: SCB-422 log publisher
output threadPool informations
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit b8cb6f8dac9ffe5f2b50e31763e9878384ab86ca
Author: wujimin <wu...@huawei.com>
AuthorDate: Mon Apr 2 11:37:47 2018 +0800
SCB-422 log publisher output threadPool informations
---
.../metrics/core/publish/DefaultLogPublisher.java | 25 ++++++++++++++++++++++
.../core/publish/TestDefaultLogPublisher.java | 6 ++++++
2 files changed, 31 insertions(+)
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
index 26a3815..a4efedd 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
@@ -26,6 +26,7 @@ import org.apache.servicecomb.foundation.metrics.PolledEvent;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
+import org.apache.servicecomb.metrics.core.publish.model.ThreadPoolPublishModel;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerf;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroup;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroups;
@@ -75,12 +76,36 @@ public class DefaultLogPublisher implements MetricsInitializer {
PublishModelFactory factory = new PublishModelFactory(meters);
DefaultPublishModel model = factory.createDefaultPublishModel();
+
+ printThreadPoolMetrics(model, sb);
+
printConsumerLog(model, sb);
printProducerLog(model, sb);
LOGGER.info(sb.toString());
}
+ protected void printThreadPoolMetrics(DefaultPublishModel model, StringBuilder sb) {
+ if (model.getThreadPools().isEmpty()) {
+ return;
+ }
+
+ sb.append("threadPool:\n");
+ sb.append(" corePoolSize maxThreads poolSize currentThreadsBusy queueSize taskCount completedTaskCount name\n");
+ for (Entry<String, ThreadPoolPublishModel> entry : model.getThreadPools().entrySet()) {
+ ThreadPoolPublishModel threadPoolPublishModel = entry.getValue();
+ sb.append(String.format(" %-12d %-10d %-8d %-18d %-9d %-9.1f %-18.1f %s\n",
+ threadPoolPublishModel.getCorePoolSize(),
+ threadPoolPublishModel.getMaxThreads(),
+ threadPoolPublishModel.getPoolSize(),
+ threadPoolPublishModel.getCurrentThreadsBusy(),
+ threadPoolPublishModel.getQueueSize(),
+ threadPoolPublishModel.getAvgTaskCount(),
+ threadPoolPublishModel.getAvgCompletedTaskCount(),
+ entry.getKey()));
+ }
+ }
+
protected void printConsumerLog(DefaultPublishModel model, StringBuilder sb) {
OperationPerfGroups consumerPerf = model.getConsumer().getOperationPerfGroups();
if (consumerPerf == null) {
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
index 056dd25..c8ffc55 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java
@@ -32,6 +32,7 @@ import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
import org.apache.servicecomb.foundation.vertx.VertxUtils;
import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
+import org.apache.servicecomb.metrics.core.publish.model.ThreadPoolPublishModel;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerf;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroup;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroups;
@@ -157,6 +158,8 @@ public class TestDefaultLogPublisher {
model.getConsumer().setOperationPerfGroups(operationPerfGroups);
model.getProducer().setOperationPerfGroups(operationPerfGroups);
+ model.getThreadPools().put("test", new ThreadPoolPublishModel());
+
new MockUp<PublishModelFactory>() {
@Mock
DefaultPublishModel createDefaultPublishModel() {
@@ -175,6 +178,9 @@ public class TestDefaultLogPublisher {
"vertx:\n" +
" name eventLoopContext-created\n" +
" v 1\n" +
+ "threadPool:\n" +
+ " corePoolSize maxThreads poolSize currentThreadsBusy queueSize taskCount completedTaskCount name\n" +
+ " 0 0 0 0 0 0.0 0.0 test\n" +
"consumer:\n" +
" tps latency(ms) max-latency(ms) operation\n" +
" rest.OK:\n" +
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 04/09: SCB-422 init threadPool
meters from schema operations
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit eb9587a43dde767082e272ee6aa3fe6efe4b1999
Author: wujimin <wu...@huawei.com>
AuthorDate: Mon Apr 2 11:28:38 2018 +0800
SCB-422 init threadPool meters from schema operations
---
.../core/executor/FixedThreadExecutor.java | 4 +
.../metrics/core/ThreadPoolMetersInitializer.java | 99 +++++++++++++
...rvicecomb.foundation.metrics.MetricsInitializer | 1 +
.../core/TestThreadPoolMetersInitializer.java | 162 +++++++++++++++++++++
4 files changed, 266 insertions(+)
diff --git a/core/src/main/java/org/apache/servicecomb/core/executor/FixedThreadExecutor.java b/core/src/main/java/org/apache/servicecomb/core/executor/FixedThreadExecutor.java
index e70cc1b..2600ebb 100644
--- a/core/src/main/java/org/apache/servicecomb/core/executor/FixedThreadExecutor.java
+++ b/core/src/main/java/org/apache/servicecomb/core/executor/FixedThreadExecutor.java
@@ -58,6 +58,10 @@ public class FixedThreadExecutor implements Executor {
}
}
+ public List<Executor> getExecutorList() {
+ return executorList;
+ }
+
@Override
public void execute(Runnable command) {
long threadId = Thread.currentThread().getId();
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/ThreadPoolMetersInitializer.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/ThreadPoolMetersInitializer.java
new file mode 100644
index 0000000..7d9b1f2
--- /dev/null
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/ThreadPoolMetersInitializer.java
@@ -0,0 +1,99 @@
+/*
+ * 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.servicecomb.metrics.core;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+import org.apache.servicecomb.core.CseContext;
+import org.apache.servicecomb.core.definition.MicroserviceMeta;
+import org.apache.servicecomb.core.definition.MicroserviceMetaManager;
+import org.apache.servicecomb.core.definition.OperationMeta;
+import org.apache.servicecomb.core.executor.FixedThreadExecutor;
+import org.apache.servicecomb.foundation.common.utils.BeanUtils;
+import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
+import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
+import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
+
+import com.google.common.eventbus.EventBus;
+import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.patterns.ThreadPoolMonitor;
+
+public class ThreadPoolMetersInitializer implements MetricsInitializer {
+ private Registry registry;
+
+ @Override
+ public void init(CompositeRegistry globalRegistry, EventBus eventBus, MetricsBootstrapConfig config) {
+ DefaultRegistryInitializer defaultRegistryInitializer =
+ SPIServiceUtils.getTargetService(MetricsInitializer.class, DefaultRegistryInitializer.class);
+ registry = defaultRegistryInitializer.getRegistry();
+
+ createThreadPoolMeters();
+ }
+
+ public void createThreadPoolMeters() {
+ Map<Executor, Executor> operationExecutors = collectionOperationExecutors();
+ // currently, all operation executors come from bean
+ Map<String, Executor> beanExecutors = BeanUtils.getContext().getBeansOfType(Executor.class);
+
+ for (Entry<String, Executor> entry : beanExecutors.entrySet()) {
+ Executor executor = entry.getValue();
+ if (!operationExecutors.containsKey(executor)) {
+ continue;
+ }
+
+ if (FixedThreadExecutor.class.isInstance(executor)) {
+ createThreadPoolMeters(entry.getKey(), (FixedThreadExecutor) executor);
+ continue;
+ }
+
+ createThreadPoolMeters(entry.getKey(), executor);
+ }
+ }
+
+ protected Map<Executor, Executor> collectionOperationExecutors() {
+ Map<Executor, Executor> operationExecutors = new IdentityHashMap<>();
+
+ MicroserviceMetaManager microserviceMetaManager = CseContext.getInstance().getMicroserviceMetaManager();
+ for (MicroserviceMeta microserviceMeta : microserviceMetaManager.values()) {
+ for (OperationMeta operationMeta : microserviceMeta.getOperations()) {
+ operationExecutors.put(operationMeta.getExecutor(), operationMeta.getExecutor());
+ }
+ }
+
+ return operationExecutors;
+ }
+
+ protected void createThreadPoolMeters(String threadPoolName, FixedThreadExecutor fixedThreadExecutor) {
+ for (int idx = 0; idx < fixedThreadExecutor.getExecutorList().size(); idx++) {
+ Executor executor = fixedThreadExecutor.getExecutorList().get(idx);
+ createThreadPoolMeters(threadPoolName + "-group" + idx, executor);
+ }
+ }
+
+ protected void createThreadPoolMeters(String threadPoolName, Executor executor) {
+ if (!ThreadPoolExecutor.class.isInstance(executor)) {
+ return;
+ }
+
+ ThreadPoolMonitor.attach(registry, (ThreadPoolExecutor) executor, threadPoolName);
+ }
+}
diff --git a/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer b/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer
index ecd13da..c4ed8e7 100644
--- a/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer
+++ b/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer
@@ -17,5 +17,6 @@
org.apache.servicecomb.metrics.core.DefaultRegistryInitializer
org.apache.servicecomb.metrics.core.InvocationMetersInitializer
+org.apache.servicecomb.metrics.core.ThreadPoolMetersInitializer
org.apache.servicecomb.metrics.core.publish.DefaultLogPublisher
org.apache.servicecomb.metrics.core.publish.MetricsRestPublisher
\ No newline at end of file
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestThreadPoolMetersInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestThreadPoolMetersInitializer.java
new file mode 100644
index 0000000..116e059
--- /dev/null
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestThreadPoolMetersInitializer.java
@@ -0,0 +1,162 @@
+/*
+ * 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.servicecomb.metrics.core;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RunnableScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+import org.apache.servicecomb.core.CseContext;
+import org.apache.servicecomb.core.definition.MicroserviceMeta;
+import org.apache.servicecomb.core.definition.MicroserviceMetaManager;
+import org.apache.servicecomb.core.definition.OperationMeta;
+import org.apache.servicecomb.core.executor.FixedThreadExecutor;
+import org.apache.servicecomb.foundation.common.utils.BeanUtils;
+import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
+import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+
+import com.netflix.spectator.api.DefaultRegistry;
+import com.netflix.spectator.api.ManualClock;
+import com.netflix.spectator.api.Registry;
+
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+
+public class TestThreadPoolMetersInitializer {
+ Registry registry = new DefaultRegistry(new ManualClock());
+
+ ThreadPoolMetersInitializer threadPoolMetersInitializer = new ThreadPoolMetersInitializer();
+
+ @Mocked
+ DefaultRegistryInitializer defaultRegistryInitializer;
+
+ @Mocked
+ ThreadPoolExecutor threadPoolExecutor;
+
+ @Mocked
+ BlockingQueue<Runnable> queue;
+
+ @Mocked
+ FixedThreadExecutor fixedThreadExecutor;
+
+ @Mocked
+ Executor executor;
+
+ @Mocked
+ ApplicationContext applicationContext;
+
+ @Mocked
+ MicroserviceMetaManager microserviceMetaManager;
+
+ @Mocked
+ MicroserviceMeta microserviceMeta;
+
+ @Mocked
+ OperationMeta operationMetaExecutor;
+
+ @Mocked
+ OperationMeta operationMetaSameExecutor;
+
+ @Mocked
+ OperationMeta operationMetaFixedThreadExecutor;
+
+ @Test
+ public void init() {
+ new Expectations(SPIServiceUtils.class) {
+ {
+ SPIServiceUtils.getTargetService(MetricsInitializer.class, DefaultRegistryInitializer.class);
+ result = defaultRegistryInitializer;
+ defaultRegistryInitializer.getRegistry();
+ result = registry;
+ }
+ };
+
+ Map<String, Executor> beanExecutors = new HashMap<>();
+ beanExecutors.put("executor", executor);
+ beanExecutors.put("fixedThreadExecutor", fixedThreadExecutor);
+ beanExecutors.put("threadPoolExecutor", threadPoolExecutor);
+ new Expectations(BeanUtils.class) {
+ {
+ BeanUtils.getContext();
+ result = applicationContext;
+ applicationContext.getBeansOfType(Executor.class);
+ result = beanExecutors;
+ }
+ };
+
+ new Expectations(CseContext.getInstance()) {
+ {
+ CseContext.getInstance().getMicroserviceMetaManager();
+ result = microserviceMetaManager;
+ microserviceMetaManager.values();
+ result = Arrays.asList(microserviceMeta);
+ microserviceMeta.getOperations();
+ result = Arrays.asList(operationMetaExecutor, operationMetaSameExecutor, operationMetaFixedThreadExecutor);
+ operationMetaExecutor.getExecutor();
+ result = executor;
+ operationMetaSameExecutor.getExecutor();
+ result = executor;
+ operationMetaFixedThreadExecutor.getExecutor();
+ result = fixedThreadExecutor;
+
+ fixedThreadExecutor.getExecutorList();
+ result = Arrays.asList(threadPoolExecutor);
+
+ threadPoolExecutor.getQueue();
+ result = queue;
+ queue.size();
+ result = 10d;
+ }
+ };
+
+ new MockUp<ScheduledThreadPoolExecutor>() {
+ @Mock
+ void delayedExecute(RunnableScheduledFuture<?> task) {
+
+ }
+ };
+
+ threadPoolMetersInitializer.init(null, null, null);
+
+ List<String> result = new ArrayList<>();
+ registry.iterator().forEachRemaining(meter -> {
+ result.add(meter.measure().toString());
+ });
+
+ Assert.assertThat(result,
+ Matchers.containsInAnyOrder("[Measurement(threadpool.maxThreads:id=fixedThreadExecutor-group0,0,0.0)]",
+ "[Measurement(threadpool.completedTaskCount:id=fixedThreadExecutor-group0,0,0.0)]",
+ "[Measurement(threadpool.currentThreadsBusy:id=fixedThreadExecutor-group0,0,0.0)]",
+ "[Measurement(threadpool.corePoolSize:id=fixedThreadExecutor-group0,0,0.0)]",
+ "[Measurement(threadpool.poolSize:id=fixedThreadExecutor-group0,0,0.0)]",
+ "[Measurement(threadpool.queueSize:id=fixedThreadExecutor-group0,0,10.0)]",
+ "[Measurement(threadpool.taskCount:id=fixedThreadExecutor-group0,0,0.0)]"));
+ }
+}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 06/09: SCB-422 convert
threadPool measurements to publish model
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit eb4de3fe627f5950aa8b41a4f8fa3155be5d72b1
Author: wujimin <wu...@huawei.com>
AuthorDate: Mon Apr 2 11:31:20 2018 +0800
SCB-422 convert threadPool measurements to publish model
---
.../metrics/publish/spectator/MeasurementTree.java | 3 +-
.../publish/spectator/TestMeasurementTree.java | 3 +-
.../ThreadPoolMonitorPublishModelFactory.java | 98 ++++++++++++++++++++++
.../metrics/core/publish/PublishModelFactory.java | 10 ++-
...java => TestInvocationPublishModelFactory.java} | 59 +++++++------
.../metrics/core/publish/TestPublishUtils.java | 15 +++-
.../publish/TestThreadPoolPublishModelFactory.java | 78 +++++++++++++++++
7 files changed, 232 insertions(+), 34 deletions(-)
diff --git a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementTree.java b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementTree.java
index 056bba6..1a07720 100644
--- a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementTree.java
+++ b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/publish/spectator/MeasurementTree.java
@@ -45,12 +45,13 @@ public class MeasurementTree extends MeasurementNode {
public void from(Iterable<Measurement> measurements, MeasurementGroupConfig groupConfig) {
for (Measurement measurement : measurements) {
Id id = measurement.id();
+ MeasurementNode node = addChild(id.name(), measurement);
+
List<TagFinder> tagFinders = groupConfig.findTagFinders(id.name());
if (tagFinders == null) {
continue;
}
- MeasurementNode node = addChild(id.name(), measurement);
for (TagFinder tagFinder : tagFinders) {
Tag tag = tagFinder.find(id.tags());
if (tag == null) {
diff --git a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementTree.java b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementTree.java
index a3eb50d..e568c67 100644
--- a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementTree.java
+++ b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/publish/spectator/TestMeasurementTree.java
@@ -65,11 +65,12 @@ public class TestMeasurementTree {
MeasurementGroupConfig config = new MeasurementGroupConfig("id", "g1", "g2", Statistic.count.key());
tree.from(registry.iterator(), config);
- Assert.assertEquals(1, tree.getChildren().size());
+ Assert.assertEquals(2, tree.getChildren().size());
MeasurementNode node = tree.findChild("id", "g1v", "g2v");
Assert.assertEquals(2d, node.findChild(Statistic.count.value()).getMeasurements().get(0).value(), 0);
Assert.assertEquals(12d, node.findChild(Statistic.totalTime.value()).getMeasurements().get(0).value(), 0);
+ Assert.assertEquals(0d, tree.findChild("id_notCare").summary(), 0);
}
@Test
diff --git a/metrics/metrics-core/src/main/java/com/netflix/spectator/api/patterns/ThreadPoolMonitorPublishModelFactory.java b/metrics/metrics-core/src/main/java/com/netflix/spectator/api/patterns/ThreadPoolMonitorPublishModelFactory.java
new file mode 100644
index 0000000..0ffb5a1
--- /dev/null
+++ b/metrics/metrics-core/src/main/java/com/netflix/spectator/api/patterns/ThreadPoolMonitorPublishModelFactory.java
@@ -0,0 +1,98 @@
+/*
+ * 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 com.netflix.spectator.api.patterns;
+
+import java.util.Map;
+
+import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementNode;
+import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementTree;
+import org.apache.servicecomb.metrics.core.publish.model.ThreadPoolPublishModel;
+
+import com.netflix.spectator.api.Measurement;
+import com.netflix.spectator.api.Utils;
+
+public class ThreadPoolMonitorPublishModelFactory {
+ interface Setter {
+ void set(ThreadPoolPublishModel model, Measurement measurement);
+ }
+
+ private MeasurementTree tree;
+
+ private Map<String, ThreadPoolPublishModel> threadPools;
+
+ public ThreadPoolMonitorPublishModelFactory(MeasurementTree tree,
+ Map<String, ThreadPoolPublishModel> threadPools) {
+ this.tree = tree;
+ this.threadPools = threadPools;
+ }
+
+ public static void create(MeasurementTree tree,
+ Map<String, ThreadPoolPublishModel> threadPools) {
+ new ThreadPoolMonitorPublishModelFactory(tree, threadPools).create();
+ }
+
+ public void create() {
+ readMeasurement(ThreadPoolMonitor.TASK_COUNT,
+ (model, measurement) -> {
+ model.setAvgTaskCount(measurement.value());
+ });
+ readMeasurement(ThreadPoolMonitor.COMPLETED_TASK_COUNT,
+ (model, measurement) -> {
+ model.setAvgCompletedTaskCount(measurement.value());
+ });
+ readMeasurement(ThreadPoolMonitor.CURRENT_THREADS_BUSY,
+ (model, measurement) -> {
+ model.setCurrentThreadsBusy((int) measurement.value());
+ });
+ readMeasurement(ThreadPoolMonitor.MAX_THREADS,
+ (model, measurement) -> {
+ model.setMaxThreads((int) measurement.value());
+ });
+ readMeasurement(ThreadPoolMonitor.POOL_SIZE,
+ (model, measurement) -> {
+ model.setPoolSize((int) measurement.value());
+ });
+ readMeasurement(ThreadPoolMonitor.CORE_POOL_SIZE,
+ (model, measurement) -> {
+ model.setCorePoolSize((int) measurement.value());
+ });
+ readMeasurement(ThreadPoolMonitor.QUEUE_SIZE,
+ (model, measurement) -> {
+ model.setQueueSize((int) measurement.value());
+ });
+ }
+
+ protected void readMeasurement(String name, Setter setter) {
+ MeasurementNode node = tree.findChild(name);
+ if (node == null) {
+ return;
+ }
+
+ for (Measurement measurement : node.getMeasurements()) {
+ String threadPoolName = Utils.getTagValue(measurement.id(), ThreadPoolMonitor.ID_TAG_NAME);
+ if (threadPoolName == null) {
+ continue;
+ }
+
+ ThreadPoolPublishModel model = threadPools.computeIfAbsent(threadPoolName, tpn -> {
+ return new ThreadPoolPublishModel();
+ });
+
+ setter.set(model, measurement);
+ }
+ }
+}
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/PublishModelFactory.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/PublishModelFactory.java
index 7d03573..8c311bf 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/PublishModelFactory.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/PublishModelFactory.java
@@ -27,6 +27,7 @@ import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPer
import org.apache.servicecomb.swagger.invocation.InvocationType;
import com.netflix.spectator.api.Meter;
+import com.netflix.spectator.api.patterns.ThreadPoolMonitorPublishModelFactory;
public class PublishModelFactory {
private MeasurementTree tree;
@@ -52,6 +53,7 @@ public class PublishModelFactory {
MeterInvocationConst.TAG_STATUS,
MeterInvocationConst.TAG_STAGE,
MeterInvocationConst.TAG_STATISTIC);
+
return groupConfig;
}
@@ -80,13 +82,13 @@ public class PublishModelFactory {
public DefaultPublishModel createDefaultPublishModel() {
DefaultPublishModel model = new DefaultPublishModel();
- model
- .getConsumer()
+ model.getConsumer()
.setOperationPerfGroups(generateOperationPerfGroups(tree, InvocationType.CONSUMER.name()));
- model
- .getProducer()
+ model.getProducer()
.setOperationPerfGroups(generateOperationPerfGroups(tree, InvocationType.PRODUCER.name()));
+ ThreadPoolMonitorPublishModelFactory.create(tree, model.getThreadPools());
+
return model;
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishModelFactory.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java
similarity index 56%
rename from metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishModelFactory.java
rename to metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java
index 4135cf0..3452b02 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishModelFactory.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestInvocationPublishModelFactory.java
@@ -16,14 +16,14 @@
*/
package org.apache.servicecomb.metrics.core.publish;
-import java.util.List;
-
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.foundation.common.utils.JsonUtils;
-import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
-import org.apache.servicecomb.metrics.core.DefaultMetricsInitializer;
+import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
+import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
+import org.apache.servicecomb.metrics.core.DefaultRegistryInitializer;
+import org.apache.servicecomb.metrics.core.InvocationMetersInitializer;
import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
import org.apache.servicecomb.swagger.invocation.InvocationType;
import org.apache.servicecomb.swagger.invocation.Response;
@@ -33,19 +33,25 @@ import org.junit.Test;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.collect.Lists;
import com.google.common.eventbus.EventBus;
-import com.netflix.spectator.api.CompositeRegistry;
import com.netflix.spectator.api.DefaultRegistry;
import com.netflix.spectator.api.ManualClock;
-import com.netflix.spectator.api.Meter;
import com.netflix.spectator.api.Registry;
-import com.netflix.spectator.api.SpectatorUtils;
import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-public class TestPublishModelFactory {
+public class TestInvocationPublishModelFactory {
+ EventBus eventBus = new EventBus();
+
+ Registry registry = new DefaultRegistry(new ManualClock());
+
+ @Mocked
+ DefaultRegistryInitializer defaultRegistryInitializer;
+
+ InvocationMetersInitializer invocationMetersInitializer = new InvocationMetersInitializer();
+
@Mocked
Invocation invocation;
@@ -56,28 +62,29 @@ public class TestPublishModelFactory {
@Test
public void createDefaultPublishModel() throws JsonProcessingException {
- Registry registry = prepareRegistry();
- List<Meter> meters = Lists.newArrayList(registry);
- PublishModelFactory factory = new PublishModelFactory(meters);
+ new Expectations(SPIServiceUtils.class) {
+ {
+ SPIServiceUtils.getTargetService(MetricsInitializer.class, DefaultRegistryInitializer.class);
+ result = defaultRegistryInitializer;
+ defaultRegistryInitializer.getRegistry();
+ result = registry;
+ }
+ };
+ invocationMetersInitializer.init(null, eventBus, null);
+ prepareInvocation();
+
+ PublishModelFactory factory = new PublishModelFactory(Lists.newArrayList(registry.iterator()));
DefaultPublishModel model = factory.createDefaultPublishModel();
Assert.assertEquals(
- "{\"consumer\":{\"operationPerfGroups\":{\"groups\":{\"rest\":{\"200\":{\"transport\":\"rest\",\"status\":\"200\",\"operationPerfs\":[{\"operation\":\"m.s.o\",\"stages\":{\"total\":{\"tps\":1,\"msTotalTime\":10000.0,\"msMaxLatency\":0.0}}}],\"summary\":{\"operation\":\"\",\"stages\":{\"total\":{\"tps\":1,\"msTotalTime\":10000.0,\"msMaxLatency\":0.0}}}}}}}},\"producer\":{\"operationPerfGroups\":{\"groups\":{\"rest\":{\"200\":{\"transport\":\"rest\",\"status\":\"200\",\"operationPe [...]
- JsonUtils.writeValueAsString(model));
+ "{\"operationPerfGroups\":{\"groups\":{\"rest\":{\"200\":{\"transport\":\"rest\",\"status\":\"200\",\"operationPerfs\":[{\"operation\":\"m.s.o\",\"stages\":{\"total\":{\"tps\":1,\"msTotalTime\":10000.0,\"msMaxLatency\":0.0}}}],\"summary\":{\"operation\":\"\",\"stages\":{\"total\":{\"tps\":1,\"msTotalTime\":10000.0,\"msMaxLatency\":0.0}}}}}}}}",
+ JsonUtils.writeValueAsString(model.getConsumer()));
+ Assert.assertEquals(
+ "{\"operationPerfGroups\":{\"groups\":{\"rest\":{\"200\":{\"transport\":\"rest\",\"status\":\"200\",\"operationPerfs\":[{\"operation\":\"m.s.o\",\"stages\":{\"execution\":{\"tps\":1,\"msTotalTime\":5000.0,\"msMaxLatency\":0.0},\"total\":{\"tps\":1,\"msTotalTime\":10000.0,\"msMaxLatency\":0.0},\"queue\":{\"tps\":1,\"msTotalTime\":5000.0,\"msMaxLatency\":0.0}}}],\"summary\":{\"operation\":\"\",\"stages\":{\"execution\":{\"tps\":1,\"msTotalTime\":5000.0,\"msMaxLatency\":0.0},\"total [...]
+ JsonUtils.writeValueAsString(model.getProducer()));
}
- protected Registry prepareRegistry() {
- CompositeRegistry globalRegistry = SpectatorUtils.createCompositeRegistry(null);
- Registry registry = new DefaultRegistry(new ManualClock());
- EventBus eventBus = new EventBus();
-
- DefaultMetricsInitializer metricsInitializer = new DefaultMetricsInitializer() {
- protected Registry createRegistry(MetricsBootstrapConfig config) {
- return registry;
- };
- };
- metricsInitializer.init(globalRegistry, eventBus, new MetricsBootstrapConfig());
-
+ protected void prepareInvocation() {
new MockUp<System>() {
@Mock
long nanoTime() {
@@ -125,7 +132,5 @@ public class TestPublishModelFactory {
invocationType = InvocationType.PRODUCER;
eventBus.post(finishEvent);
-
- return registry;
}
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java
index 29ddcc6..68bd8f1 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java
@@ -16,14 +16,16 @@
*/
package org.apache.servicecomb.metrics.core.publish;
+import java.util.HashMap;
import java.util.Map;
import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementNode;
+import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementTree;
import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
-import org.apache.servicecomb.metrics.core.publish.PublishUtils;
+import org.apache.servicecomb.metrics.core.publish.model.ThreadPoolPublishModel;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerf;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroup;
import org.apache.servicecomb.metrics.core.publish.model.invocation.OperationPerfGroups;
@@ -32,6 +34,8 @@ import org.apache.servicecomb.metrics.core.publish.model.invocation.Utils;
import org.junit.Assert;
import org.junit.Test;
+import com.netflix.spectator.api.patterns.ThreadPoolMonitorPublishModelFactory;
+
public class TestPublishUtils {
String op = "op";
@@ -72,4 +76,13 @@ public class TestPublishUtils {
Assert.assertEquals(1000, perfInfo.calcMsLatency(), 0);
Assert.assertEquals(100000, perfInfo.getMsMaxLatency(), 0);
}
+
+ @Test
+ public void createThreadPoolPublishModels_empty() {
+ Map<String, ThreadPoolPublishModel> threadPools = new HashMap<>();
+
+ ThreadPoolMonitorPublishModelFactory.create(new MeasurementTree(), threadPools);
+
+ Assert.assertTrue(threadPools.isEmpty());
+ }
}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java
new file mode 100644
index 0000000..7f000f0
--- /dev/null
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestThreadPoolPublishModelFactory.java
@@ -0,0 +1,78 @@
+/*
+ * 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.servicecomb.metrics.core.publish;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.RunnableScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+import org.apache.servicecomb.foundation.common.utils.JsonUtils;
+import org.apache.servicecomb.metrics.core.publish.model.DefaultPublishModel;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.Lists;
+import com.google.common.eventbus.EventBus;
+import com.netflix.spectator.api.DefaultRegistry;
+import com.netflix.spectator.api.ManualClock;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.patterns.ThreadPoolMonitor;
+
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+
+public class TestThreadPoolPublishModelFactory {
+ protected EventBus eventBus = new EventBus();
+
+ protected Registry registry = new DefaultRegistry(new ManualClock());
+
+ @Mocked
+ ThreadPoolExecutor threadPoolExecutor;
+
+ @Mocked
+ BlockingQueue<Runnable> queue;
+
+ @Test
+ public void createDefaultPublishModel() throws JsonProcessingException {
+ new Expectations() {
+ {
+ threadPoolExecutor.getQueue();
+ result = queue;
+ queue.size();
+ result = 10d;
+ }
+ };
+ new MockUp<ScheduledThreadPoolExecutor>() {
+ @Mock
+ void delayedExecute(RunnableScheduledFuture<?> task) {
+
+ }
+ };
+ ThreadPoolMonitor.attach(registry, threadPoolExecutor, "test");
+
+ PublishModelFactory factory = new PublishModelFactory(Lists.newArrayList(registry.iterator()));
+ DefaultPublishModel model = factory.createDefaultPublishModel();
+
+ Assert.assertEquals(
+ "{\"test\":{\"avgTaskCount\":0.0,\"avgCompletedTaskCount\":0.0,\"currentThreadsBusy\":0,\"maxThreads\":0,\"poolSize\":0,\"corePoolSize\":0,\"queueSize\":10}}",
+ JsonUtils.writeValueAsString(model.getThreadPools()));
+ }
+}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 02/09: SCB-422 metrics
shutdown when chassis close
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit f1a110eec3e5b26b5a07cd21a26380090794a39f
Author: wujimin <wu...@huawei.com>
AuthorDate: Wed Apr 4 09:05:08 2018 +0800
SCB-422 metrics shutdown when chassis close
---
.../foundation/metrics/MetricsBootstrap.java | 8 +++
.../foundation/metrics/MetricsInitializer.java | 8 +++
.../foundation/metrics/TestMetricsBootstrap.java | 58 +++++++++++++++++++---
.../metrics/core/MetricsBootListener.java | 2 +
4 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
index 0c6a523..335d7c5 100644
--- a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
+++ b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsBootstrap.java
@@ -16,6 +16,8 @@
*/
package org.apache.servicecomb.foundation.metrics;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -52,6 +54,12 @@ public class MetricsBootstrap {
public void shutdown() {
executorService.shutdown();
+
+ List<MetricsInitializer> initializers = new ArrayList<>(SPIServiceUtils.getSortedService(MetricsInitializer.class));
+ Collections.reverse(initializers);
+ initializers.forEach(initializer -> {
+ initializer.uninit();
+ });
}
protected void loadMetricsInitializers() {
diff --git a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsInitializer.java b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsInitializer.java
index 5e1aaef..3556576 100644
--- a/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsInitializer.java
+++ b/foundations/foundation-metrics/src/main/java/org/apache/servicecomb/foundation/metrics/MetricsInitializer.java
@@ -20,8 +20,16 @@ import com.google.common.eventbus.EventBus;
import com.netflix.spectator.api.CompositeRegistry;
public interface MetricsInitializer {
+ default int getOrder() {
+ return 0;
+ }
+
/**
* if create new registry, must add to globalRegistry
*/
void init(CompositeRegistry globalRegistry, EventBus eventBus, MetricsBootstrapConfig config);
+
+ default void uninit() {
+
+ }
}
diff --git a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
index b8280f4..a8fd7ec 100644
--- a/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
+++ b/foundations/foundation-metrics/src/test/java/org/apache/servicecomb/foundation/metrics/TestMetricsBootstrap.java
@@ -19,10 +19,10 @@ package org.apache.servicecomb.foundation.metrics;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.hamcrest.Matchers;
-import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -31,6 +31,7 @@ import com.google.common.eventbus.Subscribe;
import com.netflix.spectator.api.CompositeRegistry;
import com.netflix.spectator.api.Meter;
+import mockit.Deencapsulation;
import mockit.Expectations;
import mockit.Mocked;
@@ -42,11 +43,6 @@ public class TestMetricsBootstrap {
EventBus eventBus = new EventBus();
- @After
- public void teardown() {
- bootstrap.shutdown();
- }
-
@Test
public void loadMetricsInitializers() {
List<MetricsInitializer> initList = new ArrayList<>();
@@ -64,6 +60,7 @@ public class TestMetricsBootstrap {
};
bootstrap.start(globalRegistry, eventBus);
+ bootstrap.shutdown();
Assert.assertThat(initList, Matchers.contains(metricsInitializer, metricsInitializer));
}
@@ -89,7 +86,56 @@ public class TestMetricsBootstrap {
});
bootstrap.pollMeters();
+ bootstrap.shutdown();
Assert.assertEquals(meters, result.getMeters());
}
+
+ @Test
+ public void shutdown(@Mocked ScheduledExecutorService scheduledExecutorService) {
+ List<MetricsInitializer> uninitList = new ArrayList<>();
+ MetricsInitializer initializer1 = new MetricsInitializer() {
+ @Override
+ public int getOrder() {
+ return 1;
+ }
+
+ @Override
+ public void init(CompositeRegistry globalRegistry, EventBus eventBus, MetricsBootstrapConfig config) {
+ }
+
+ @Override
+ public void uninit() {
+ uninitList.add(this);
+ }
+ };
+
+ MetricsInitializer initializer2 = new MetricsInitializer() {
+ @Override
+ public int getOrder() {
+ return 2;
+ }
+
+ @Override
+ public void init(CompositeRegistry globalRegistry, EventBus eventBus, MetricsBootstrapConfig config) {
+ }
+
+ @Override
+ public void uninit() {
+ uninitList.add(this);
+ }
+ };
+
+ new Expectations(SPIServiceUtils.class) {
+ {
+ SPIServiceUtils.getSortedService(MetricsInitializer.class);
+ result = Arrays.asList(initializer1, initializer2);
+ }
+ };
+ Deencapsulation.setField(bootstrap, "executorService", scheduledExecutorService);
+
+ bootstrap.shutdown();
+
+ Assert.assertThat(uninitList, Matchers.contains(initializer2, initializer1));
+ }
}
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java
index 289c879..51b7bfc 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsBootListener.java
@@ -48,6 +48,8 @@ public class MetricsBootListener implements BootListener {
case AFTER_REGISTRY:
metricsBootstrap.start(Spectator.globalRegistry(), EventManager.getEventBus());
break;
+ case BEFORE_CLOSE:
+ metricsBootstrap.shutdown();
default:
break;
}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 08/09: SCB-422 avoid random UT
fail
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 7ecb066571eed787b299dc510092939fa58af155
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue Apr 3 11:03:34 2018 +0800
SCB-422 avoid random UT fail
---
.../client/http/TestAbstractClientPool.java | 102 +++++++++++++++++++++
.../client/http/TestClientPool.java | 59 ------------
.../client/http/TestHttpClientPool.java | 88 ++++++++++++++++++
.../client/http/TestServiceRegistryClientImpl.java | 13 ---
.../client/http/TestWebsocketClientPool.java | 56 +++++++++++
5 files changed, 246 insertions(+), 72 deletions(-)
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestAbstractClientPool.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestAbstractClientPool.java
new file mode 100644
index 0000000..56b609b
--- /dev/null
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestAbstractClientPool.java
@@ -0,0 +1,102 @@
+/*
+ * 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.servicecomb.serviceregistry.client.http;
+
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.apache.servicecomb.foundation.vertx.VertxUtils;
+import org.apache.servicecomb.foundation.vertx.client.ClientPoolManager;
+import org.apache.servicecomb.foundation.vertx.client.ClientVerticle;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.DeploymentOptions;
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+
+public class TestAbstractClientPool {
+ @Mocked
+ Vertx vertx;
+
+ String vertxName;
+
+ VertxOptions vertxOptions;
+
+ Class<?> verticleCls;
+
+ DeploymentOptions deployOptions;
+
+
+ @Before
+ public void setup() {
+ new MockUp<VertxUtils>() {
+ @Mock
+ Vertx getOrCreateVertxByName(String name, VertxOptions vertxOptions) {
+ TestAbstractClientPool.this.vertxName = name;
+ TestAbstractClientPool.this.vertxOptions = vertxOptions;
+
+ return vertx;
+ }
+
+ @Mock
+ <VERTICLE extends AbstractVerticle> boolean blockDeploy(Vertx vertx,
+ Class<VERTICLE> cls,
+ DeploymentOptions options) {
+ TestAbstractClientPool.this.verticleCls = cls;
+ TestAbstractClientPool.this.deployOptions = options;
+
+ return true;
+ }
+ };
+ ArchaiusUtils.resetConfig();
+ }
+
+ @After
+ public void teardown() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @Test
+ public void create() {
+ HttpClientPool.INSTANCE.create();
+
+ Assert.assertEquals("registry", vertxName);
+ Assert.assertEquals(
+ "{"
+ + "\"cacheMaxTimeToLive\":2147483647,"
+ + "\"cacheMinTimeToLive\":0,"
+ + "\"cacheNegativeTimeToLive\":0,"
+ + "\"maxQueries\":4,"
+ + "\"ndots\":0,"
+ + "\"optResourceEnabled\":true,"
+ + "\"queryTimeout\":5000,"
+ + "\"rdFlag\":true,"
+ + "\"rotateServers\":false"
+ + "}",
+ vertxOptions.getAddressResolverOptions().toJson().toString());
+
+ Assert.assertEquals(ClientVerticle.class, verticleCls);
+ Assert.assertEquals(ClientPoolManager.class,
+ deployOptions.getConfig().getValue(ClientVerticle.CLIENT_MGR).getClass());
+ System.out.println(deployOptions);
+ }
+}
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientPool.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientPool.java
deleted file mode 100644
index 3f80108..0000000
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientPool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.serviceregistry.client.http;
-
-import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
-import org.junit.Test;
-
-import io.vertx.core.http.HttpVersion;
-import mockit.Mock;
-import mockit.MockUp;
-
-public class TestClientPool {
- @Test
- public void testHttpClientPool() {
- new MockUp<ServiceRegistryConfig>() {
- @Mock
- public HttpVersion getHttpVersion() {
- return HttpVersion.HTTP_2;
- }
-
- @Mock
- public boolean isSsl() {
- return true;
- }
- };
- HttpClientPool.INSTANCE.create();
- }
-
- @Test
- public void testWebsocketClientPool() {
- new MockUp<ServiceRegistryConfig>() {
- @Mock
- public HttpVersion getHttpVersion() {
- return HttpVersion.HTTP_2;
- }
-
- @Mock
- public boolean isSsl() {
- return true;
- }
- };
- WebsocketClientPool.INSTANCE.create();
- }
-}
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestHttpClientPool.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestHttpClientPool.java
new file mode 100644
index 0000000..e4ddb79
--- /dev/null
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestHttpClientPool.java
@@ -0,0 +1,88 @@
+/*
+ * 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.servicecomb.serviceregistry.client.http;
+
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.HttpVersion;
+
+public class TestHttpClientPool {
+ @Before
+ public void setup() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @After
+ public void teardown() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @Test
+ public void createHttpClientOptions_proxy() {
+ ArchaiusUtils.setProperty(ServiceRegistryConfig.PROXY_ENABLE, "true");
+ ArchaiusUtils.setProperty(ServiceRegistryConfig.PROXY_HOST, "host");
+ ArchaiusUtils.setProperty(ServiceRegistryConfig.PROXY_PORT, "1234");
+ ArchaiusUtils.setProperty(ServiceRegistryConfig.PROXY_USERNAME, "user");
+ ArchaiusUtils.setProperty(ServiceRegistryConfig.PROXY_PASSWD, "pass");
+
+ HttpClientOptions httpClientOptions = HttpClientPool.INSTANCE.createHttpClientOptions();
+
+ Assert.assertEquals(
+ "{"
+ + "\"host\":\"host\","
+ + "\"password\":\"pass\","
+ + "\"port\":1234,"
+ + "\"type\":\"HTTP\","
+ + "\"username\":\"user\""
+ + "}",
+ httpClientOptions.getProxyOptions().toJson().toString());
+ }
+
+ @Test
+ public void createHttpClientOptions_noProxy() {
+ ArchaiusUtils.setProperty(ServiceRegistryConfig.PROXY_ENABLE, "false");
+
+ HttpClientOptions httpClientOptions = HttpClientPool.INSTANCE.createHttpClientOptions();
+
+ Assert.assertNull(httpClientOptions.getProxyOptions());
+ }
+
+ @Test
+ public void createHttpClientOptions_http2() {
+ ArchaiusUtils.setProperty("cse.service.registry.client.httpVersion", HttpVersion.HTTP_2.name());
+
+ HttpClientOptions httpClientOptions = HttpClientPool.INSTANCE.createHttpClientOptions();
+
+ Assert.assertEquals(HttpVersion.HTTP_2, httpClientOptions.getProtocolVersion());
+ Assert.assertFalse(httpClientOptions.isHttp2ClearTextUpgrade());
+ }
+
+ @Test
+ public void createHttpClientOptions_notHttp2() {
+ HttpClientOptions httpClientOptions = HttpClientPool.INSTANCE.createHttpClientOptions();
+
+ Assert.assertEquals(HttpVersion.HTTP_1_1, httpClientOptions.getProtocolVersion());
+ Assert.assertTrue(httpClientOptions.isHttp2ClearTextUpgrade());
+ }
+}
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
index 23bdf94..925f77c 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
@@ -38,7 +38,6 @@ import org.apache.servicecomb.serviceregistry.api.response.GetExistenceResponse;
import org.apache.servicecomb.serviceregistry.client.ClientException;
import org.apache.servicecomb.serviceregistry.client.IpPortManager;
import org.apache.servicecomb.serviceregistry.client.http.ServiceRegistryClientImpl.ResponseWrapper;
-import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -49,7 +48,6 @@ import io.vertx.core.Handler;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.HttpClientOptions;
import io.vertx.core.http.HttpClientResponse;
-import io.vertx.core.http.HttpVersion;
import mockit.Deencapsulation;
import mockit.Expectations;
import mockit.Mock;
@@ -90,17 +88,6 @@ public class TestServiceRegistryClientImpl {
Microservice microservice = microserviceFactory.create("app", "ms");
oClient.registerMicroservice(microservice);
oClient.registerMicroserviceInstance(microservice.getInstance());
- new MockUp<ServiceRegistryConfig>() {
- @Mock
- public HttpVersion getHttpVersion() {
- return HttpVersion.HTTP_2;
- }
-
- @Mock
- public boolean isSsl() {
- return true;
- }
- };
try {
oClient.init();
HttpClientOptions httpClientOptions = Deencapsulation.invoke(oClient, "createHttpClientOptions");
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestWebsocketClientPool.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestWebsocketClientPool.java
new file mode 100644
index 0000000..9c31e64
--- /dev/null
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestWebsocketClientPool.java
@@ -0,0 +1,56 @@
+/*
+ * 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.servicecomb.serviceregistry.client.http;
+
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.HttpVersion;
+
+public class TestWebsocketClientPool {
+ @Before
+ public void setup() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @After
+ public void teardown() {
+ ArchaiusUtils.resetConfig();
+ }
+
+ @Test
+ public void createHttpClientOptions_http2() {
+ ArchaiusUtils.setProperty("cse.service.registry.client.httpVersion", HttpVersion.HTTP_2.name());
+
+ HttpClientOptions httpClientOptions = WebsocketClientPool.INSTANCE.createHttpClientOptions();
+
+ Assert.assertEquals(HttpVersion.HTTP_2, httpClientOptions.getProtocolVersion());
+ Assert.assertFalse(httpClientOptions.isHttp2ClearTextUpgrade());
+ }
+
+ @Test
+ public void createHttpClientOptions_notHttp2() {
+ HttpClientOptions httpClientOptions = WebsocketClientPool.INSTANCE.createHttpClientOptions();
+
+ Assert.assertEquals(HttpVersion.HTTP_1_1, httpClientOptions.getProtocolVersion());
+ Assert.assertTrue(httpClientOptions.isHttp2ClearTextUpgrade());
+ }
+}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 03/09: SCB-422 split create
registry and create invocation meters to different initializer
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 8a7cc9f03a4a5379ca22ca16c757db165f3624aa
Author: wujimin <wu...@huawei.com>
AuthorDate: Wed Apr 4 09:05:33 2018 +0800
SCB-422 split create registry and create invocation meters to different initializer
---
.../metrics/core/DefaultRegistryInitializer.java | 64 ++++++++++++++++++++++
...lizer.java => InvocationMetersInitializer.java} | 24 +++-----
...rvicecomb.foundation.metrics.MetricsInitializer | 3 +-
.../core/TestDefaultRegistryInitializer.java | 57 +++++++++++++++++++
...r.java => TestInvocationMetersInitializer.java} | 39 ++++++-------
5 files changed, 150 insertions(+), 37 deletions(-)
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultRegistryInitializer.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultRegistryInitializer.java
new file mode 100644
index 0000000..64650de
--- /dev/null
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultRegistryInitializer.java
@@ -0,0 +1,64 @@
+/*
+ * 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.servicecomb.metrics.core;
+
+import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
+import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
+
+import com.google.common.eventbus.EventBus;
+import com.netflix.servo.DefaultMonitorRegistry;
+import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.servo.ServoRegistry;
+
+public class DefaultRegistryInitializer implements MetricsInitializer {
+ public static final String METRICS_WINDOW_TIME = "servicecomb.metrics.window_time";
+
+ public static final int DEFAULT_METRICS_WINDOW_TIME = 5000;
+
+ public static final String SERVO_POLLERS = "servo.pollers";
+
+ private CompositeRegistry globalRegistry;
+
+ private ServoRegistry registry;
+
+ // create registry before init meters
+ @Override
+ public int getOrder() {
+ return -10;
+ }
+
+ @Override
+ public void init(CompositeRegistry globalRegistry, EventBus eventBus, MetricsBootstrapConfig config) {
+ this.globalRegistry = globalRegistry;
+
+ System.getProperties().setProperty(SERVO_POLLERS, String.valueOf(config.getMsPollInterval()));
+ registry = new ServoRegistry();
+
+ globalRegistry.add(registry);
+ }
+
+ @Override
+ public void uninit() {
+ DefaultMonitorRegistry.getInstance().unregister(registry);
+ globalRegistry.remove(registry);
+ }
+
+ public Registry getRegistry() {
+ return registry;
+ }
+}
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultMetricsInitializer.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/InvocationMetersInitializer.java
similarity index 78%
rename from metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultMetricsInitializer.java
rename to metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/InvocationMetersInitializer.java
index 12e090e..e040ec2 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/DefaultMetricsInitializer.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/InvocationMetersInitializer.java
@@ -19,6 +19,7 @@ package org.apache.servicecomb.metrics.core;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
import org.apache.servicecomb.core.event.InvocationStartEvent;
+import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
import org.apache.servicecomb.metrics.core.meter.ConsumerMeters;
@@ -30,35 +31,24 @@ import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import com.netflix.spectator.api.CompositeRegistry;
import com.netflix.spectator.api.Registry;
-import com.netflix.spectator.servo.ServoRegistry;
-
-public class DefaultMetricsInitializer implements MetricsInitializer {
- public static final String METRICS_WINDOW_TIME = "servicecomb.metrics.window_time";
-
- public static final int DEFAULT_METRICS_WINDOW_TIME = 5000;
-
- private Registry registry;
+public class InvocationMetersInitializer implements MetricsInitializer {
private ConsumerMeters consumerMeters;
private ProducerMeters producerMeters;
@Override
public void init(CompositeRegistry globalRegistry, EventBus eventBus, MetricsBootstrapConfig config) {
- registry = createRegistry(config);
+ DefaultRegistryInitializer defaultRegistryInitializer =
+ SPIServiceUtils.getTargetService(MetricsInitializer.class, DefaultRegistryInitializer.class);
+ Registry registry = defaultRegistryInitializer.getRegistry();
- this.consumerMeters = new ConsumerMeters(registry);
- this.producerMeters = new ProducerMeters(registry);
+ consumerMeters = new ConsumerMeters(registry);
+ producerMeters = new ProducerMeters(registry);
- globalRegistry.add(registry);
eventBus.register(this);
}
- protected Registry createRegistry(MetricsBootstrapConfig config) {
- System.getProperties().setProperty("servo.pollers", String.valueOf(config.getMsPollInterval()));
- return new ServoRegistry();
- }
-
protected AbstractInvocationMeters findInvocationMeters(Invocation invocation) {
if (invocation.isConsumer()) {
return consumerMeters.getInvocationMeters();
diff --git a/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer b/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer
index fb6c466..ecd13da 100644
--- a/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer
+++ b/metrics/metrics-core/src/main/resources/META-INF/services/org.apache.servicecomb.foundation.metrics.MetricsInitializer
@@ -15,6 +15,7 @@
# limitations under the License.
#
-org.apache.servicecomb.metrics.core.DefaultMetricsInitializer
+org.apache.servicecomb.metrics.core.DefaultRegistryInitializer
+org.apache.servicecomb.metrics.core.InvocationMetersInitializer
org.apache.servicecomb.metrics.core.publish.DefaultLogPublisher
org.apache.servicecomb.metrics.core.publish.MetricsRestPublisher
\ No newline at end of file
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java
new file mode 100644
index 0000000..8692a80
--- /dev/null
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultRegistryInitializer.java
@@ -0,0 +1,57 @@
+/*
+ * 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.servicecomb.metrics.core;
+
+import java.util.List;
+
+import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.google.common.eventbus.EventBus;
+import com.netflix.servo.DefaultMonitorRegistry;
+import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.ManualClock;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.SpectatorUtils;
+import com.netflix.spectator.servo.ServoRegistry;
+
+import mockit.Deencapsulation;
+
+public class TestDefaultRegistryInitializer {
+ CompositeRegistry globalRegistry = SpectatorUtils.createCompositeRegistry(new ManualClock());
+
+ List<Registry> registries = Deencapsulation.getField(globalRegistry, "registries");
+
+ DefaultRegistryInitializer registryInitializer = new DefaultRegistryInitializer();
+
+ @Test
+ public void init() {
+ registryInitializer.init(globalRegistry, new EventBus(), new MetricsBootstrapConfig());
+
+ Assert.assertEquals(-10, registryInitializer.getOrder());
+ Assert.assertThat(registryInitializer.getRegistry(), Matchers.instanceOf(ServoRegistry.class));
+ Assert.assertEquals(1, registries.size());
+ Assert.assertEquals(1, DefaultMonitorRegistry.getInstance().getRegisteredMonitors().size());
+
+ registryInitializer.uninit();
+
+ Assert.assertEquals(0, registries.size());
+ Assert.assertEquals(0, DefaultMonitorRegistry.getInstance().getRegisteredMonitors().size());
+ }
+}
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultMetricsInitializer.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java
similarity index 82%
rename from metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultMetricsInitializer.java
rename to metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java
index 2c48866..e990e9c 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestDefaultMetricsInitializer.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestInvocationMetersInitializer.java
@@ -19,7 +19,8 @@ package org.apache.servicecomb.metrics.core;
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.event.InvocationFinishEvent;
-import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
+import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
+import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementGroupConfig;
import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementTree;
import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst;
@@ -30,40 +31,40 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
-import com.netflix.spectator.api.CompositeRegistry;
import com.netflix.spectator.api.DefaultRegistry;
import com.netflix.spectator.api.ManualClock;
import com.netflix.spectator.api.Registry;
-import com.netflix.spectator.api.SpectatorUtils;
import mockit.Expectations;
import mockit.Mocked;
-public class TestDefaultMetricsInitializer {
+public class TestInvocationMetersInitializer {
EventBus eventBus = new EventBus();
- ManualClock clock = new ManualClock();
+ Registry registry = new DefaultRegistry(new ManualClock());
- CompositeRegistry globalRegistry = SpectatorUtils.createCompositeRegistry(new ManualClock());
-
- DefaultMetricsInitializer metricsInitializer = new DefaultMetricsInitializer() {
- protected Registry createRegistry(MetricsBootstrapConfig config) {
- return new DefaultRegistry(new ManualClock());
- };
- };
-
- MetricsBootstrapConfig config = new MetricsBootstrapConfig();
+ InvocationMetersInitializer invocationMetersInitializer = new InvocationMetersInitializer();
@Mocked
- private Invocation invocation;
+ Invocation invocation;
@Mocked
- private Response response;
+ Response response;
+ @Mocked
+ DefaultRegistryInitializer defaultRegistryInitializer;
@Before
public void setup() {
- metricsInitializer.init(globalRegistry, eventBus, config);
+ new Expectations(SPIServiceUtils.class) {
+ {
+ SPIServiceUtils.getTargetService(MetricsInitializer.class, DefaultRegistryInitializer.class);
+ result = defaultRegistryInitializer;
+ defaultRegistryInitializer.getRegistry();
+ result = registry;
+ }
+ };
+ invocationMetersInitializer.init(null, eventBus, null);
}
@Test
@@ -91,7 +92,7 @@ public class TestDefaultMetricsInitializer {
eventBus.post(event);
MeasurementTree tree = new MeasurementTree();
- tree.from(globalRegistry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
+ tree.from(registry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
Assert.assertEquals(
"[Measurement(servicecomb.invocation:operation=m.s.o:role=CONSUMER:stage=total:statistic=count:status=0:transport=rest,0,2.0), "
+ "Measurement(servicecomb.invocation:operation=m.s.o:role=CONSUMER:stage=total:statistic=totalTime:status=0:transport=rest,0,18.0)]",
@@ -125,7 +126,7 @@ public class TestDefaultMetricsInitializer {
eventBus.post(event);
MeasurementTree tree = new MeasurementTree();
- tree.from(globalRegistry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
+ tree.from(registry.iterator(), new MeasurementGroupConfig(MeterInvocationConst.INVOCATION_NAME));
Assert.assertEquals(
"[Measurement(servicecomb.invocation:operation=m.s.o:role=PRODUCER:stage=execution:statistic=count:status=0:transport=rest,0,2.0), "
+ "Measurement(servicecomb.invocation:operation=m.s.o:role=PRODUCER:stage=execution:statistic=totalTime:status=0:transport=rest,0,14.0), "
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 09/09: SCB-422 delete random
failed test case
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit f65a9b3e21bbe7ac5dfaa90523b5bcc48a3d129d
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue Apr 3 17:09:49 2018 +0800
SCB-422 delete random failed test case
---
.../metrics/core/TestAnMonitorManager.java | 114 ++++++++++-----------
1 file changed, 57 insertions(+), 57 deletions(-)
diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestAnMonitorManager.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestAnMonitorManager.java
index 80e5196..0fe669a 100644
--- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestAnMonitorManager.java
+++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/TestAnMonitorManager.java
@@ -41,7 +41,7 @@ public class TestAnMonitorManager {
private static MetricsLoader currentWindowMetricsLoader;
- private static MetricsLoader nextWindowMetricsLoader;
+ // private static MetricsLoader nextWindowMetricsLoader;
@BeforeClass
public static void setup() throws InterruptedException {
@@ -90,7 +90,7 @@ public class TestAnMonitorManager {
Thread.sleep(2000);
metrics = MonitorManager.getInstance().measure();
- nextWindowMetricsLoader = new MetricsLoader(metrics);
+// nextWindowMetricsLoader = new MetricsLoader(metrics);
}
@Test
@@ -152,48 +152,48 @@ public class TestAnMonitorManager {
@Test
public void checkFun1Max() {
- MetricNode node = nextWindowMetricsLoader
- .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
- MetricsConst.TAG_STAGE);
- MetricNode node1_queue = node.getChildrenNode("fun1")
- .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
- .getChildrenNode(MetricsConst.STAGE_QUEUE);
- MetricNode node1_queue_status = new MetricNode(node1_queue.getMetrics(), MetricsConst.TAG_STATUS);
- Assert.assertEquals(300,
- node1_queue_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
- Assert.assertEquals(300,
- node1_queue_status.getChildrenNode("500").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
-
- MetricNode node1_exec = node.getChildrenNode("fun1")
- .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
- .getChildrenNode(MetricsConst.STAGE_EXECUTION);
- MetricNode node1_exec_status = new MetricNode(node1_exec.getMetrics(), MetricsConst.TAG_STATUS);
- Assert.assertEquals(400,
- node1_exec_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
- Assert.assertEquals(400,
- node1_exec_status.getChildrenNode("500").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
-
- MetricNode node1_whole = node.getChildrenNode("fun1")
- .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
- .getChildrenNode(MetricsConst.STAGE_TOTAL);
- MetricNode node1_whole_status = new MetricNode(node1_whole.getMetrics(), MetricsConst.TAG_STATUS);
- Assert.assertEquals(700,
- node1_whole_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
- Assert.assertEquals(700,
- node1_whole_status.getChildrenNode("500").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ // MetricNode node = nextWindowMetricsLoader
+ // .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
+ // MetricsConst.TAG_STAGE);
+ // MetricNode node1_queue = node.getChildrenNode("fun1")
+ // .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
+ // .getChildrenNode(MetricsConst.STAGE_QUEUE);
+ // MetricNode node1_queue_status = new MetricNode(node1_queue.getMetrics(), MetricsConst.TAG_STATUS);
+ // Assert.assertEquals(300,
+ // node1_queue_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ // Assert.assertEquals(300,
+ // node1_queue_status.getChildrenNode("500").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ //
+ // MetricNode node1_exec = node.getChildrenNode("fun1")
+ // .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
+ // .getChildrenNode(MetricsConst.STAGE_EXECUTION);
+ // MetricNode node1_exec_status = new MetricNode(node1_exec.getMetrics(), MetricsConst.TAG_STATUS);
+ // Assert.assertEquals(400,
+ // node1_exec_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ // Assert.assertEquals(400,
+ // node1_exec_status.getChildrenNode("500").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ //
+ // MetricNode node1_whole = node.getChildrenNode("fun1")
+ // .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
+ // .getChildrenNode(MetricsConst.STAGE_TOTAL);
+ // MetricNode node1_whole_status = new MetricNode(node1_whole.getMetrics(), MetricsConst.TAG_STATUS);
+ // Assert.assertEquals(700,
+ // node1_whole_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ // Assert.assertEquals(700,
+ // node1_whole_status.getChildrenNode("500").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
}
@Test
public void checkFun1Tps() {
- MetricNode node = nextWindowMetricsLoader
- .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
- MetricsConst.TAG_STAGE);
- MetricNode node1_whole = node.getChildrenNode("fun1")
- .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
- .getChildrenNode(MetricsConst.STAGE_TOTAL);
- MetricNode node1_whole_status = new MetricNode(node1_whole.getMetrics(), MetricsConst.TAG_STATUS);
- Assert.assertEquals(1, node1_whole_status.getChildrenNode("200").getMatchStatisticMetricValue("tps"), 0);
- Assert.assertEquals(0.5, node1_whole_status.getChildrenNode("500").getMatchStatisticMetricValue("tps"), 0);
+ // MetricNode node = nextWindowMetricsLoader
+ // .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
+ // MetricsConst.TAG_STAGE);
+ // MetricNode node1_whole = node.getChildrenNode("fun1")
+ // .getChildrenNode(String.valueOf(InvocationType.PRODUCER).toLowerCase())
+ // .getChildrenNode(MetricsConst.STAGE_TOTAL);
+ // MetricNode node1_whole_status = new MetricNode(node1_whole.getMetrics(), MetricsConst.TAG_STATUS);
+ // Assert.assertEquals(1, node1_whole_status.getChildrenNode("200").getMatchStatisticMetricValue("tps"), 0);
+ // Assert.assertEquals(0.5, node1_whole_status.getChildrenNode("500").getMatchStatisticMetricValue("tps"), 0);
}
@Test
@@ -223,27 +223,27 @@ public class TestAnMonitorManager {
@Test
public void checkFun2Tps() {
- MetricNode node = nextWindowMetricsLoader
- .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
- MetricsConst.TAG_STAGE);
- MetricNode node2_whole = node.getChildrenNode("fun2")
- .getChildrenNode(String.valueOf(InvocationType.CONSUMER).toLowerCase())
- .getChildrenNode(MetricsConst.STAGE_TOTAL);
- MetricNode node2_whole_status = new MetricNode(node2_whole.getMetrics(), MetricsConst.TAG_STATUS);
- Assert.assertEquals(0.5, node2_whole_status.getChildrenNode("200").getMatchStatisticMetricValue("tps"), 0);
+ // MetricNode node = nextWindowMetricsLoader
+ // .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
+ // MetricsConst.TAG_STAGE);
+ // MetricNode node2_whole = node.getChildrenNode("fun2")
+ // .getChildrenNode(String.valueOf(InvocationType.CONSUMER).toLowerCase())
+ // .getChildrenNode(MetricsConst.STAGE_TOTAL);
+ // MetricNode node2_whole_status = new MetricNode(node2_whole.getMetrics(), MetricsConst.TAG_STATUS);
+ // Assert.assertEquals(0.5, node2_whole_status.getChildrenNode("200").getMatchStatisticMetricValue("tps"), 0);
}
@Test
public void checkFun2Max() {
- MetricNode node = nextWindowMetricsLoader
- .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
- MetricsConst.TAG_STAGE);
- MetricNode node2_whole = node.getChildrenNode("fun2")
- .getChildrenNode(String.valueOf(InvocationType.CONSUMER).toLowerCase())
- .getChildrenNode(MetricsConst.STAGE_TOTAL);
- MetricNode node2_whole_status = new MetricNode(node2_whole.getMetrics(), MetricsConst.TAG_STATUS);
- Assert.assertEquals(300,
- node2_whole_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
+ // MetricNode node = nextWindowMetricsLoader
+ // .getMetricTree(MetricsConst.SERVICECOMB_INVOCATION, MetricsConst.TAG_OPERATION, MetricsConst.TAG_ROLE,
+ // MetricsConst.TAG_STAGE);
+ // MetricNode node2_whole = node.getChildrenNode("fun2")
+ // .getChildrenNode(String.valueOf(InvocationType.CONSUMER).toLowerCase())
+ // .getChildrenNode(MetricsConst.STAGE_TOTAL);
+ // MetricNode node2_whole_status = new MetricNode(node2_whole.getMetrics(), MetricsConst.TAG_STATUS);
+ // Assert.assertEquals(300,
+ // node2_whole_status.getChildrenNode("200").getMatchStatisticMetricValue(TimeUnit.MILLISECONDS, "max"), 0);
}
@Test
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.
[incubator-servicecomb-java-chassis] 05/09: SCB-422 define
threadPool publish model
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 02e392a9859d7d56e104473f657256fb0e792437
Author: wujimin <wu...@huawei.com>
AuthorDate: Mon Apr 2 11:30:07 2018 +0800
SCB-422 define threadPool publish model
---
.../core/publish/model/DefaultPublishModel.java | 21 +++++
.../core/publish/model/ThreadPoolPublishModel.java | 89 ++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/DefaultPublishModel.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/DefaultPublishModel.java
index 8258425..b33ab58 100644
--- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/DefaultPublishModel.java
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/DefaultPublishModel.java
@@ -16,16 +16,37 @@
*/
package org.apache.servicecomb.metrics.core.publish.model;
+import java.util.HashMap;
+import java.util.Map;
+
public class DefaultPublishModel {
private ConsumerPublishModel consumer = new ConsumerPublishModel();
private ProducerPublishModel producer = new ProducerPublishModel();
+ private Map<String, ThreadPoolPublishModel> threadPools = new HashMap<>();
+
public ConsumerPublishModel getConsumer() {
return consumer;
}
+ public void setConsumer(ConsumerPublishModel consumer) {
+ this.consumer = consumer;
+ }
+
public ProducerPublishModel getProducer() {
return producer;
}
+
+ public void setProducer(ProducerPublishModel producer) {
+ this.producer = producer;
+ }
+
+ public Map<String, ThreadPoolPublishModel> getThreadPools() {
+ return threadPools;
+ }
+
+ public void setThreadPools(Map<String, ThreadPoolPublishModel> threadPools) {
+ this.threadPools = threadPools;
+ }
}
diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/ThreadPoolPublishModel.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/ThreadPoolPublishModel.java
new file mode 100644
index 0000000..70c288b
--- /dev/null
+++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/model/ThreadPoolPublishModel.java
@@ -0,0 +1,89 @@
+/*
+ * 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.servicecomb.metrics.core.publish.model;
+
+public class ThreadPoolPublishModel {
+ private double avgTaskCount;
+
+ private double avgCompletedTaskCount;
+
+ private int currentThreadsBusy;
+
+ private int maxThreads;
+
+ private int poolSize;
+
+ private int corePoolSize;
+
+ private int queueSize;
+
+ public double getAvgTaskCount() {
+ return avgTaskCount;
+ }
+
+ public void setAvgTaskCount(double avgTaskCount) {
+ this.avgTaskCount = avgTaskCount;
+ }
+
+ public double getAvgCompletedTaskCount() {
+ return avgCompletedTaskCount;
+ }
+
+ public void setAvgCompletedTaskCount(double avgCompletedTaskCount) {
+ this.avgCompletedTaskCount = avgCompletedTaskCount;
+ }
+
+ public int getCurrentThreadsBusy() {
+ return currentThreadsBusy;
+ }
+
+ public void setCurrentThreadsBusy(int currentThreadsBusy) {
+ this.currentThreadsBusy = currentThreadsBusy;
+ }
+
+ public int getMaxThreads() {
+ return maxThreads;
+ }
+
+ public void setMaxThreads(int maxThreads) {
+ this.maxThreads = maxThreads;
+ }
+
+ public int getPoolSize() {
+ return poolSize;
+ }
+
+ public void setPoolSize(int poolSize) {
+ this.poolSize = poolSize;
+ }
+
+ public int getCorePoolSize() {
+ return corePoolSize;
+ }
+
+ public void setCorePoolSize(int corePoolSize) {
+ this.corePoolSize = corePoolSize;
+ }
+
+ public int getQueueSize() {
+ return queueSize;
+ }
+
+ public void setQueueSize(int queueSize) {
+ this.queueSize = queueSize;
+ }
+}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.