Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement metrics for thread pool suppliers #3630

Merged
merged 21 commits into from
Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6bf75b7
Add SPI for observers of thread pool suppliers
tjquinno Nov 9, 2021
d2fae47
Add logic to thread pool suppliers to notify observers when they are …
tjquinno Nov 9, 2021
6b6db63
Update module-info
tjquinno Nov 9, 2021
01d2b39
Update tests to check observability
tjquinno Nov 9, 2021
f7f7b06
Update metrics to add an observer of thread pool suppliers to registe…
tjquinno Nov 9, 2021
2e05157
Fix style issues
tjquinno Nov 9, 2021
8556397
change category name to ad-hoc for ThreadPoolSupplier
tjquinno Nov 9, 2021
71ff087
Do some further initialization, primarily for multiple tests in the s…
tjquinno Nov 9, 2021
38687a8
For supplier names ending in '-' append unique number to make metrics…
tjquinno Nov 9, 2021
91abc9c
Revise the bookkeeping for thread pool suppliers which register with …
tjquinno Nov 10, 2021
7380d3c
Update how metrics are created using the new identification scheme fo…
tjquinno Nov 10, 2021
4650854
Change how NonJaxRsResource shuts down its thread pool
tjquinno Nov 10, 2021
e5613ca
Defer creating MethodInvocation info that uses the VirtualExecutorUti…
tjquinno Nov 10, 2021
58026fe
Add some comments, removed unused commented code
tjquinno Nov 10, 2021
3a1b7c7
Remove unneeded cleanup code
tjquinno Nov 10, 2021
ed2bda8
Add trailing newline
tjquinno Nov 10, 2021
0a5a005
Remove import from module-info
tjquinno Nov 10, 2021
985ce12
Imporove some JavaDoc
tjquinno Nov 10, 2021
16933cf
Remove some unused code
tjquinno Nov 11, 2021
7565510
Update the metrics guides to discuss the thread pool metrics
tjquinno Nov 11, 2021
da7476a
Address review comments
tjquinno Nov 11, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
/*
* Copyright (c) 2021 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.helidon.common.configurable;

import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;

import io.helidon.common.LazyValue;
import io.helidon.common.configurable.spi.ExecutorServiceSupplierObserver;

/**
* Central coordination point between executor service suppliers and observers of them.
* <p>
* Each executor service supplier should:
* <ul>
* <li>from its constructor, register with this class by invoking one of the
* {@code #registerSupplier} methods,</li>
* <li>notify this class whenever it creates a new executor service by invoking
* {@link #registerExecutorService(java.util.function.Supplier, java.util.concurrent.ExecutorService)}, and</li>
* <li>notify this class whenever it shuts down an executor service by invoking
* {@link #unregisterExecutorService(java.util.concurrent.ExecutorService)}.</li>
* </ul>
* </p>
*/
class ObserverManager {

private static final Logger LOGGER = Logger.getLogger(ObserverManager.class.getName());

private static final LazyValue<List<ExecutorServiceSupplierObserver>> OBSERVERS = LazyValue
.create(ObserverManager::loadObservers);

private static final Map<Supplier<? extends ExecutorService>, SupplierInfo> SUPPLIERS = new ConcurrentHashMap<>();

// A given supplier category can have multiple suppliers, so keep track of the next available index by category.
private static final Map<String, AtomicInteger> SUPPLIER_CATEGORY_NEXT_INDEX_VALUES = new ConcurrentHashMap<>();

private static final Map<ExecutorService, SupplierInfo> EXECUTOR_SERVICES = new ConcurrentHashMap<>();

// Defer building list until use to avoid loading problems if this JDK does not support ThreadPerTaskExecutor.
private static final LazyValue<List<ExecutorServiceSupplierObserver.MethodInvocation>> METRICS_RELATED_METHOD_INVOCATIONS =
LazyValue.create(() -> List.of(
MethodInvocationImpl.create("Thread count", "thread-count", "threadCount")));

private ObserverManager() {
}

/**
* Registers a supplier which might provide thread-per-task thread pools.
*
* @param supplier the supplier of {@code ExecutorService} instances
* @param supplierCategory category of the supplier (e.g., scheduled, server)
* @param executorServiceCategory category of executor services the supplier creates (e.g., ad-hoc)
* @param useVirtualThreads whether virtual threads should be used
*/
static void registerSupplier(Supplier<? extends ExecutorService> supplier,
String supplierCategory,
String executorServiceCategory,
boolean useVirtualThreads) {
int supplierIndex = SUPPLIER_CATEGORY_NEXT_INDEX_VALUES.computeIfAbsent(supplierCategory, key -> new AtomicInteger())
.getAndIncrement();
SUPPLIERS.computeIfAbsent(supplier,
s -> SupplierInfo.create(s,
executorServiceCategory,
supplierCategory,
supplierIndex,
useVirtualThreads));
}

/**
* Registers a supplier which will never use thread-per-task thread pools.
*
* @param supplier the supplier of {@code ExecutorService} instances
* @param supplierCategory category of the supplier (e.g., server, scheduled)
* @param executorServiceCategory category of thread pools which the supplier provides
*/
static void registerSupplier(Supplier<? extends ExecutorService> supplier,
String supplierCategory,
String executorServiceCategory) {
registerSupplier(supplier, supplierCategory, executorServiceCategory, false);
}

/**
* Registers an executor service from a supplier.
*
* @param supplier the supplier registering the executor service
* @param executorService the executor service being registered
* @param <E> type of the executor service being registered
* @return the same executor service being registered
* @throws IllegalStateException if the supplier has not previously registered itself
*/
static <E extends ExecutorService> E registerExecutorService(Supplier<E> supplier, E executorService) {
SupplierInfo supplierInfo = SUPPLIERS.get(supplier);
if (supplierInfo == null) {
throw new IllegalStateException("Attempt to register an executor service to an unregistered supplier");
}
supplierInfo.registerExecutorService(executorService);
return executorService;
}

/**
* Unregisters a previously-registered executor service that is being shut down.
* <p>
* During production, the executor service would have been previously registered by a supplier. But during testing that
* is not always the case.
* </p>
* @param executorService the executor service being shut down
*/
static void unregisterExecutorService(ExecutorService executorService) {
SupplierInfo supplierInfo = EXECUTOR_SERVICES.get(executorService);
if (supplierInfo == null) {
// This can happen in some unit tests but should not happen in production.
LOGGER.log(Level.WARNING, String.format(
"Executor service %s is being unregistered but could not locate supplier to notify observers",
executorService));
return;
}
supplierInfo.unregisterExecutorService(executorService);
}

private static List<ExecutorServiceSupplierObserver> loadObservers() {
ServiceLoader<ExecutorServiceSupplierObserver> loader = ServiceLoader.load(ExecutorServiceSupplierObserver.class);
return loader.stream()
.map(ServiceLoader.Provider::get)
.collect(Collectors.toList());
}

private static class SupplierInfo {
private final Supplier<? extends ExecutorService> supplier;
private final String executorServiceCategory;
private final String supplierCategory;
private final int supplierIndex;
private final boolean useVirtualThreads;
private final AtomicInteger nextThreadPoolIndex = new AtomicInteger(0);
private final List<ExecutorServiceSupplierObserver.SupplierObserverContext> observerContexts;

private static SupplierInfo create(Supplier<? extends ExecutorService> supplier,
String executorServiceCategory,
String supplierCategory,
int supplierIndex,
boolean useVirtualThreads) {
return new SupplierInfo(supplier, supplierCategory, executorServiceCategory, supplierIndex, useVirtualThreads);
}

private SupplierInfo(Supplier<? extends ExecutorService> supplier,
String supplierCategory,
String executorServiceCategory,
int supplierIndex,
boolean useVirtualThreads) {
this.supplier = supplier;
this.supplierCategory = supplierCategory;
this.executorServiceCategory = executorServiceCategory;
this.supplierIndex = supplierIndex;
this.useVirtualThreads = useVirtualThreads;
observerContexts = collectObserverContexts();
}

private List<ExecutorServiceSupplierObserver.SupplierObserverContext> collectObserverContexts() {
return OBSERVERS.get()
.stream()
.map(observer ->
useVirtualThreads
? observer.registerSupplier(supplier,
supplierIndex,
supplierCategory,
METRICS_RELATED_METHOD_INVOCATIONS.get())
: observer.registerSupplier(supplier,
supplierIndex,
supplierCategory))

.collect(Collectors.toList());
}

void registerExecutorService(ExecutorService executorService) {
int threadPoolIndex = nextThreadPoolIndex.getAndIncrement();
EXECUTOR_SERVICES.put(executorService, this);
observerContexts
.forEach(observer -> observer.registerExecutorService(executorService, threadPoolIndex));
}

void unregisterExecutorService(ExecutorService executorService) {
observerContexts
.forEach(observer -> observer.unregisterExecutorService(executorService));
EXECUTOR_SERVICES.remove(executorService);
}
}

/**
* Encapsulation of information needed to invoke methods on {@code ThreadPerTaskExecutor} and to create metrics from the
* returned values.
*/
private static class MethodInvocationImpl implements ExecutorServiceSupplierObserver.MethodInvocation {
private final String displayName;
private final String description;
private final Method method;
private final Class<?> type;

private static final LazyValue<ExecutorService> VIRTUAL_EXECUTOR_SERVICE = LazyValue
.create(VirtualExecutorUtil::executorService);

static MethodInvocationImpl create(String displayName, String description, String methodName) {
ExecutorService executorService = VIRTUAL_EXECUTOR_SERVICE.get();
Method method = null;
try {
method = executorService.getClass().getDeclaredMethod(methodName);
} catch (NoSuchMethodException e) {
throw new RuntimeException(e);
}
return new MethodInvocationImpl(displayName, description, method);
}

MethodInvocationImpl(String displayName, String description, Method method) {
this.displayName = displayName;
this.description = description;
this.method = method;
this.type = method.getReturnType();
}

@Override
public String displayName() {
return displayName;
}

@Override
public String description() {
return description;
}

@Override
public Method method() {
return method;
}

@Override
public Class<?> type() {
return type;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ private ScheduledThreadPoolSupplier(Builder builder) {
this.isDaemon = builder.isDaemon;
this.threadNamePrefix = builder.threadNamePrefix;
this.prestart = builder.prestart;
ObserverManager.registerSupplier(this, "scheduled", threadNamePrefix);
}

/**
Expand Down Expand Up @@ -108,6 +109,7 @@ public Thread newThread(Runnable r) {
if (prestart) {
result.prestartAllCoreThreads();
}
ObserverManager.registerExecutorService(this, result);
return result;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ public final class ServerThreadPoolSupplier implements Supplier<ExecutorService>

private ServerThreadPoolSupplier(final ThreadPoolSupplier.Builder builder) {
this.supplier = builder.build();
ObserverManager.registerSupplier(this, "server", "helidon-");
}

@Override
public ExecutorService get() {
return supplier.get();
return ObserverManager.registerExecutorService(this, supplier.get());
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,16 @@ protected void afterExecute(Runnable r, Throwable t) {
@Override
public void shutdown() {
Event.write();
ObserverManager.unregisterExecutorService(this);
super.shutdown();
}
tjquinno marked this conversation as resolved.
Show resolved Hide resolved

@Override
public List<Runnable> shutdownNow() {
ObserverManager.unregisterExecutorService(this);
return super.shutdownNow();
}

/**
* A {@link RejectedExecutionHandler} that supports pool growth by re-attempting to add the
* task to the queue. If the queue is actually full, the rejection is counted and an exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ private ThreadPoolSupplier(Builder builder) {
this.growthRate = builder.growthRate;
this.rejectionHandler = builder.rejectionHandler == null ? DEFAULT_REJECTION_POLICY : builder.rejectionHandler;
this.useVirtualThreads = builder.useVirtualThreads || builder.virtualThreadsEnforced;
ObserverManager.registerSupplier(this, name, "general", useVirtualThreads);
}

/**
Expand Down Expand Up @@ -110,7 +111,7 @@ ExecutorService getThreadPool() {
if (useVirtualThreads) {
if (VirtualExecutorUtil.isVirtualSupported()) {
LOGGER.fine("Using unbounded virtual executor service for pool " + name);
return VirtualExecutorUtil.executorService();
return ObserverManager.registerExecutorService(this, VirtualExecutorUtil.executorService());
}
}

Expand All @@ -128,7 +129,7 @@ ExecutorService getThreadPool() {
if (prestart) {
result.prestartAllCoreThreads();
}
return result;
return ObserverManager.registerExecutorService(this, result);
}

@Override
Expand Down
Loading