eolivelli commented on a change in pull request #2839: URL: https://github.com/apache/bookkeeper/pull/2839#discussion_r734396645
########## File path: bookkeeper-stats/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java ########## @@ -0,0 +1,76 @@ +/** + * 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.bookkeeper.stats; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +/** + * For mapping thread ids to thread pools and threads within those pools + * or just for lone named threads. Thread scoped metrics add labels to + * metrics by retrieving the ThreadPoolThread object from this registry. + * For flexibility, this registry is not based on TLS. + */ +public class ThreadRegistry { + private static ConcurrentMap<Long, ThreadPoolThread> threadPoolMap = new ConcurrentHashMap<>(); + + /* + Threads can register themselves as their first act before carrying out + any work. + */ + public static void register(String threadPool, int threadPoolThread) { + register(threadPool, threadPoolThread, Thread.currentThread().getId()); + } + + /* + Thread factories can register a thread by its id. + */ + public static void register(String threadPool, int threadPoolThread, long threadId) { + ThreadPoolThread tpt = new ThreadPoolThread(threadPool, threadPoolThread, threadId); + threadPoolMap.put(threadId, tpt); + } + + /* + Retrieves the registered ThreadPoolThread (if registered) for the calling thread. + */ + public static ThreadPoolThread get() { + return threadPoolMap.get(Thread.currentThread().getId()); + } + + /** + * Stores the thread pool and ordinal. + */ + public static class ThreadPoolThread { Review comment: final ? ########## File path: bookkeeper-stats-providers/prometheus-metrics-provider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusStatsLogger.java ########## @@ -46,11 +46,22 @@ public OpStatsLogger getOpStatsLogger(String name) { return provider.opStats.computeIfAbsent(scopeContext(name), x -> new DataSketchesOpStatsLogger(labels)); } + @Override + public OpStatsLogger getThreadScopedOpStatsLogger(String name) { + return provider.threadScopedOpStats.computeIfAbsent(scopeContext(name), + x -> new ThreadScopedDataSketchesStatsLogger(provider, scopeContext(name), labels)); Review comment: what about using 'x' instead of 'scopeContext(name)', this way we will use a non capturing lambda not a big deal ########## File path: bookkeeper-stats/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java ########## @@ -0,0 +1,76 @@ +/** + * 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.bookkeeper.stats; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +/** + * For mapping thread ids to thread pools and threads within those pools + * or just for lone named threads. Thread scoped metrics add labels to + * metrics by retrieving the ThreadPoolThread object from this registry. + * For flexibility, this registry is not based on TLS. + */ +public class ThreadRegistry { + private static ConcurrentMap<Long, ThreadPoolThread> threadPoolMap = new ConcurrentHashMap<>(); Review comment: should we add a "clear()" method ? I am thinking about running tests and JVM env pollution we should also add a call to this cleanup method in some shutdown code of the Bookie and of the BK client probably or of the StatsProvider ########## File path: bookkeeper-stats/src/main/java/org/apache/bookkeeper/stats/ThreadRegistry.java ########## @@ -0,0 +1,76 @@ +/** + * 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.bookkeeper.stats; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +/** + * For mapping thread ids to thread pools and threads within those pools + * or just for lone named threads. Thread scoped metrics add labels to + * metrics by retrieving the ThreadPoolThread object from this registry. + * For flexibility, this registry is not based on TLS. + */ +public class ThreadRegistry { + private static ConcurrentMap<Long, ThreadPoolThread> threadPoolMap = new ConcurrentHashMap<>(); + + /* + Threads can register themselves as their first act before carrying out + any work. + */ + public static void register(String threadPool, int threadPoolThread) { + register(threadPool, threadPoolThread, Thread.currentThread().getId()); + } + + /* + Thread factories can register a thread by its id. + */ + public static void register(String threadPool, int threadPoolThread, long threadId) { + ThreadPoolThread tpt = new ThreadPoolThread(threadPool, threadPoolThread, threadId); + threadPoolMap.put(threadId, tpt); + } + + /* + Retrieves the registered ThreadPoolThread (if registered) for the calling thread. + */ + public static ThreadPoolThread get() { + return threadPoolMap.get(Thread.currentThread().getId()); + } + + /** + * Stores the thread pool and ordinal. + */ + public static class ThreadPoolThread { + String threadPool; Review comment: final ? (here and below) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
