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 opentracing operation name settings #5931

Conversation

bvandewalle
Copy link
Contributor

What this PR does / why we need it:

Based on stale PR #4118
In order to set custom span names for server and location span use the following config items in the configmap:

opentracing-operation-name: "HTTP $request_method $uri"
opentracing-location-operation-name: "HTTP $request_method $uri"

Which issue/s this PR fixes

fixes #5829
fixes #4116

How Has This Been Tested?

Original PR had some E2E tests. Modified them to make them load a tracer (Zipkin in this case, this is required for nginx to not crash)

Checklist:

  • [ x] My change requires a change to the documentation.
  • [ x] I have updated the documentation accordingly.
  • [ x] I've read the CONTRIBUTION guide
  • [ x] I have added tests to cover my changes.
  • [ x] All new and existing tests passed.

JorritSalverda and others added 2 commits June 7, 2019 14:19
…e config settings

With these settings custom span names can be used for the server span and location span

Signed-off-by: Jorrit Salverda <jsalverda@travix.com>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 23, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @bvandewalle!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @bvandewalle. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 23, 2020
@bvandewalle
Copy link
Contributor Author

@JorritSalverda In case you are still following this, it's based on your PR. Thanks for the initial work.

@aledbf
Copy link
Member

aledbf commented Jul 23, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 23, 2020
… to load at least one tracer to enable opentracing

Work on PR comments
Add tests for template builder

Signed-off-by: Bernard Van De Walle <bernard.vandewalle@getcruise.com>
@bvandewalle bvandewalle force-pushed the add-opentracing-operation-name-settings branch from 734b8a6 to f353720 Compare July 23, 2020 22:26
@bvandewalle
Copy link
Contributor Author

/retest

1 similar comment
@aledbf
Copy link
Member

aledbf commented Jul 23, 2020

/retest

@aledbf
Copy link
Member

aledbf commented Jul 24, 2020

/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 Jul 24, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jul 24, 2020
@aledbf
Copy link
Member

aledbf commented Jul 24, 2020

@bvandewalle thanks!

@k8s-ci-robot k8s-ci-robot merged commit ca74f9a into kubernetes:master Jul 24, 2020
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
4 participants