HPCC-30405 Code review

- Renames disable config to disabled Signed-off-by: Rodrigo Pastrana <[email protected]>
hpcc-systems · Oct 31, 2023 · 46be75a · 46be75a
1 parent 2a5853f
commit 46be75a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)