From 46be75a6830fdf143833b1203ed641c7dcc6a5e3 Mon Sep 17 00:00:00 2001
From: Rodrigo Pastrana <Rodrigo.Pastrana@lexisnexisrisk.com>
Date: Tue, 31 Oct 2023 16:21:57 -0400
Subject: [PATCH] HPCC-30405 Code review

- Renames disable config to disabled

Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexisrisk.com>
---
 helm/hpcc/values.schema.json | 4 ++++
 helm/hpcc/values.yaml        | 2 +-
 system/jlib/jtrace.cpp       | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/helm/hpcc/values.schema.json b/helm/hpcc/values.schema.json
index 569f7ad715b..b5642887899 100644
--- a/helm/hpcc/values.schema.json
+++ b/helm/hpcc/values.schema.json
@@ -1102,6 +1102,10 @@
         "alwaysCreateGlobalIds": {
           "type": "boolean",
           "description": "If true, allocate global ids to any requests that do not supply one"
+        },
+        "disabled": {
+          "type": "boolean",
+          "description": "If true, disable OTel based trace/span generation"
         }
       },
       "additionalProperties": { "type": ["integer", "string", "boolean"] }
diff --git a/helm/hpcc/values.yaml b/helm/hpcc/values.yaml
index c7ea02bb416..8cf1695b94f 100644
--- a/helm/hpcc/values.yaml
+++ b/helm/hpcc/values.yaml
@@ -27,7 +27,7 @@ global:
 
   # tracing sets the default tracing information for all components. Can be overridden locally
   tracing:
-    disable: false
+    disabled: false
 
   ## resource settings for stub components
   #stubInstanceResources:
diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp
index 37eddd90bef..48ee21fcdf8 100644
--- a/system/jlib/jtrace.cpp
+++ b/system/jlib/jtrace.cpp
@@ -841,7 +841,7 @@ class CTraceManager : implements ITraceManager, public CInterface
     Expected Configuration format:
     global:
         tracing:                            #optional - tracing enabled by default
-            disable: true                   #optional - disable OTel tracing
+            disabled: true                   #optional - disable OTel tracing
             alwaysCreateGlobalIds : false   #optional - should global ids always be created?
             exporter:                       #optional - Controls how trace data is exported/reported
               type: OTLP                    #OS|OTLP|Prometheus|HPCC (default: no export, jlog entry)
@@ -878,7 +878,7 @@ class CTraceManager : implements ITraceManager, public CInterface
             toXML(traceConfig, xml);
             DBGLOG("traceConfig tree: %s", xml.str());
 #endif
-            bool disableTracing = traceConfig && traceConfig->getPropBool("@disable", false);
+            bool disableTracing = traceConfig && traceConfig->getPropBool("@disabled", false);
 
             using namespace opentelemetry::trace;
             if (disableTracing)