Skip to content

Commit 7c186ab

Browse files
SergeyKanzhelevSergeyKanzhelev
committed
add a root span
1 parent 665d81d commit 7c186ab

23 files changed

+504
-181
lines changed

‎cmd/crictl/attach.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ var runtimeAttachCommand = &cli.Command{
8181
return cli.ShowSubcommandHelp(c)
8282
}
8383

84-
runtimeClient, err := getRuntimeService(c, 0)
84+
runtimeClient, err := getRuntimeService(0)
8585
if err != nil {
8686
return err
8787
}

‎cmd/crictl/container.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ var createContainerCommand = &cli.Command{
221221

222222
var imageClient internalapi.ImageManagerService
223223
if withPull {
224-
imageClient, err = getImageService(c)
224+
imageClient, err = getImageService()
225225
if err != nil {
226226
return err
227227
}
@@ -243,7 +243,7 @@ var createContainerCommand = &cli.Command{
243243
},
244244
}
245245

246-
runtimeClient, err := getRuntimeService(c, opts.timeout)
246+
runtimeClient, err := getRuntimeService(opts.timeout)
247247
if err != nil {
248248
return err
249249
}
@@ -266,7 +266,7 @@ var startContainerCommand = &cli.Command{
266266
if c.NArg() == 0 {
267267
return errors.New("ID cannot be empty")
268268
}
269-
runtimeClient, err := getRuntimeService(c, 0)
269+
runtimeClient, err := getRuntimeService(0)
270270
if err != nil {
271271
return err
272272
}
@@ -328,7 +328,7 @@ var updateContainerCommand = &cli.Command{
328328
if c.NArg() == 0 {
329329
return errors.New("ID cannot be empty")
330330
}
331-
runtimeClient, err := getRuntimeService(c, 0)
331+
runtimeClient, err := getRuntimeService(0)
332332
if err != nil {
333333
return err
334334
}
@@ -374,7 +374,7 @@ var stopContainerCommand = &cli.Command{
374374
},
375375
},
376376
Action: func(c *cli.Context) error {
377-
runtimeClient, err := getRuntimeService(c, 0)
377+
runtimeClient, err := getRuntimeService(0)
378378
if err != nil {
379379
return err
380380
}
@@ -445,7 +445,7 @@ var removeContainerCommand = &cli.Command{
445445
},
446446
},
447447
Action: func(ctx *cli.Context) error {
448-
runtimeClient, err := getRuntimeService(ctx, 0)
448+
runtimeClient, err := getRuntimeService(0)
449449
if err != nil {
450450
return err
451451
}
@@ -584,12 +584,12 @@ var containerStatusCommand = &cli.Command{
584584
},
585585
},
586586
Action: func(c *cli.Context) error {
587-
runtimeClient, err := getRuntimeService(c, 0)
587+
runtimeClient, err := getRuntimeService(0)
588588
if err != nil {
589589
return err
590590
}
591591

592-
imageClient, err := getImageService(c)
592+
imageClient, err := getImageService()
593593
if err != nil {
594594
return err
595595
}
@@ -723,12 +723,12 @@ var listContainersCommand = &cli.Command{
723723
return cli.ShowSubcommandHelp(c)
724724
}
725725

726-
runtimeClient, err := getRuntimeService(c, 0)
726+
runtimeClient, err := getRuntimeService(0)
727727
if err != nil {
728728
return err
729729
}
730730

731-
imageClient, err := getImageService(c)
731+
imageClient, err := getImageService()
732732
if err != nil {
733733
return err
734734
}
@@ -780,7 +780,7 @@ var runContainerCommand = &cli.Command{
780780

781781
var imageClient internalapi.ImageManagerService
782782
if withPull {
783-
imageClient, err = getImageService(c)
783+
imageClient, err = getImageService()
784784
if err != nil {
785785
return err
786786
}
@@ -799,7 +799,7 @@ var runContainerCommand = &cli.Command{
799799
timeout: c.Duration("cancel-timeout"),
800800
}
801801

802-
runtimeClient, err := getRuntimeService(c, opts.timeout)
802+
runtimeClient, err := getRuntimeService(opts.timeout)
803803
if err != nil {
804804
return err
805805
}
@@ -834,7 +834,7 @@ var checkpointContainerCommand = &cli.Command{
834834
"Use --export=/path/to/checkpoint.tar",
835835
)
836836
}
837-
runtimeClient, err := getRuntimeService(c, 0)
837+
runtimeClient, err := getRuntimeService(0)
838838
if err != nil {
839839
return err
840840
}

‎cmd/crictl/container_stats.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var statsCommand = &cli.Command{
9494
return cli.ShowSubcommandHelp(c)
9595
}
9696

97-
runtimeClient, err := getRuntimeService(c, 0)
97+
runtimeClient, err := getRuntimeService(0)
9898
if err != nil {
9999
return err
100100
}

‎cmd/crictl/events.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var eventsCommand = &cli.Command{
6363
return fmt.Errorf("don't support %q format", format)
6464
}
6565

66-
runtimeClient, err := getRuntimeService(c, 0)
66+
runtimeClient, err := getRuntimeService(0)
6767
if err != nil {
6868
return err
6969
}

‎cmd/crictl/exec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ var runtimeExecCommand = &cli.Command{
149149
return cli.ShowSubcommandHelp(c)
150150
}
151151

152-
runtimeClient, err := getRuntimeService(c, 0)
152+
runtimeClient, err := getRuntimeService(0)
153153
if err != nil {
154154
return err
155155
}
156156

157-
imageClient, err := getImageService(c)
157+
imageClient, err := getImageService()
158158
if err != nil {
159159
return err
160160
}

‎cmd/crictl/image.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ var pullImageCommand = &cli.Command{
110110
return cli.ShowSubcommandHelp(c)
111111
}
112112

113-
imageClient, err := getImageService(c)
113+
imageClient, err := getImageService()
114114
if err != nil {
115115
return err
116116
}
@@ -190,7 +190,7 @@ var listImageCommand = &cli.Command{
190190
return cli.ShowSubcommandHelp(c)
191191
}
192192

193-
imageClient, err := getImageService(c)
193+
imageClient, err := getImageService()
194194
if err != nil {
195195
return err
196196
}
@@ -312,7 +312,7 @@ var imageStatusCommand = &cli.Command{
312312
},
313313
},
314314
Action: func(c *cli.Context) error {
315-
imageClient, err := getImageService(c)
315+
imageClient, err := getImageService()
316316
if err != nil {
317317
return err
318318
}
@@ -414,7 +414,7 @@ the specified tag. To remove only a specific tag, use the container runtime's na
414414
},
415415
},
416416
Action: func(cliCtx *cli.Context) error {
417-
imageClient, err := getImageService(cliCtx)
417+
imageClient, err := getImageService()
418418
if err != nil {
419419
return err
420420
}
@@ -450,7 +450,7 @@ the specified tag. To remove only a specific tag, use the container runtime's na
450450

451451
// On prune, remove images which are in use from the ID selector
452452
if prune {
453-
runtimeClient, err := getRuntimeService(cliCtx, 0)
453+
runtimeClient, err := getRuntimeService(0)
454454
if err != nil {
455455
return err
456456
}
@@ -563,7 +563,7 @@ var imageFsInfoCommand = &cli.Command{
563563
},
564564
},
565565
Action: func(c *cli.Context) error {
566-
imageClient, err := getImageService(c)
566+
imageClient, err := getImageService()
567567
if err != nil {
568568
return err
569569
}

‎cmd/crictl/info.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var runtimeStatusCommand = &cli.Command{
5454
return cli.ShowSubcommandHelp(c)
5555
}
5656

57-
runtimeClient, err := getRuntimeService(c, 0)
57+
runtimeClient, err := getRuntimeService(0)
5858
if err != nil {
5959
return err
6060
}

‎cmd/crictl/logs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ var logsCommand = &cli.Command{
9797
return cli.ShowSubcommandHelp(c)
9898
}
9999

100-
runtimeService, err := getRuntimeService(c, 0)
100+
runtimeService, err := getRuntimeService(0)
101101
if err != nil {
102102
return err
103103
}

0 commit comments

Comments
 (0)