Add DD_TAGS environment variable #980
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
delner
added
bug
delner
force-pushed
the
feature/add_tags_env_var
branch
from
b396e4e
to
a22c211
Compare
delner
commented
Mar 20, 2020
| @@ -158,7 +155,8 @@ def default_service | |||
| # | |||
| # tracer.set_tags('env' => 'prod', 'component' => 'core') | |||
| def set_tags(tags) | |||
| @tags.update(tags) | |||
| string_tags = Hash[tags.collect { |k, v| [k.to_s, v] }] | |||
There was a problem hiding this comment.
This fixes one of the bugs where Symbols and Strings weren't being quantized to the same key, causing duplicates.
brettlangdon
approved these changes
Mar 20, 2020
| @tags.each { |k, v| span.set_tag(k, v) } unless @tags.empty? | ||
| tags.each { |k, v| span.set_tag(k, v) } unless tags.empty? |
delner
commented
Mar 20, 2020
| @tags.each { |k, v| span.set_tag(k, v) } unless @tags.empty? | ||
| tags.each { |k, v| span.set_tag(k, v) } unless tags.empty? |
There was a problem hiding this comment.
This fixes the other bug where default tags were overriding tags manually set upon the span.
delner
commented
Mar 20, 2020
| @@ -77,8 +77,8 @@ | |||
| expect(Datadog::Logger.log).to eq(custom_log) | |||
| expect(tracer.writer.transport.current_api.adapter.hostname).to eq('tracer.host.com') | |||
| expect(tracer.writer.transport.current_api.adapter.port).to eq(1234) | |||
| expect(tracer.tags[:env]).to eq(:config_test) | |||
| expect(tracer.tags[:foo]).to eq(:bar) | |||
| expect(tracer.tags['env']).to eq(:config_test) | |||
There was a problem hiding this comment.
I think changing this behavior is okay?
There was a problem hiding this comment.
hmm... I guess it depends if people are accessing tags directly via symbols?
otherwise, this shouldn't break anything on encoding or sending to the agent
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.
This pull request adds
DD_TAGSas a environment variable which can be used to set default tags on the tracer.It also does some minor refactoring of
DD_ENVintoDatadog::Environmentto make things a little cleaner/more consistent, and fixes two bugs::tagsoption toTracer#start_span.Tracer#set_tagse.g.tracer.set_tags(foo: :bar, 'foo' => :baz)would keep duplicates for each type which would lead to an arbitrary one being used. (Problematic if you aren't consistent when using strings vs symbols.)