Skip to content

Commit 0dc0338

Browse files
committed
Added "N/A" constant
1 parent 61875e5 commit 0dc0338

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/common/telemetry/Telemetry.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#define TELEMETRY_BINARY_NAME "OSConfigTelemetry"
2626
#define TELEMETRY_TIMEOUT_SECONDS 10
27+
#define TELEMETRY_NOTFOUND_STRING "N/A"
2728

2829
#define TELEMETRY_CORRELATIONID_ENVIRONMENT_VAR "activityId"
2930
#define TELEMETRY_RULECODENAME_ENVIRONMENT_VAR "_RuleCodename"
@@ -81,7 +82,7 @@ static inline int OSConfigTelemetryIsInitialized(void)
8182
}
8283
static inline const char* OSConfigTelemetryGetCachedOsName(void)
8384
{
84-
return "N/A";
85+
return TELEMETRY_NOTFOUND_STRING;
8586
}
8687
#endif
8788

@@ -183,9 +184,9 @@ static inline void OSConfigGetElapsedTime(int64_t* elapsed_us_var)
183184
"\"CorrelationId\":\"%s\"," \
184185
"\"Version\":\"%s\"" \
185186
"}", \
186-
_timestamp ? _timestamp : "N/A", __FILE__, line, __func__, _ruleCodename ? _ruleCodename : "N/A", \
187-
(callingFunctionName) ? (callingFunctionName) : "N/A", status, _scenarioName, _elapsed_us, _distroName ? _distroName : "N/A", \
188-
_correlationId ? _correlationId : "N/A", OSCONFIG_VERSION); \
187+
_timestamp ? _timestamp : TELEMETRY_NOTFOUND_STRING, __FILE__, line, __func__, _ruleCodename ? _ruleCodename : TELEMETRY_NOTFOUND_STRING, \
188+
(callingFunctionName) ? (callingFunctionName) : TELEMETRY_NOTFOUND_STRING, status, _scenarioName, _elapsed_us, \
189+
_distroName ? _distroName : TELEMETRY_NOTFOUND_STRING, _correlationId ? _correlationId : TELEMETRY_NOTFOUND_STRING, OSCONFIG_VERSION); \
189190
if (NULL != telemetry_json) \
190191
{ \
191192
OSConfigTelemetryAppendJSON(telemetry_json); \
@@ -210,8 +211,9 @@ static inline void OSConfigGetElapsedTime(int64_t* elapsed_us_var)
210211
"\"CorrelationId\":\"%s\"," \
211212
"\"Version\":\"%s\"" \
212213
"}", \
213-
timestamp ? timestamp : "N/A", (baselineName) ? (baselineName) : "N/A", (mode) ? (mode) : "N/A", durationSeconds, \
214-
distroName ? distroName : "N/A", correlationId ? correlationId : "N/A", OSCONFIG_VERSION); \
214+
timestamp ? timestamp : TELEMETRY_NOTFOUND_STRING, (baselineName) ? (baselineName) : TELEMETRY_NOTFOUND_STRING, \
215+
(mode) ? (mode) : TELEMETRY_NOTFOUND_STRING, durationSeconds, distroName ? distroName : TELEMETRY_NOTFOUND_STRING, \
216+
correlationId ? correlationId : TELEMETRY_NOTFOUND_STRING, OSCONFIG_VERSION); \
215217
if (NULL != telemetry_json) \
216218
{ \
217219
OSConfigTelemetryAppendJSON(telemetry_json); \
@@ -237,8 +239,9 @@ static inline void OSConfigGetElapsedTime(int64_t* elapsed_us_var)
237239
"\"CorrelationId\":\"%s\"," \
238240
"\"Version\":\"%s\"" \
239241
"}", \
240-
timestamp ? timestamp : "N/A", (componentName) ? (componentName) : "N/A", (objectName) ? (objectName) : "N/A", objectResult, microseconds, \
241-
distroName ? distroName : "N/A", correlationId ? correlationId : "N/A", OSCONFIG_VERSION); \
242+
timestamp ? timestamp : TELEMETRY_NOTFOUND_STRING, (componentName) ? (componentName) : TELEMETRY_NOTFOUND_STRING, \
243+
(objectName) ? (objectName) : TELEMETRY_NOTFOUND_STRING, objectResult, microseconds, distroName ? distroName : TELEMETRY_NOTFOUND_STRING, \
244+
correlationId ? correlationId : TELEMETRY_NOTFOUND_STRING, OSCONFIG_VERSION); \
242245
if (NULL != telemetry_json) \
243246
{ \
244247
OSConfigTelemetryAppendJSON(telemetry_json); \

0 commit comments

Comments
 (0)