-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Makefile use GNU sed and force thrift to use the same user #377
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
Conversation
I'm getting this:
|
hmm It worked well with my sed, also with @jpkrohling and @objectiser.
|
I'm using the default MacOS sed, which has no version, but its man page says
basically the |
I have added a simple hack. It would be better to use just the standard GNU version https://stackoverflow.com/a/34815955/4158442. When I run it, it produces some changes like: diff --git a/thrift-gen/jaeger/tchan-jaeger.go b/thrift-gen/jaeger/tchan-jaeger.go
index 393b8f1..89e1e9c 100644
--- a/thrift-gen/jaeger/tchan-jaeger.go
+++ b/thrift-gen/jaeger/tchan-jaeger.go
@@ -43,6 +43,10 @@ func (c *tchanCollectorClient) SubmitBatches(ctx thrift.Context, batches []*Batc
}
success, err := c.client.Call(ctx, c.thriftService, "submitBatches", &args, &resp)
if err == nil && !success {
+ switch {
+ default:
+ err = fmt.Errorf("received no result or unknown exception for submitBatches")
+ }
}
return resp.GetSuccess(), err Is it fine? |
don't think the hack quite worked. when I ran
I think the |
This is bad I will revert to pure GNU sed. Can we just use the standard GNU sed which is available on all systems? It's definitely a good thing for the community. Gnu sed can be easily installed on MacOS. |
I have tried the last workaroud using |
I have mixed feelings about it, installing GNU sed is simple using brew, but one needs to finagle the path to make it the default sed that is used for everything. (Also, it would probably break other software that assumes that BSD sed is installed) Is it too bad to have a conditional on |
@vprithvi now it should be compatible with BSD and GNU could you please test it? |
Works for me, could you add a comment on why we are doing these shenanigans with |
works for me. I restarted the builds. |
…cing#377) * Makefile use GNU sed and force thrift to use the same user * sed hack to run -i in BSD and GNU version * try -i.bak workaround * Add comment to makefile
fixes #339