(accumulo) 01/01: Merge branch '2.1'

[ddanielr]

This is an automated email from the ASF dual-hosted git repository.

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

commit 670ec4ff38b6a3b80061bb21f6cfa714c7b71a1c
Merge: 6f98e54fd9 8ac92fa3c1
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Thu Jul 24 15:34:50 2025 +0000

    Merge branch '2.1'

 .../org/apache/accumulo/core/trace/TraceUtil.java  | 30 +++++++-------
 .../org/apache/accumulo/server/AbstractServer.java |  3 +-
 .../main/java/org/apache/accumulo/shell/Shell.java | 15 +++++--
 .../accumulo/shell/commands/TraceCommand.java      | 46 ++--------------------
 4 files changed, 34 insertions(+), 60 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
index 77ba7fbc15,2217ba0241..0f4b47c31a
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
@@@ -25,10 -25,7 +25,8 @@@ import java.util.Map
  import java.util.concurrent.Callable;
  
  import org.apache.accumulo.core.Constants;
 -import org.apache.accumulo.core.trace.thrift.TInfo;
 +import org.apache.accumulo.core.clientImpl.thrift.TInfo;
- import org.apache.accumulo.core.conf.AccumuloConfiguration;
- import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.util.ClassUtil;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index d9deae5663,eb5bce1d1a..89c26c2a3b
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@@ -135,9 -118,10 +135,10 @@@ public abstract class AbstractServe
      }
      log.info("Version " + Constants.VERSION);
      log.info("Instance " + context.getInstanceID());
 -    context.init(appName);
 +    context.init(applicationName);
      ClassLoaderUtil.initContextFactory(context.getConfiguration());
-     TraceUtil.initializeTracer(context.getConfiguration());
+     TraceUtil.setProcessTracing(
+         
context.getConfiguration().getBoolean(Property.GENERAL_OPENTELEMETRY_ENABLED));
      if (context.getSaslParams() != null) {
        // Server-side "client" check to make sure we're logged in as a user we 
expect to be
        context.enforceKerberosLogin();
diff --cc shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 8c9a67eb19,b854971219..9771062188
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@@ -70,7 -68,8 +70,8 @@@ import org.apache.accumulo.core.data.Ke
  import org.apache.accumulo.core.data.Value;
  import org.apache.accumulo.core.dataImpl.thrift.TConstraintViolationSummary;
  import 
org.apache.accumulo.core.spi.common.ContextClassLoaderFactory.ContextClassLoaderException;
 -import 
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
 +import 
org.apache.accumulo.core.tabletingest.thrift.ConstraintViolationException;
+ import org.apache.accumulo.core.trace.TraceUtil;
  import org.apache.accumulo.core.util.BadArgumentException;
  import org.apache.accumulo.core.util.format.DefaultFormatter;
  import org.apache.accumulo.core.util.format.Formatter;