Remove runtime.Event types

This uses the events service types for runtime events

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

runtime/event.go

@@ -1,42 +0,0 @@
-package runtime
-
-import "time"
-
-type EventType int
-
-func (t EventType) String() string {
-	switch t {
-	case ExitEvent:
-		return "exit"
-	case PausedEvent:
-		return "paused"
-	case CreateEvent:
-		return "create"
-	case StartEvent:
-		return "start"
-	case OOMEvent:
-		return "oom"
-	case ExecAddEvent:
-		return "execAdd"
-	}
-	return "unknown"
-}
-
-const (
-	ExitEvent EventType = iota + 1
-	PausedEvent
-	CreateEvent
-	StartEvent
-	OOMEvent
-	ExecAddEvent
-)
-
-type Event struct {
-	Timestamp  time.Time
-	Type       EventType
-	Runtime    string
-	ID         string
-	Pid        uint32
-	ExitStatus uint32
-	ExitedAt   time.Time
-}

runtime/monitor.go

@@ -1,13 +1,15 @@
 package runtime
 
+import events "github.com/containerd/containerd/api/services/events/v1"
+
 // TaskMonitor provides an interface for monitoring of containers within containerd
 type TaskMonitor interface {
 	// Monitor adds the provided container to the monitor
 	Monitor(Task) error
 	// Stop stops and removes the provided container from the monitor
 	Stop(Task) error
-	// Events emits events from the monitor
-	Events(chan<- *Event)
+	// Events emits events to the channel for the monitor
+	Events(chan<- *events.RuntimeEvent)
 }
 
 func NewMultiTaskMonitor(monitors ...TaskMonitor) TaskMonitor {
@@ -31,7 +33,7 @@ func (mm *noopTaskMonitor) Stop(c Task) error {
 	return nil
 }
 
-func (mm *noopTaskMonitor) Events(events chan<- *Event) {
+func (mm *noopTaskMonitor) Events(events chan<- *events.RuntimeEvent) {
 }
 
 type multiTaskMonitor struct {
@@ -56,7 +58,7 @@ func (mm *multiTaskMonitor) Stop(c Task) error {
 	return nil
 }
 
-func (mm *multiTaskMonitor) Events(events chan<- *Event) {
+func (mm *multiTaskMonitor) Events(events chan<- *events.RuntimeEvent) {
 	for _, m := range mm.monitors {
 		m.Events(events)
 	}