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

OpenTracing First Impl #1692

Merged
merged 1 commit into from
Feb 18, 2019

Conversation

sjug
Copy link
Contributor

@sjug sjug commented Oct 22, 2018

Intentionally not squashed as I'm not sure if the PR should be broken up further.
There is also a relatively large corresponding PR to containers/image.

Nothing crazy going on, just a simple implementation of OpenTracing.

@mheon
Copy link
Member

mheon commented Oct 22, 2018

Nice! I'll do a more thorough review later, but a once-over finds nothing wrong

@openshift-ci-robot openshift-ci-robot added size/L needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 22, 2018
@mheon
Copy link
Member

mheon commented Oct 22, 2018

/approve

@mheon
Copy link
Member

mheon commented Oct 22, 2018

/ok-to-test

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 22, 2018
cmd/podman/main.go Outdated Show resolved Hide resolved
@baude
Copy link
Member

baude commented Oct 23, 2018

the test failures look legit on PAPR. Is there an issue with vendoring of code?

@sjug
Copy link
Contributor Author

sjug commented Oct 23, 2018

@baude Ah you're right I didn't vendor anything in, thanks.

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L labels Oct 23, 2018
@sjug
Copy link
Contributor Author

sjug commented Oct 23, 2018

/retest

@baude
Copy link
Member

baude commented Oct 23, 2018

@sjug looks like a gofmt error..

@TomSweeneyRedHat
Copy link
Member

gofmt errors. Wonder if we're getting bit by the version diff of gofmt between go1.10 and go1.11.

@sjug
Copy link
Contributor Author

sjug commented Oct 23, 2018

Thanks, I missed that. Not sure what was the cause as I'm on 1.11+ everywhere.

@sjug
Copy link
Contributor Author

sjug commented Oct 23, 2018

What do I need for does not have a valid DCO?

@rhatdan
Copy link
Member

rhatdan commented Oct 23, 2018

All of you PR's need to be signed
git commit -a --amend -s

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #1639) made this pull request unmergeable. Please resolve the merge conflicts.

@sjug sjug force-pushed the opentracing_clean branch 3 times, most recently from d02d568 to ca8eb75 Compare October 23, 2018 13:06
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

could we split the update for vendor/github.com/urfave/cli/context.go to a different patch? It will make the review easier, and it will also be easier to bisect in future

cmd/podman/main.go Outdated Show resolved Hide resolved
cmd/podman/utils.go Outdated Show resolved Hide resolved
cmd/podman/common.go Outdated Show resolved Hide resolved
@sjug
Copy link
Contributor Author

sjug commented Oct 23, 2018

I agree @giuseppe, should I separate vendor/github.com/urfave/cli/context.go into a different commit or a different PR altogether?

@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 17, 2019
@sjug
Copy link
Contributor Author

sjug commented Feb 17, 2019

Thanks @rhatdan, do you think we could merge this sometime this week?

@mheon
Copy link
Member

mheon commented Feb 17, 2019 via email

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #2295) made this pull request unmergeable. Please resolve the merge conflicts.

@giuseppe
Copy link
Member

LGTM

@TomSweeneyRedHat
Copy link
Member

IDK what's up, but it looks like vendor isn't happy with this atm.

@sjug
Copy link
Contributor Author

sjug commented Feb 18, 2019

@TomSweeneyRedHat I can't reproduce whatever the gating failure is? As I mentioned up here.
Any suggestions for how to fix this?

@mheon
Copy link
Member

mheon commented Feb 18, 2019

@vrothberg Mind taking a look at the vendoring failure in gating?

@mheon
Copy link
Member

mheon commented Feb 18, 2019

Code LGTM

@vrothberg
Copy link
Member

vrothberg commented Feb 18, 2019

@vrothberg Mind taking a look at the vendoring failure in gating?

The scripts claims inconsistencies with the following files:

D vendor/github.com/opentracing/opentracing-go/LICENSE D vendor/github.com/opentracing/opentracing-go/README.md D vendor/github.com/opentracing/opentracing-go/ext/tags.go D vendor/github.com/opentracing/opentracing-go/globaltracer.go D vendor/github.com/opentracing/opentracing-go/gocontext.go D vendor/github.com/opentracing/opentracing-go/log/field.go D vendor/github.com/opentracing/opentracing-go/log/util.go D vendor/github.com/opentracing/opentracing-go/noop.go D vendor/github.com/opentracing/opentracing-go/propagation.go D vendor/github.com/opentracing/opentracing-go/span.go D vendor/github.com/opentracing/opentracing-go/tracer.go M vendor/github.com/uber/jaeger-lib/metrics/factory.go M vendor/github.com/uber/jaeger-lib/metrics/metrics.go ?? vendor/github.com/uber/jaeger-lib/metrics/histogram.go

One issue is that github.com/uber/jaeger-lib is vendoring a branch, which is something we don't do/allow anymore for various reasons such as reproducibility, maintainability and also for packaging. Some distributions do not use the ./vendor folder but package all dependencies separately. Having a branch makes all these things very hard.

Another issue seems to be that too many files are added to vendor/github.com/opentracing/opentracing-go/. One way to resolve the issue is running make vendor locally and adding the remaining changes. After that, the script should pass.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2019
@sjug sjug force-pushed the opentracing_clean branch 2 times, most recently from bda210c to f7c4600 Compare February 18, 2019 14:56
Drop context.Context field from cli.Context

Signed-off-by: Sebastian Jug <sejug@redhat.com>
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2019
@sjug
Copy link
Contributor Author

sjug commented Feb 18, 2019

@vrothberg Thank you, I have updated the opentracing deps to use commits instead and run make vendor as suggested.

@TomSweeneyRedHat
Copy link
Member

Thanks for the assist @vrothberg !

@vrothberg
Copy link
Member

A pleasure :) The script is fairly new. Such feedback is really helpful in improving documentation and the output of the script as well.

@rhatdan
Copy link
Member

rhatdan commented Feb 18, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 18, 2019
@openshift-merge-robot openshift-merge-robot merged commit c9b1313 into containers:master Feb 18, 2019
@sjug
Copy link
Contributor Author

sjug commented Feb 18, 2019

Thanks @rhatdan and all reviewers! This PR initializes the tracing spans in the top level functions (run, pull, etc), but then we also need the further containers/image PR to continue the trace into the libs as well.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet