feat!: Allow overriding default tags #183
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
This change involves moving the directive definitions to their respective "submodules". This is an initial step toward modularizing the module, ensuring a clear separation of concerns between the different products.
Introduces the ability to override default tags using `datadog_set`. Changes: - Refactor how tags are stored. - BREAKING CHANGE: only value tags can contain expressions which can be evaluated during request processing. - Update directive callbacks to use `NGX_CONF_OK` instead of `NGX_OK` for better consistency.
dmehala
requested review from
cataphract,
dubloom and
pablomartinezbernardo
and removed request for
a team and
cataphract
dmehala
commented
Mar 11, 2025
|
@dmehala update the documentation please. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dmehala/drop-in-otel-support #183 +/- ##
================================================================
- Coverage 72.06% 72.01% -0.05%
================================================================
Files 46 47 +1
Lines 6464 6432 -32
Branches 918 907 -11
================================================================
- Hits 4658 4632 -26
- Misses 1364 1367 +3
+ Partials 442 433 -9
🚀 New features to boost your workflow:
|
pablomartinezbernardo
approved these changes
Mar 12, 2025
src/common/directives
Outdated
There was a problem hiding this comment.
May be a left over?
There was a problem hiding this comment.
addressed in 6556270
src/tracing/directives.cpp
Outdated
Comment on lines
44
to
62
| static ngx_http_complex_value_t *make_complex_value(ngx_conf_t *cf, | ||
| ngx_str_t &value) { | ||
| auto *cv = (ngx_http_complex_value_t *)ngx_pcalloc( | ||
| cf->pool, sizeof(ngx_http_complex_value_t)); | ||
|
|
||
| ngx_http_compile_complex_value_t ccv; | ||
| ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); | ||
|
|
||
| ccv.cf = cf; | ||
| ccv.value = &value; | ||
| ccv.complex_value = cv; | ||
| ccv.zero = 0; | ||
| ccv.conf_prefix = 0; | ||
|
|
||
| if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { | ||
| return nullptr; | ||
| } | ||
|
|
||
| return static_cast<char *>(NGX_CONF_OK); | ||
| return cv; |
There was a problem hiding this comment.
Is it possible to reuse the implementation from common? Or does it actually need to be duplicated for some reason?
There was a problem hiding this comment.
addressed in 6556270
pablomartinezbernardo
approved these changes
Mar 13, 2025
dmehala
force-pushed
the
dmehala/drop-in-otel-support
branch
from
c848361 to
ca24ac6
Compare
dmehala
force-pushed
the
dmehala/drop-in-otel-support
branch
from
ca24ac6 to
5ebca82
Compare
![datadog-datadog-prod-us1[bot]](https://avatars.githubusercontent.com/u/365230?s=60&v=4){kind=small}
Comment on lines
+155
to
+156
| if span["service"] != "nginx": | ||
| continue |
There was a problem hiding this comment.
🔴 Code Quality Violation
too many nesting levels (...read more)
Avoid to nest too many loops together. Having too many loops make your code harder to understand.
Prefer to organize your code in functions and unit of code you can clearly understand.
Learn More
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.
Introduces the ability to override default tags using
datadog_set.Changes:
NGX_CONF_OKinstead ofNGX_OKfor better consistency.Resolves #172
How this solves #172?
This allows
http.urlto be overriden. To remove query string from the URL, one can sethttp.urlto$scheme://$http_host$uri, where$uriis the normalized version of$request_uriused by default.Usage example: