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

Support Opentracing with Datadog - part 2 #3766

Merged
merged 1 commit into from
Feb 16, 2019
Merged

Support Opentracing with Datadog - part 2 #3766

merged 1 commit into from
Feb 16, 2019

Conversation

ellieayla
Copy link
Contributor

What this PR does / why we need it:

Support Opentracing with Datadog, alongside Zipkin and Jaeger.

  • Build libdd_opentracing.so from source, install it in the nginx container.
  • Plumb configuration options from the ConfigMap down to the library via /etc/nginx/opentracing.json template.
  • Add markdown documentation.

Which issue this PR fixes: fixes #3752

Special notes for your reviewer: I didn't sink a lot of time into this. I am open to alternative approaches/implementations, or improvement suggestions.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 14, 2019
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Feb 14, 2019
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 14, 2019
@aledbf
Copy link
Member

aledbf commented Feb 14, 2019

@alanjcastonguay please split this PR in two. In the first one change the content of images/nginx/* and increase the version to 0.77 and in the second one change the nginx image to use https://github.com/kubernetes/ingress-nginx/blob/master/Makefile#L64

This is because we need to build and publish the nginx image before being able to run the e2e tests

@ellieayla ellieayla changed the title WIP: Support Opentracing with Datadog Support Opentracing with Datadog - part 2 Feb 15, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 15, 2019
@ellieayla
Copy link
Contributor Author

Thanks for the feedback, @aledbf. All the changes under images/nginx/* were in a single commit 248d9b3, so I cut a new branch from it and created PR #3767, then reverted that commit from here.

Added a pair of commits, one to each PR, for a merge conflict - I branched from before 0.76.

I am working on the CLA.

@ellieayla
Copy link
Contributor Author

/check-cla

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 15, 2019
@aledbf
Copy link
Member

aledbf commented Feb 15, 2019

@alanjcastonguay please squash the commits

This commit is part 2 of 2, adding configuration of the
Datadog Opentracing module to the controller.

Fixes half of #3752
@aledbf
Copy link
Member

aledbf commented Feb 16, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 16, 2019
@aledbf
Copy link
Member

aledbf commented Feb 16, 2019

@alanjcastonguay thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alanjcastonguay, aledbf

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 16, 2019
@k8s-ci-robot k8s-ci-robot merged commit 39906c9 into kubernetes:master Feb 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support Opentracing with Datadog
3 participants