[accumulo] branch elasticity updated: Bump version on elasticity branch to 4.0.0

2023-04-17 Thread dlmarion
This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/elasticity by this push:
 new 2de37f0710 Bump version on elasticity branch to 4.0.0
2de37f0710 is described below

commit 2de37f07100b848202eeec038df0d1fc4e83d1f8
Author: Dave Marion 
AuthorDate: Mon Apr 17 17:49:29 2023 -0400

Bump version on elasticity branch to 4.0.0

The inclusion of the OnDemand Tablet feature is a large enough behavior 
change to warrant a bump in the major version. Additionally, the other planned 
changes to this branch will also likely mean significant changes in how 
Accumulo is deployed and monitored.

Closes #3298
---
 assemble/pom.xml  | 2 +-
 core/pom.xml  | 2 +-
 .../org/apache/accumulo/core/client/admin/TableOperations.java| 2 +-
 .../org/apache/accumulo/core/client/admin/TabletHostingGoal.java  | 2 +-
 core/src/main/java/org/apache/accumulo/core/conf/Property.java| 8 +++-
 hadoop-mapreduce/pom.xml  | 2 +-
 iterator-test-harness/pom.xml | 2 +-
 minicluster/pom.xml   | 2 +-
 pom.xml   | 2 +-
 server/base/pom.xml   | 2 +-
 server/compaction-coordinator/pom.xml | 2 +-
 server/compactor/pom.xml  | 2 +-
 server/gc/pom.xml | 2 +-
 server/manager/pom.xml| 2 +-
 server/monitor/pom.xml| 2 +-
 server/native/pom.xml | 2 +-
 server/tserver/pom.xml| 2 +-
 shell/pom.xml | 2 +-
 start/pom.xml | 2 +-
 test/pom.xml  | 2 +-
 20 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index 59ff0e32ad..76c5d4aa9c 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -24,7 +24,7 @@
   
 org.apache.accumulo
 accumulo-project
-3.0.0-SNAPSHOT
+4.0.0-SNAPSHOT
   
   accumulo
   pom
diff --git a/core/pom.xml b/core/pom.xml
index aa94e45999..86f84b7c4f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
   
 org.apache.accumulo
 accumulo-project
-3.0.0-SNAPSHOT
+4.0.0-SNAPSHOT
   
   accumulo-core
   Apache Accumulo Core
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 3e9541eea9..3df1ef1373 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -1022,7 +1022,7 @@ public interface TableOperations {
* @param tableName table name
* @param range tablet range
* @param goal hosting goal
-   * @since ELASTICITY_TODO
+   * @since 4.0.0
*/
   default void setTabletHostingGoal(String tableName, Range range, 
TabletHostingGoal goal)
   throws AccumuloSecurityException, AccumuloException, 
TableNotFoundException {
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TabletHostingGoal.java
 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TabletHostingGoal.java
index 9b7d887274..e8b47242ab 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TabletHostingGoal.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TabletHostingGoal.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.core.client.admin;
 /**
  * @see TableOperations#setTabletHostingGoal(String, 
org.apache.accumulo.core.data.Range,
  *  TabletHostingGoal)
- * @since ELASTICITY_TODO
+ * @since 4.0.0
  */
 public enum TabletHostingGoal {
 
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 372d32a273..b7eeb6fda5 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -311,8 +311,7 @@ public enum Property {
   "1.3.5"),
   MANAGER_TABLET_GROUP_WATCHER_INTERVAL("manager.tablet.watcher.interval", 
"60s",
   PropertyType.TIMEDURATION,
-  "Time to wait between scanning tablet states to determine migrations, 
etc.",
-  "ELASTICITY_TODO"),
+  "Time to wait between scanning tablet states to determine migrations, 
etc.", 

[accumulo] branch elasticity updated (5b3a4311db -> e245b28dfe)

2023-04-17 Thread dlmarion
This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a change to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 5b3a4311db Modify all user tables to behave in OnDemand manner (#3294)
 add fb09e7e259 Backport release candidate script
 add b5f5a85f45 Merge branch '1.10' into 2.1
 add a10934437e Merge branch '2.1'
 add fbe647e925 Fixes a minor scan server bug and adds some since tags 
(#3277)
 add 7f49667f13 Merge remote-tracking branch 'upstream/2.1'
 add a6c77eb3d7 Move Gson ByteArrayToBase64TypeAdapter to its own utility 
class (#3285)
 add 341b8b9540 Bump Jetty to 9.3 for Accumulo 1.10 (#3280)
 add 0a0e2b8fc6 Merge branch '1.10' into 2.1
 add 5c20460a55 Merge branch '2.1'
 add d7ff012314 Move ByteArrayToBase64TypeAdapter to new package
 add 16227d5879 Remove unused methods from MetadataTableUtil (#3291)
 add ef95ffcc3f Add trim command to parse metrics (#3293)
 add 92238929f6 Merge remote-tracking branch 'upstream/2.1'
 add 733863638d [maven-release-plugin] prepare release rel/1.10.3
 add 65badd7705 [maven-release-plugin] prepare for next development 
iteration
 add 6a3c919eb4 Merge branch '1.10' into 2.1
 add 30d823def8 Merge branch '2.1'
 add 11a5b7b7d3 fix metrics tags, tserver hostname, remove tags from thrift 
metrics (#3297)
 add 15c9f55280 Merge remote-tracking branch 'upstream/2.1'
 new e245b28dfe Merge branch 'main' into elasticity

The 1 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:
 .../core/clientImpl/bulk/BulkSerialize.java| 38 +--
 .../core/clientImpl/bulk/LoadMappingIterator.java  |  8 +--
 .../apache/accumulo/core/metrics/MetricsUtil.java  |  8 ++-
 .../spi/scan/ConfigurableScanServerSelector.java   |  8 ++-
 .../core/spi/scan/ScanServerSelections.java|  6 ++
 .../util/json/ByteArrayToBase64TypeAdapter.java| 78 ++
 .../scan/ConfigurableScanServerSelectorTest.java   |  4 +-
 .../json/ByteArrayToBase64TypeAdapterTest.java | 64 ++
 pom.xml|  8 +--
 .../accumulo/server/metrics/ThriftMetrics.java | 13 +---
 .../apache/accumulo/server/rpc/TServerUtils.java   |  8 +--
 .../apache/accumulo/server/rpc/TimedProcessor.java | 10 +--
 .../accumulo/server/util/MetadataTableUtil.java| 24 ---
 .../org/apache/accumulo/tserver/TabletServer.java  | 10 +--
 .../apache/accumulo/test/metrics/MetricsIT.java| 39 +++
 .../accumulo/test/metrics/TestStatsDSink.java  |  2 +-
 16 files changed, 227 insertions(+), 101 deletions(-)
 create mode 100644 
core/src/main/java/org/apache/accumulo/core/util/json/ByteArrayToBase64TypeAdapter.java
 create mode 100644 
core/src/test/java/org/apache/accumulo/core/util/json/ByteArrayToBase64TypeAdapterTest.java



[accumulo] 01/01: Merge branch 'main' into elasticity

2023-04-17 Thread dlmarion
This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit e245b28dfe1a222e5763b044b125b149acc039d6
Merge: 5b3a4311db 15c9f55280
Author: Dave Marion 
AuthorDate: Mon Apr 17 18:58:33 2023 +

Merge branch 'main' into elasticity

 .../core/clientImpl/bulk/BulkSerialize.java| 38 +--
 .../core/clientImpl/bulk/LoadMappingIterator.java  |  8 +--
 .../apache/accumulo/core/metrics/MetricsUtil.java  |  8 ++-
 .../spi/scan/ConfigurableScanServerSelector.java   |  8 ++-
 .../core/spi/scan/ScanServerSelections.java|  6 ++
 .../util/json/ByteArrayToBase64TypeAdapter.java| 78 ++
 .../scan/ConfigurableScanServerSelectorTest.java   |  4 +-
 .../json/ByteArrayToBase64TypeAdapterTest.java | 64 ++
 pom.xml|  8 +--
 .../accumulo/server/metrics/ThriftMetrics.java | 13 +---
 .../apache/accumulo/server/rpc/TServerUtils.java   |  8 +--
 .../apache/accumulo/server/rpc/TimedProcessor.java | 10 +--
 .../accumulo/server/util/MetadataTableUtil.java| 24 ---
 .../org/apache/accumulo/tserver/TabletServer.java  | 10 +--
 .../apache/accumulo/test/metrics/MetricsIT.java| 39 +++
 .../accumulo/test/metrics/TestStatsDSink.java  |  2 +-
 16 files changed, 227 insertions(+), 101 deletions(-)




[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot

2023-04-17 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 51632131 Automatic Site Publish by Buildbot
51632131 is described below

commit 51632131bda49127572fc01f5a98d565c287b404
Author: buildbot 
AuthorDate: Mon Apr 17 16:30:26 2023 +

Automatic Site Publish by Buildbot
---
 output/docs/2.x/development/iterators.html | 16 ++--
 output/feed.xml|  4 ++--
 output/search_data.json|  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/output/docs/2.x/development/iterators.html 
b/output/docs/2.x/development/iterators.html
index ada4e834..442082c1 100644
--- a/output/docs/2.x/development/iterators.html
+++ b/output/docs/2.x/development/iterators.html
@@ -832,12 +832,16 @@ always see all intended data that is generated.
 
 Teardown
 
-As mentioned, instance of Iterators may be torn down inside of the server 
transparently. When a complex
-collection of iterators is performing some advanced functionality, they will 
not be torn down until a Key-Value
-pair is returned out of the “stack” of Iterators (and added into the batch of 
Key-Values to be returned
-to the caller). Being torn-down is equivalent to a new instance of the 
Iterator being creating and deepCopy
-being called on the new instance with the old instance provided as the 
argument to deepCopy. 
References
-to the old instance are removed and the object is lazily garbage collected by 
the JVM.
+Instances of iterators may be torn down inside the server transparently. 
When a complex collection
+of iterators is performing advanced functionality, they will not be torn down 
until a Key-Value pair
+is returned out of the “stack” of iterators (and added into the batch of 
Key-Values to be returned
+to the caller), or the iterator is yielded.
+
+When an iterator is torn down, the entire stack is dropped and no state is 
preserved. Only the last
+key returned (or the yielded position), original options, and seek range are 
retained. When the scan
+is continued, the iterator stack is rebuilt and re-initialized using the 
original options. The stack
+is then seeked with the original range, and the start key is replaced by the 
last key returned (or
+the yielded position), non-inclusive.
 
 Compaction-time Iterators
 
diff --git a/output/feed.xml b/output/feed.xml
index 9caa23df..f39c0391 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Fri, 07 Apr 2023 13:25:00 +
-Fri, 07 Apr 2023 13:25:00 +
+Mon, 17 Apr 2023 16:30:18 +
+Mon, 17 Apr 2023 16:30:18 +
 Jekyll v4.3.1
 
 
diff --git a/output/search_data.json b/output/search_data.json
index 43095f00..2c424e3a 100644
--- a/output/search_data.json
+++ b/output/search_data.json
@@ -114,7 +114,7 @@
   
 "docs-2-x-development-iterators": {
   "title": "Iterators",
-  "content": "Accumulo SortedKeyValueIterators, commonly referred to as 
Iterators for short, are server-side programming constructsthat allow users to 
implement custom retrieval or computational purpose within Accumulo 
TabletServers.  The name rightlybrings forward similarities to the Java 
Iterator interface; however, Accumulo Iterators are more complex than 
JavaIterators. Notably, in addition to the expected methods to retrieve the 
current element and advance to the next elementin t [...]
+  "content": "Accumulo SortedKeyValueIterators, commonly referred to as 
Iterators for short, are server-side programming constructsthat allow users to 
implement custom retrieval or computational purpose within Accumulo 
TabletServers.  The name rightlybrings forward similarities to the Java 
Iterator interface; however, Accumulo Iterators are more complex than 
JavaIterators. Notably, in addition to the expected methods to retrieve the 
current element and advance to the next elementin t [...]
   "url": " /docs/2.x/development/iterators",
   "categories": "development"
 },



[accumulo-website] branch main updated: Fix Iterator Teardown documentation (#383)

2023-04-17 Thread domgarguilo
This is an automated email from the ASF dual-hosted git repository.

domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/main by this push:
 new 0d3904b0 Fix Iterator Teardown documentation (#383)
0d3904b0 is described below

commit 0d3904b0c3b4eb839bb59158946d9068fba7ef53
Author: Dom G 
AuthorDate: Mon Apr 17 12:29:59 2023 -0400

Fix Iterator Teardown documentation (#383)

Co-authored-by: Jeffrey Manno 
---
 _docs-2/development/iterators.md | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/_docs-2/development/iterators.md b/_docs-2/development/iterators.md
index 54808482..f557ab59 100644
--- a/_docs-2/development/iterators.md
+++ b/_docs-2/development/iterators.md
@@ -408,12 +408,16 @@ On an instance of an Iterator: `init` is always called 
before `seek`, `seek` is
 
 ### Teardown
 
-As mentioned, instance of Iterators may be torn down inside of the server 
transparently. When a complex
-collection of iterators is performing some advanced functionality, they will 
not be torn down until a Key-Value
-pair is returned out of the "stack" of Iterators (and added into the batch of 
Key-Values to be returned
-to the caller). Being torn-down is equivalent to a new instance of the 
Iterator being creating and `deepCopy`
-being called on the new instance with the old instance provided as the 
argument to `deepCopy`. References
-to the old instance are removed and the object is lazily garbage collected by 
the JVM.
+Instances of iterators may be torn down inside the server transparently. When 
a complex collection
+of iterators is performing advanced functionality, they will not be torn down 
until a Key-Value pair
+is returned out of the "stack" of iterators (and added into the batch of 
Key-Values to be returned
+to the caller), or the iterator is yielded.
+
+When an iterator is torn down, the entire stack is dropped and no state is 
preserved. Only the last
+key returned (or the yielded position), original options, and seek range are 
retained. When the scan
+is continued, the iterator stack is rebuilt and re-initialized using the 
original options. The stack
+is then seeked with the original range, and the start key is replaced by the 
last key returned (or
+the yielded position), non-inclusive.
 
 ## Compaction-time Iterators
 



[accumulo] branch main updated (30d823def8 -> 15c9f55280)

2023-04-17 Thread edcoleman
This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


from 30d823def8 Merge branch '2.1'
 add 11a5b7b7d3 fix metrics tags, tserver hostname, remove tags from thrift 
metrics (#3297)
 new 15c9f55280 Merge remote-tracking branch 'upstream/2.1'

The 1 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:
 .../apache/accumulo/core/metrics/MetricsUtil.java  |  8 -
 pom.xml|  6 ++--
 .../accumulo/server/metrics/ThriftMetrics.java | 13 ++--
 .../apache/accumulo/server/rpc/TServerUtils.java   |  8 ++---
 .../apache/accumulo/server/rpc/TimedProcessor.java | 10 ++
 .../org/apache/accumulo/tserver/TabletServer.java  | 10 +++---
 .../apache/accumulo/test/metrics/MetricsIT.java| 39 ++
 .../accumulo/test/metrics/TestStatsDSink.java  |  4 +--
 8 files changed, 65 insertions(+), 33 deletions(-)



[accumulo] 01/01: Merge remote-tracking branch 'upstream/2.1'

2023-04-17 Thread edcoleman
This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 15c9f55280f4ce28a80b800f1e05128f33c85db3
Merge: 30d823def8 11a5b7b7d3
Author: Ed Coleman 
AuthorDate: Mon Apr 17 14:50:58 2023 +

Merge remote-tracking branch 'upstream/2.1'

 .../apache/accumulo/core/metrics/MetricsUtil.java  |  8 -
 pom.xml|  6 ++--
 .../accumulo/server/metrics/ThriftMetrics.java | 13 ++--
 .../apache/accumulo/server/rpc/TServerUtils.java   |  8 ++---
 .../apache/accumulo/server/rpc/TimedProcessor.java | 10 ++
 .../org/apache/accumulo/tserver/TabletServer.java  | 10 +++---
 .../apache/accumulo/test/metrics/MetricsIT.java| 39 ++
 .../accumulo/test/metrics/TestStatsDSink.java  |  4 +--
 8 files changed, 65 insertions(+), 33 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
index 7db81aab64,b7e3ff5ae4..ce3a0c5ea4
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
@@@ -77,10 -80,29 +77,16 @@@ public class MetricsUtil 
tags.add(Tag.of("process.name", processName));
  
if (address != null) {
- tags.add(Tag.of("Address", address.toString()));
+ if (!address.getHost().isEmpty()) {
+   tags.add(Tag.of("host", address.getHost()));
+ }
+ if (address.getPort() > 0) {
+   tags.add(Tag.of("port", Integer.toString(address.getPort(;
+ }
}
+ 
commonTags = Collections.unmodifiableList(tags);
  
 -  // Configure replication metrics to display percentiles and change its 
expiry to 10 mins
 -  MeterFilter replicationFilter = new MeterFilter() {
 -@Override
 -public DistributionStatisticConfig configure(Meter.Id id,
 -DistributionStatisticConfig config) {
 -  if (id.getName().equals("replicationQueue")) {
 -return DistributionStatisticConfig.builder().percentiles(0.5, 
0.75, 0.9, 0.95, 0.99)
 -.expiry(Duration.ofMinutes(10)).build().merge(config);
 -  }
 -  return config;
 -}
 -  };
 -
Class clazz =
ClassLoaderUtil.loadClass(factoryClass, MeterRegistryFactory.class);
MeterRegistryFactory factory = 
clazz.getDeclaredConstructor().newInstance();



[accumulo] branch 2.1 updated: fix metrics tags, tserver hostname, remove tags from thrift metrics (#3297)

2023-04-17 Thread edcoleman
This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
 new 11a5b7b7d3 fix metrics tags, tserver hostname, remove tags from thrift 
metrics (#3297)
11a5b7b7d3 is described below

commit 11a5b7b7d385aebaf2f70f65a06f9b99b9f7196a
Author: EdColeman 
AuthorDate: Mon Apr 17 10:49:56 2023 -0400

fix metrics tags, tserver hostname, remove tags from thrift metrics (#3297)

* fix metrics tags, tserver hostname, remove extra tags from thrift metrics
* fix TestStatsD buffer to string conversion

-

Co-authored-by: Daniel Roverts <@ddanielr>
---
 .../apache/accumulo/core/metrics/MetricsUtil.java  |  8 -
 pom.xml|  6 ++--
 .../accumulo/server/metrics/ThriftMetrics.java | 13 ++--
 .../apache/accumulo/server/rpc/TServerUtils.java   |  8 ++---
 .../apache/accumulo/server/rpc/TimedProcessor.java | 10 ++
 .../org/apache/accumulo/tserver/TabletServer.java  | 10 +++---
 .../apache/accumulo/test/metrics/MetricsIT.java| 39 ++
 .../accumulo/test/metrics/TestStatsDSink.java  |  4 +--
 8 files changed, 65 insertions(+), 33 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java 
b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
index 5eddc8600d..b7e3ff5ae4 100644
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsUtil.java
@@ -80,8 +80,14 @@ public class MetricsUtil {
   tags.add(Tag.of("process.name", processName));
 
   if (address != null) {
-tags.add(Tag.of("Address", address.toString()));
+if (!address.getHost().isEmpty()) {
+  tags.add(Tag.of("host", address.getHost()));
+}
+if (address.getPort() > 0) {
+  tags.add(Tag.of("port", Integer.toString(address.getPort(;
+}
   }
+
   commonTags = Collections.unmodifiableList(tags);
 
   // Configure replication metrics to display percentiles and change its 
expiry to 10 mins
diff --git a/pom.xml b/pom.xml
index 239d6aaa29..9b15277c66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
   
 io.micrometer
 micrometer-bom
-1.9.8
+1.10.6
 pom
 import
   
@@ -186,14 +186,14 @@
   
 io.opentelemetry
 opentelemetry-bom
-1.19.0
+1.25.0
 pom
 import
   
   
 io.opentelemetry
 opentelemetry-bom-alpha
-1.19.0-alpha
+1.25.0-alpha
 pom
 import
   
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetrics.java
 
b/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetrics.java
index 74073abe64..8d336917b1 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetrics.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetrics.java
@@ -25,15 +25,10 @@ import io.micrometer.core.instrument.MeterRegistry;
 
 public class ThriftMetrics implements MetricsProducer {
 
-  private final String serverName;
-  private final String threadName;
   private DistributionSummary idle;
   private DistributionSummary execute;
 
-  public ThriftMetrics(String serverName, String threadName) {
-this.serverName = serverName;
-this.threadName = threadName;
-  }
+  public ThriftMetrics() {}
 
   public void addIdle(long time) {
 idle.record(time);
@@ -45,10 +40,8 @@ public class ThriftMetrics implements MetricsProducer {
 
   @Override
   public void registerMetrics(MeterRegistry registry) {
-idle = DistributionSummary.builder(METRICS_THRIFT_IDLE).baseUnit("ms")
-.tags("server", serverName, "thread", threadName).register(registry);
-execute = 
DistributionSummary.builder(METRICS_THRIFT_EXECUTE).baseUnit("ms")
-.tags("server", serverName, "thread", threadName).register(registry);
+idle = 
DistributionSummary.builder(METRICS_THRIFT_IDLE).baseUnit("ms").register(registry);
+execute = 
DistributionSummary.builder(METRICS_THRIFT_EXECUTE).baseUnit("ms").register(registry);
   }
 
 }
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java 
b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index 3a3088358f..396fcc9f93 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -167,7 +167,7 @@ public class TServerUtils {
 // create the TimedProcessor outside the port search loop so we don't try 
to
 // register the same
 // metrics mbean more than once
-TimedProcessor timedProcessor = new