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

add datadog java tracer and APM options #43

Merged
merged 3 commits into from
Aug 31, 2023
Merged

Conversation

labkey-willm
Copy link
Contributor

@labkey-willm labkey-willm commented Aug 29, 2023

This adds the dd-java-agent.jar to the image, but only adds it to the final java command line if DD_COLLECT_APM==true.

Also comments out several duplicate CONSOLE outputs.

@labkey-willm labkey-willm requested review from labkey-stuartm and removed request for labkey-stuartm August 29, 2023 22:27
@@ -205,6 +205,10 @@ RUN mkdir -p /usr/src/awsclizip "${LABKEY_HOME}/awsclibin" "${LABKEY_HOME}/aws-c
&& rm -rf /usr/src/awsclizip \
&& chown -R labkey:labkey "${LABKEY_HOME}/awsclibin" "${LABKEY_HOME}/aws-cli"

# install datadog tracing agent
RUN mkdir -p datadog \
&& wget -q -O datadog/dd-java-agent.jar https://dtdg.co/latest-java-tracer
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to pin this to a particular version or always grab that latest? I know we generally want to stay current, but sometimes it's painful to not have more explicit control.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We've been allowing cloud deployments to always pull the latest version of the main datadog agent and tracer for most of a year without an issue. I feel like their dev/release processes are very robust and would rather take that risk than have one more thing to version bump. If it broke it would probably fail the teamcity build anyway (if we enable all the datadog features in the build job, which seems prudent).

Copy link
Contributor

Choose a reason for hiding this comment

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

OK!

@labkey-willm labkey-willm merged commit 149c7d6 into develop Aug 31, 2023
4 checks passed
@labkey-willm labkey-willm deleted the fb_enable_dd_apm branch August 31, 2023 21:45
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