Skip to content

Commit 058eea3

Browse files
crosbymichaelcrosbymichael
committed
Remove go-metrics
Signed-off-by: Michael Crosby <[email protected]>
1 parent 0645faf commit 058eea3

12 files changed

Lines changed: 1 addition & 159 deletions

File tree

‎containerd/main.go‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"log"
6-
"net"
75
"os"
86
"os/signal"
97
"runtime"
@@ -18,14 +16,12 @@ import (
1816

1917
"github.com/Sirupsen/logrus"
2018
"github.com/codegangsta/cli"
21-
"github.com/cyberdelia/go-metrics-graphite"
2219
"github.com/docker/containerd"
2320
"github.com/docker/containerd/api/grpc/server"
2421
"github.com/docker/containerd/api/grpc/types"
2522
"github.com/docker/containerd/api/http/pprof"
2623
"github.com/docker/containerd/supervisor"
2724
"github.com/docker/docker/pkg/listeners"
28-
"github.com/rcrowley/go-metrics"
2925
)
3026

3127
const (
@@ -45,11 +41,6 @@ var daemonFlags = []cli.Flag{
4541
Value: defaultStateDir,
4642
Usage: "runtime state directory",
4743
},
48-
cli.DurationFlag{
49-
Name: "metrics-interval",
50-
Value: 5 * time.Minute,
51-
Usage: "interval for flushing metrics to the store",
52-
},
5344
cli.StringFlag{
5445
Name: "listen,l",
5546
Value: defaultGRPCEndpoint,
@@ -84,10 +75,6 @@ var daemonFlags = []cli.Flag{
8475
Value: 500,
8576
Usage: "number of past events to keep in the event log",
8677
},
87-
cli.StringFlag{
88-
Name: "graphite-address",
89-
Usage: "Address of graphite server",
90-
},
9178
}
9279

9380
// DumpStacks dumps the runtime stack.
@@ -131,11 +118,6 @@ func main() {
131118
setupDumpStacksTrap()
132119
if context.GlobalBool("debug") {
133120
logrus.SetLevel(logrus.DebugLevel)
134-
if context.GlobalDuration("metrics-interval") > 0 {
135-
if err := debugMetrics(context.GlobalDuration("metrics-interval"), context.GlobalString("graphite-address")); err != nil {
136-
return err
137-
}
138-
}
139121
}
140122
if p := context.GlobalString("pprof-address"); len(p) > 0 {
141123
pprof.Enable(p)
@@ -248,23 +230,3 @@ func checkLimits() error {
248230
}
249231
return nil
250232
}
251-
252-
func debugMetrics(interval time.Duration, graphiteAddr string) error {
253-
for name, m := range supervisor.Metrics() {
254-
if err := metrics.DefaultRegistry.Register(name, m); err != nil {
255-
return err
256-
}
257-
}
258-
processMetrics()
259-
if graphiteAddr != "" {
260-
addr, err := net.ResolveTCPAddr("tcp", graphiteAddr)
261-
if err != nil {
262-
return err
263-
}
264-
go graphite.Graphite(metrics.DefaultRegistry, 10e9, "metrics", addr)
265-
} else {
266-
l := log.New(os.Stdout, "[containerd] ", log.LstdFlags)
267-
go metrics.Log(metrics.DefaultRegistry, interval, l)
268-
}
269-
return nil
270-
}

‎containerd/main_linux.go‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎containerd/main_solaris.go‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎supervisor/add_process.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ type AddProcessTask struct {
2121
}
2222

2323
func (s *Supervisor) addProcess(t *AddProcessTask) error {
24-
start := time.Now()
2524
ci, ok := s.containers[t.ID]
2625
if !ok {
2726
return ErrContainerNotFound
@@ -33,7 +32,6 @@ func (s *Supervisor) addProcess(t *AddProcessTask) error {
3332
if err := s.monitorProcess(process); err != nil {
3433
return err
3534
}
36-
ExecProcessTimer.UpdateSince(start)
3735
t.StartResponse <- StartResponse{}
3836
s.notifySubscribers(Event{
3937
Timestamp: time.Now(),

‎supervisor/create.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package supervisor
22

33
import (
44
"path/filepath"
5-
"time"
65

76
"github.com/docker/containerd/runtime"
87
)
@@ -25,7 +24,6 @@ type StartTask struct {
2524
}
2625

2726
func (s *Supervisor) start(t *StartTask) error {
28-
start := time.Now()
2927
rt := s.runtime
3028
rtArgs := s.runtimeArgs
3129
if t.Runtime != "" {
@@ -49,7 +47,6 @@ func (s *Supervisor) start(t *StartTask) error {
4947
s.containers[t.ID] = &containerInfo{
5048
container: container,
5149
}
52-
ContainersCounter.Inc(1)
5350
task := &startTask{
5451
Err: t.ErrorCh(),
5552
Container: container,
@@ -63,6 +60,5 @@ func (s *Supervisor) start(t *StartTask) error {
6360
}
6461

6562
s.startTasks <- task
66-
ContainerCreateTimer.UpdateSince(start)
6763
return errDeferredResponse
6864
}

‎supervisor/delete.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ type DeleteTask struct {
1919

2020
func (s *Supervisor) delete(t *DeleteTask) error {
2121
if i, ok := s.containers[t.ID]; ok {
22-
start := time.Now()
2322
if err := s.deleteContainer(i.container); err != nil {
2423
logrus.WithField("error", err).Error("containerd: deleting container")
2524
}
@@ -35,8 +34,6 @@ func (s *Supervisor) delete(t *DeleteTask) error {
3534
PID: t.PID,
3635
})
3736
}
38-
ContainersCounter.Dec(1)
39-
ContainerDeleteTimer.UpdateSince(start)
4037
}
4138
return nil
4239
}

‎supervisor/exit.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ type ExitTask struct {
1414
}
1515

1616
func (s *Supervisor) exit(t *ExitTask) error {
17-
start := time.Now()
1817
proc := t.Process
1918
status, err := proc.ExitStatus()
2019
if err != nil {
@@ -52,9 +51,6 @@ func (s *Supervisor) exit(t *ExitTask) error {
5251
Process: proc,
5352
}
5453
s.delete(ne)
55-
56-
ExitProcessTimer.UpdateSince(start)
57-
5854
return nil
5955
}
6056

‎supervisor/metrics.go‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎supervisor/monitor_linux.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ func (m *Monitor) Monitor(p runtime.Process) error {
5656
if err := archutils.EpollCtl(m.epollFd, syscall.EPOLL_CTL_ADD, fd, &event); err != nil {
5757
return err
5858
}
59-
EpollFdCounter.Inc(1)
6059
m.receivers[fd] = p
6160
return nil
6261
}
@@ -77,7 +76,6 @@ func (m *Monitor) MonitorOOM(c runtime.Container) error {
7776
if err := archutils.EpollCtl(m.epollFd, syscall.EPOLL_CTL_ADD, fd, &event); err != nil {
7877
return err
7978
}
80-
EpollFdCounter.Inc(1)
8179
m.receivers[fd] = o
8280
return nil
8381
}
@@ -115,7 +113,6 @@ func (m *Monitor) start() {
115113
if err := t.Close(); err != nil {
116114
logrus.WithField("error", err).Error("containerd: close process IO")
117115
}
118-
EpollFdCounter.Dec(1)
119116
m.exits <- t
120117
}
121118
case runtime.OOM:
@@ -125,7 +122,6 @@ func (m *Monitor) start() {
125122
delete(m.receivers, fd)
126123
// epoll will remove the fd from its set after it has been closed
127124
t.Close()
128-
EpollFdCounter.Dec(1)
129125
} else {
130126
m.ooms <- t.ContainerID()
131127
}

‎supervisor/stats.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package supervisor
22

3-
import (
4-
"time"
5-
6-
"github.com/docker/containerd/runtime"
7-
)
3+
import "github.com/docker/containerd/runtime"
84

95
// StatsTask holds needed parameters to retrieve a container statistics
106
type StatsTask struct {
@@ -14,7 +10,6 @@ type StatsTask struct {
1410
}
1511

1612
func (s *Supervisor) stats(t *StatsTask) error {
17-
start := time.Now()
1813
i, ok := s.containers[t.ID]
1914
if !ok {
2015
return ErrContainerNotFound
@@ -28,7 +23,6 @@ func (s *Supervisor) stats(t *StatsTask) error {
2823
}
2924
t.ErrorCh() <- nil
3025
t.Stat <- s
31-
ContainerStatsTimer.UpdateSince(start)
3226
}()
3327
return errDeferredResponse
3428
}

0 commit comments

Comments
 (0)