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

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

commit 2e5db89d87e74529ec897da0898ae30ac8cc4f64
Merge: 20df82f049 98549b6bfe
Author: Christopher Tubbs <[email protected]>
AuthorDate: Fri Dec 5 14:07:28 2025 -0500

    Merge branch '2.1'

 .../main/java/org/apache/accumulo/core/conf/Property.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 141b02b273,d7afd269ad..7ec3c301d0
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -290,19 -274,28 +290,17 @@@ public enum Property 
            + " This does not equate to how often tickets are actually renewed 
(which is"
            + " performed at 80% of the ticket lifetime).",
        "1.6.5"),
 -  @Deprecated(since = "2.1.3")
 -  @ReplacedBy(property = RPC_MAX_MESSAGE_SIZE)
 -  GENERAL_MAX_MESSAGE_SIZE("general.server.message.size.max", "1G", 
PropertyType.BYTES,
 -      "The maximum size of a message that can be sent to a server.", "1.5.0"),
 -  @Experimental
    GENERAL_OPENTELEMETRY_ENABLED("general.opentelemetry.enabled", "false", 
PropertyType.BOOLEAN,
-       "Enables tracing for all spans in the process using OpenTelemetry 
(assuming OpenTelemetry is "
-           + "configured). When true, if a thread with no active trace 
encounters a span, then a new trace with "
-           + "a new id is started. When this property is false, RPC requests 
that arrive at a process with tracing "
-           + "set will still emit traces for all spans as long as 
OpenTelemetry is properly configured. For example, "
-           + "if this property is only set for the Accumulo GC server, then 
all RPCs initiated by the GC would emit "
-           + "trace data across the cluster. However, threads on non gc server 
processes with no active trace would "
-           + "not emit anything when they encounter a span.",
+       "Enables OpenTelemetry traces for new spans in the server process that 
are not already part "
+           + "of an existing trace. Spans that are part of an existing trace, 
such as one "
+           + "originating in client code and propagated to the server over an 
RPC request, are "
+           + "always traced, regardless of this value. (Note: no tracing will 
occur if "
+           + "OpenTelemetry is not first configured for the JVM).",
        "2.1.0"),
 -  GENERAL_THREADPOOL_SIZE("general.server.threadpool.size", "1", 
PropertyType.COUNT,
 +  GENERAL_THREADPOOL_SIZE("general.server.threadpool.size", "3", 
PropertyType.COUNT,
        "The number of threads to use for server-internal scheduled tasks.", 
"2.1.0"),
 -  @Deprecated(since = "2.1.0")
 -  @ReplacedBy(property = GENERAL_THREADPOOL_SIZE)
 -  
GENERAL_SIMPLETIMER_THREADPOOL_SIZE("general.server.simpletimer.threadpool.size",
 "1",
 -      PropertyType.COUNT, "The number of threads to use for server-internal 
scheduled tasks.",
 -      "1.7.0"),
    // If you update the default type, be sure to update the default used for 
initialization failures
    // in VolumeManagerImpl
 -  @Experimental
    GENERAL_VOLUME_CHOOSER("general.volume.chooser", 
RandomVolumeChooser.class.getName(),
        PropertyType.CLASSNAME,
        "The class that will be used to select which volume will be used to 
create new files.",

Reply via email to