feat(request-id): address PR feedback

* rephrase log message * remove unneeded conditional
Kong · Sep 26, 2023 · c652620 · c652620
1 parent 1b932fd
commit c652620
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/kong/runloop/handler.lua b/kong/runloop/handler.lua
@@ -1425,7 +1425,7 @@ return {
       -- X-Kong-Request-Id upstream header
       local rid, rid_get_err = request_id.get()
       if not rid then
-        log(WARN, "failed to set X-Kong-Request-Id header: ", rid_get_err)
+        log(WARN, "failed to get Request ID: ", rid_get_err)
       end
 
       local request_id_header = constants.HEADERS.REQUEST_ID
@@ -1530,7 +1530,7 @@ return {
       -- X-Kong-Request-Id downstream header
       local rid, rid_get_err = request_id.get()
       if not rid then
-        log(WARN, "failed to set X-Kong-Request-Id header: ", rid_get_err)
+        log(WARN, "failed to get Request ID: ", rid_get_err)
       end
 
       local request_id_header = constants.HEADERS.REQUEST_ID

diff --git a/kong/tracing/propagation.lua b/kong/tracing/propagation.lua
@@ -546,11 +546,9 @@ local function add_trace_id_formats(trace_id_new_fmt)
   -- TODO: @samugi - move this in the unified tracing context
   local trace_id_all_fmt = ngx.ctx.propagation_trace_id_all_fmt or {}
 
-  -- add new formats to trace ID (if not already present)
+  -- add new formats to trace ID
   for format, value in pairs(trace_id_new_fmt) do
-    if not trace_id_all_fmt[format] then
-      trace_id_all_fmt[format] = value
-    end
+    trace_id_all_fmt[format] = value
   end
 
   ngx.ctx.propagation_trace_id_all_fmt = trace_id_all_fmt