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.

Sign up for GitHub

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

Jump to bottom

Support setting ThreadFactory for Jetty 10, 11 and 12 #3531

Merged
merged 1 commit into from Sep 22, 2023
Merged

Support setting ThreadFactory for Jetty 10, 11 and 12 #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 61 additions & 2 deletions ...ics-jetty10/src/main/java/io/dropwizard/metrics/jetty10/InstrumentedQueuedThreadPool.java
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
import org.eclipse.jetty.util.thread.QueuedThreadPool;

import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ThreadFactory;

import static com.codahale.metrics.MetricRegistry.name;

Expand Down Expand Up @@ -34,6 +35,13 @@ public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
this(registry, maxThreads, minThreads, 60000);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("queue") BlockingQueue<Runnable> queue) {
this(registry, maxThreads, minThreads, 60000, queue);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
Expand All @@ -46,16 +54,67 @@ public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue) {
this(registry, maxThreads, minThreads, idleTimeout, queue, null);
this(registry, maxThreads, minThreads, idleTimeout, queue, (ThreadGroup) null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("prefix") String prefix) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, null, null, prefix);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadFactory") ThreadFactory threadFactory) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, null, threadFactory);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, threadGroup);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("reservedThreads") int reservedThreads,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup) {
this(registry, maxThreads, minThreads, idleTimeout, reservedThreads, queue, threadGroup, null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("reservedThreads") int reservedThreads,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup,
@Name("threadFactory") ThreadFactory threadFactory) {
this(registry, maxThreads, minThreads, idleTimeout, reservedThreads, queue, threadGroup, threadFactory, null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("reservedThreads") int reservedThreads,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup,
@Name("threadFactory") ThreadFactory threadFactory,
@Name("prefix") String prefix) {
super(maxThreads, minThreads, idleTimeout, queue);
super(maxThreads, minThreads, idleTimeout, reservedThreads, queue, threadGroup, threadFactory);
this.metricRegistry = registry;
this.prefix = prefix;
}
Expand Down
63 changes: 61 additions & 2 deletions ...ics-jetty11/src/main/java/io/dropwizard/metrics/jetty11/InstrumentedQueuedThreadPool.java
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
import org.eclipse.jetty.util.thread.QueuedThreadPool;

import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ThreadFactory;

import static com.codahale.metrics.MetricRegistry.name;

Expand Down Expand Up @@ -34,6 +35,13 @@ public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
this(registry, maxThreads, minThreads, 60000);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("queue") BlockingQueue<Runnable> queue) {
this(registry, maxThreads, minThreads, 60000, queue);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
Expand All @@ -46,16 +54,67 @@ public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue) {
this(registry, maxThreads, minThreads, idleTimeout, queue, null);
this(registry, maxThreads, minThreads, idleTimeout, queue, (ThreadGroup) null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("prefix") String prefix) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, null, null, prefix);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadFactory") ThreadFactory threadFactory) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, null, threadFactory);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, threadGroup);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("reservedThreads") int reservedThreads,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup) {
this(registry, maxThreads, minThreads, idleTimeout, reservedThreads, queue, threadGroup, null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("reservedThreads") int reservedThreads,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup,
@Name("threadFactory") ThreadFactory threadFactory) {
this(registry, maxThreads, minThreads, idleTimeout, reservedThreads, queue, threadGroup, threadFactory, null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("reservedThreads") int reservedThreads,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadGroup") ThreadGroup threadGroup,
@Name("threadFactory") ThreadFactory threadFactory,
@Name("prefix") String prefix) {
super(maxThreads, minThreads, idleTimeout, queue);
super(maxThreads, minThreads, idleTimeout, reservedThreads, queue, threadGroup, threadFactory);
this.metricRegistry = registry;
this.prefix = prefix;
}
Expand Down
11 changes: 10 additions & 1 deletion ...ics-jetty12/src/main/java/io/dropwizard/metrics/jetty12/InstrumentedQueuedThreadPool.java
View file
Open in desktop
Expand Up @@ -54,7 +54,16 @@ public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue) {
this(registry, maxThreads, minThreads, idleTimeout, queue, null);
this(registry, maxThreads, minThreads, idleTimeout, queue, (ThreadGroup) null);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
@Name("maxThreads") int maxThreads,
@Name("minThreads") int minThreads,
@Name("idleTimeout") int idleTimeout,
@Name("queue") BlockingQueue<Runnable> queue,
@Name("threadFactory") ThreadFactory threadFactory) {
this(registry, maxThreads, minThreads, idleTimeout, -1, queue, null, threadFactory);
}

public InstrumentedQueuedThreadPool(@Name("registry") MetricRegistry registry,
Expand Down