This repository has been archived by the owner on Aug 2, 2021. It is now read-only.
cmd/swarm/swarm-smoke: timeout flag #1041
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nonsense
commented
Dec 4, 2018
nonsense
commented
Dec 4, 2018
nonsense
commented
Dec 4, 2018
nonsense
commented
Dec 4, 2018
holisticode
reviewed
Dec 4, 2018
nonsense
commented
Dec 7, 2018
swarm/api/client/client.go
Outdated
| @@ -489,6 +502,17 @@ func (c *Client) TarUpload(hash string, uploader Uploader, defaultPath string, t | |||
| if err != nil { | |||
| return "", err | |||
| } | |||
|
|
|||
| opentracing.GlobalTracer().Inject( | |||
There was a problem hiding this comment.
@justelad I don't like this, because users might also use this client - we don't want opentracing headers to be added always.
There was a problem hiding this comment.
I suggest we get rid of this opentracing from here, so that we can merge this PR as it is, because it is getting large.
nonsense
commented
Dec 7, 2018
swarm/api/client/client.go
Outdated
| opentracing.HTTPHeaders, | ||
| opentracing.HTTPHeadersCarrier(req.Header)) | ||
|
|
||
| trace := GetClientTrace("swarm api client - upload tar", "swarm.api.client.uploadtar", uuid.New()[:8], &tn) |
There was a problem hiding this comment.
Remove swarm. We are adding the prefix as part of the reporter.
nonsense
commented
Dec 7, 2018
swarm/api/client/client.go
Outdated
| @@ -474,6 +482,11 @@ type UploadFn func(file *File) error | |||
| // TarUpload uses the given Uploader to upload files to swarm as a tar stream, | |||
| // returning the resulting manifest hash | |||
| func (c *Client) TarUpload(hash string, uploader Uploader, defaultPath string, toEncrypt bool) (string, error) { | |||
| ctx, sp := spancontext.StartSpan(context.Background(), "swarm.api.client.tarupload") | |||
nonsense
commented
Dec 7, 2018
| @@ -728,3 +752,57 @@ func (c *Client) GetFeedRequest(query *feed.Query, manifestAddressOrDomain strin | |||
| } | |||
| return &metadata, nil | |||
| } | |||
|
|
|||
| func GetClientTrace(traceMsg, metricPrefix, ruid string, tn *time.Time) *httptrace.ClientTrace { | |||
There was a problem hiding this comment.
Remove fetch and clienttrace prefixes - these can be added to metricsPrefix if needed.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.