feat(service): enable tracing on all services #3135
Merged
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
golangci
reviewed
Aug 3, 2018
| "github.com/ovh/cds/sdk" | ||
| "github.com/ovh/cds/sdk/hatchery" | ||
| "github.com/ovh/cds/sdk/log" | ||
| ) | ||
|
|
||
| //create the docker bridge | ||
| func (h *HatcherySwarm) createNetwork(dockerClient *dockerClient, name string) error { | ||
| func (h *HatcherySwarm) createNetwork(ctx context.Context, dockerClient *dockerClient, name string) error { | ||
| ctx, end := tracing.Span(ctx, "swarm.createNetwork", tracing.Tag("network", name)) |
| @@ -46,7 +49,10 @@ type containerArgs struct { | |||
| } | |||
|
|
|||
| //shortcut to create+start(=run) a container | |||
| func (h *HatcherySwarm) createAndStartContainer(dockerClient *dockerClient, cArgs containerArgs, spawnArgs hatchery.SpawnArguments) error { | |||
| func (h *HatcherySwarm) createAndStartContainer(ctx context.Context, dockerClient *dockerClient, cArgs containerArgs, spawnArgs hatchery.SpawnArguments) error { | |||
| ctx, end := tracing.Span(ctx, "swarm.createAndStartContainer", tracing.Tag(tracing.TagWorker, cArgs.name)) | |||
sdk/hatchery/hatchery.go
Outdated
| tracing.Tag("reason", reason), | ||
| ) | ||
| } | ||
| tracing.End(currentCtx, nil, nil) |
There was a problem hiding this comment.
Error return value of tracing.End is not checked
yesnault
approved these changes
Aug 3, 2018
golangci
reviewed
Aug 3, 2018
sdk/hatchery/hatchery.go
Outdated
| tracing.Tag("reason", reason), | ||
| ) | ||
| } | ||
| _ = tracing.End(currentCtx, nil, nil) |
| @@ -89,11 +95,13 @@ func (h *HatcherySwarm) createAndStartContainer(dockerClient *dockerClient, cArg | |||
| } | |||
| } | |||
|
|
|||
| _ := next tracing.Span(ctx, "swarm.dockerClient.ImageList") | |||
There was a problem hiding this comment.
expected ';', found 'IDENT' tracing (and 3 more errors)
| if errl != nil { | ||
| log.Warning("createAndStartContainer> Unable to list images: %s", errl) | ||
| } | ||
| next() |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| @@ -111,19 +119,28 @@ checkImage: | |||
| } | |||
|
|
|||
| if !imageFound { | |||
| _ := next tracing.Span(ctx, "swarm.dockerClient.pullImage", tracing.Tag("image", cArgs.image)) | |||
golangci
reviewed
Aug 3, 2018
| } | ||
|
|
||
| c, err := dockerClient.ContainerCreate(context.Background(), config, hostConfig, networkingConfig, name) | ||
| _, next:= tracing.Span(ctx, "swarm.dockerClient.ContainerCreate", tracing.Tag(tracing.TagWorker, cArgs.name), tracing.Tag("network", fmt.Sprintf("%v", networkingConfig)) |
There was a problem hiding this comment.
missing ',' before newline in argument list (and 10 more errors)
| @@ -213,12 +221,12 @@ func (h *HatcherySwarm) SpawnWorker(spawnArgs hatchery.SpawnArguments) (string, | |||
| if network == "" { | |||
| network = name + "-net" | |||
| networkAlias = "worker" | |||
| if err := h.createNetwork(dockerClient, network); err != nil { | |||
| if err := h.createNetwork(ctx, dockerClient, network); err != nil { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| @@ -268,7 +276,7 @@ func (h *HatcherySwarm) SpawnWorker(spawnArgs hatchery.SpawnArguments) (string, | |||
| entryPoint: nil, | |||
| } | |||
|
|
|||
| if err := h.createAndStartContainer(dockerClient, args, spawnArgs); err != nil { | |||
| if err := h.createAndStartContainer(ctx, dockerClient, args, spawnArgs); err != nil { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| @@ -386,7 +394,7 @@ func (h *HatcherySwarm) SpawnWorker(spawnArgs hatchery.SpawnArguments) (string, | |||
| } | |||
|
|
|||
| //start the worker | |||
| if err := h.createAndStartContainer(dockerClient, args, spawnArgs); err != nil { | |||
| if err := h.createAndStartContainer(ctx, dockerClient, args, spawnArgs); err != nil { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
|
CDS Report ut-engine#5354.0 ✘
|
bnjjj
approved these changes
Aug 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.