Always serialize X-Datadog-Tags #242
Merged
Conversation
This file contains 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
cgilmour
approved these changes
Sep 9, 2022
src/span_context.cpp
Outdated
| // Inject the trace tags, even if they're empty of if an error occurred. | ||
| // This is to work around a quirk of nginx-opentracing. | ||
| // See <https://github.com/DataDog/dd-opentracing-cpp/issues/241>. | ||
| result = writer.Set(headers_impl.tags_header, tags ? *tags : ""); |
There was a problem hiding this comment.
Not a huge fan of ? notation
| REQUIRE(injected_json.find("tags") == injected_json.end()); | ||
| const auto tags = injected_json.find("tags"); | ||
| // See <https://github.com/DataDog/dd-opentracing-cpp/issues/241>. | ||
| REQUIRE((tags == injected_json.end() || *tags == "")); |
There was a problem hiding this comment.
Maybe a comment about why double-brackets were needed for future-me or future-you.
| -H 'X-Datadog-Sampling-Priority: 0' \ | ||
| http://localhost/proxy/ >/tmp/curl_log.txt | ||
|
|
||
| if [ "$(cat ${NGINX_ERROR_LOG} | grep 'no opentracing context value found for span context key ' | wc -l)" != "0" ] |
There was a problem hiding this comment.
Is there an easy way to verify that this captures any future propagation headers that would emit this error?
|
You might need to force-push a signed commit. Github basically saying "new laptop who dis?" |
- add an integration test that fails - still working on it... - always inject X-Datadog-Tags - uncomment the other integration tests - document the x-datadog-tags change - unit tests are a thing - clang-format-9 - generalize the most recent addition to the integration tests - address review comments
dgoffredo
force-pushed
the
david.goffredo/x-datadog-tags-nginx-hack
branch
from
c8bbaf5 to
ece6059
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
nginx-opentracing constrains us to set non-empty values for all propagation headers we wish to register in the "hack," or else a (harmless) error message will be printed to the nginx error log.
Propagating an empty header is silly, but will do no harm. Nginx will not send it anyway, and Envoy is unlikely to be affected by these changes as we move to a new library there.