fix(datadog): preserve service_id fallback when service has no name - #14001
Open
bhuvan-somisetty wants to merge 1 commit into
Open
bhuvan-somisetty wants to merge 1 commit into
bhuvan-somisetty wants to merge 1 commit into
Conversation
When prefer_name is enabled (the default), datadog checked `if svc and svc.value.name ~= ""`. Because in Lua `nil ~= ""` evaluates to true, when a service was configured without an optional `name` field, `svc.value.name` was nil and overwrote `entry.service_id` with nil. This caused the `service_name` tag to be omitted entirely from emitted DogStatsD metrics. Check `svc.value.name` for truthiness before assigning, ensuring the tag falls back to the service ID as intended. Fixes apache#14000 Signed-off-by: bhuvan-somisetty <somisettybhuvan5@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
In
apisix/plugins/datadog.lua, whenprefer_nameis enabled (defaulttrue), the plugin attempts to replaceentry.service_idwithsvc.value.nameif available.Previously, it checked
if svc and svc.value.name ~= "" then. Because in Luanil ~= ""evaluates totrue, if a service did not have an optionalnameconfigured,svc.value.namewasniland overwroteentry.service_idwithnil. This resulted in theservice_nametag being completely dropped from emitted DogStatsD metrics instead of falling back to the service ID.This change verifies that
svc.value.nameis truthy before assigning, preserving the service ID fallback as intended, and adds unit test coverage.Which issue(s) this PR fixes:
Fixes #14000
Checklist