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

Db/agent5 apm #203

Merged
merged 7 commits into from
Oct 30, 2017
Merged

Db/agent5 apm #203

merged 7 commits into from
Oct 30, 2017

Conversation

derekwbrown
Copy link
Contributor

@derekwbrown derekwbrown commented Oct 26, 2017

Builds and installs the trace agent as part of the metrics agent.

Builds trace-agent.exe
signs trace-agent.exe
installs trace-agent.exe as a demand start service, dependent on the datadog-agent service.

Also included in this PR is repairing the individual checks package builds, which were confused by the presence of the new 'docs' directory.

Copy link

@masci masci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@derekwbrown derekwbrown merged commit b04664a into master Oct 30, 2017
@olivielpeau olivielpeau added this to the 5.19.0 milestone Oct 31, 2017
olivielpeau pushed a commit that referenced this pull request Nov 1, 2017
* Enable trace agent for windows/agent5

* Replace datadog-trace-agent definition with the one from agent6

* Modify existing recipe to do Windows in the same manner

* Add service definition to msi

* Fix declaration of extra_package_dir for integration package builds

* Work around 'docs' directory, which isn't a check directory and confuses
the build when we build all checks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants