Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to specify trace env #435

Merged
merged 1 commit into from May 5, 2017

Conversation

Projects
None yet
2 participants
@krasnoukhov
Copy link
Contributor

krasnoukhov commented May 5, 2017

Our APM just recently started reporting to "env:none". Adding tags to a datadog.conf does not help for whatever reason. I noticed that configuring trace like this is missing from chef, so here we go.

https://app.datadoghq.com/apm/docs/tutorials/environments

@krasnoukhov krasnoukhov changed the title Alolow to specify trace env Allow to specify trace env May 5, 2017

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented May 5, 2017

Hi @krasnoukhov, thanks for adding this! Actually I just merged #433 and it conflicts with your PR unfortunately, could you rebase yours? (and maybe change the template condition to <% unless node['datadog']['trace_env'].nil? -%> to be consistent with #433, unless you think your condition makes more sense)

@krasnoukhov

This comment has been minimized.

Copy link
Contributor Author

krasnoukhov commented May 5, 2017

@olivielpeau
Copy link
Member

olivielpeau left a comment

Thanks @krasnoukhov, one last thing to change and it should be good to merge

@@ -183,6 +183,11 @@ end
apm_enabled: <%= node['datadog']['enable_trace_agent'] %>
<% end -%>

[trace.config]
<% unless node['datadog']['trace_env'].nil? -%>
env = <%= node['datadog']['trace_env'] %>

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau May 5, 2017

Member

Could you use env: instead of env = here? I know the 2 syntaxes should be similar in the ini format but still I'd rather be consistent with the other options

This comment has been minimized.

Copy link
@krasnoukhov

krasnoukhov May 5, 2017

Author Contributor

Oh yeah totally missed that. I copied the line from documentation initially, so that could be changed as well

@olivielpeau olivielpeau added this to the 2.10.0 milestone May 5, 2017

@olivielpeau olivielpeau added the feature label May 5, 2017

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented May 5, 2017

Thanks! Merging

@olivielpeau olivielpeau merged commit b8e5a72 into DataDog:master May 5, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@krasnoukhov krasnoukhov deleted the simplepractice:trace-config branch May 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.