Merge pull request #739 from crosbymichael/exitedat

Add exited at to events and delete requests

api/services/execution/execution.pb.go

@@ -34,12 +34,17 @@ import google_protobuf1 "github.com/gogo/protobuf/types"
 import _ "github.com/gogo/protobuf/gogoproto"
 import containerd_v1_types "github.com/containerd/containerd/api/types/mount"
 import containerd_v1_types1 "github.com/containerd/containerd/api/types/container"
+import _ "github.com/gogo/protobuf/types"
+
+import time "time"
 
 import (
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )
 
+import github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
+
 import strings "strings"
 import reflect "reflect"
 
@@ -49,6 +54,7 @@ import io "io"
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
+var _ = time.Kitchen
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
@@ -97,8 +103,9 @@ func (*DeleteRequest) ProtoMessage()               {}
 func (*DeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{3} }
 
 type DeleteResponse struct {
-	ID         string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	ID         string    `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	ExitStatus uint32    `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	ExitedAt   time.Time `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
 }
 
 func (m *DeleteResponse) Reset()                    { *m = DeleteResponse{} }
@@ -783,6 +790,14 @@ func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) {
 		i++
 		i = encodeVarintExecution(dAtA, i, uint64(m.ExitStatus))
 	}
+	dAtA[i] = 0x1a
+	i++
+	i = encodeVarintExecution(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)))
+	n2, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i:])
+	if err != nil {
+		return 0, err
+	}
+	i += n2
 	return i, nil
 }
 
@@ -968,11 +983,11 @@ func (m *ExecRequest) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x32
 		i++
 		i = encodeVarintExecution(dAtA, i, uint64(m.Spec.Size()))
-		n2, err := m.Spec.MarshalTo(dAtA[i:])
+		n3, err := m.Spec.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n2
+		i += n3
 	}
 	return i, nil
 }
@@ -1177,6 +1192,8 @@ func (m *DeleteResponse) Size() (n int) {
 	if m.ExitStatus != 0 {
 		n += 1 + sovExecution(uint64(m.ExitStatus))
 	}
+	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
+	n += 1 + l + sovExecution(uint64(l))
 	return n
 }
 
@@ -1368,6 +1385,7 @@ func (this *DeleteResponse) String() string {
 	s := strings.Join([]string{`&DeleteResponse{`,
 		`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
 		`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
+		`ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf3.Timestamp", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -2091,6 +2109,36 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExitedAt", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowExecution
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthExecution
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipExecution(dAtA[iNdEx:])
@@ -3122,53 +3170,56 @@ func init() {
 }
 
 var fileDescriptorExecution = []byte{
-	// 763 bytes of a gzipped FileDescriptorProto
+	// 814 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0xd3, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcf, 0x6f, 0xe2, 0x46,
-	0x10, 0xaf, 0xf3, 0xc7, 0xed, 0x9b, 0x34, 0x7d, 0x7d, 0xab, 0x2a, 0xf2, 0x33, 0x52, 0x1a, 0x99,
+	0x14, 0x8e, 0xf9, 0xe1, 0x90, 0x47, 0x48, 0xd3, 0x51, 0x84, 0x5c, 0x57, 0x02, 0xe4, 0x26, 0x29,
-	0xb6, 0x84, 0x8b, 0x03, 0xe1, 0x86, 0x00, 0xa9, 0x4d, 0x23, 0x54, 0x95, 0xd2, 0xe2, 0x1c, 0x38,
+	0xbd, 0x98, 0x96, 0xde, 0xaa, 0xb6, 0x12, 0x21, 0xa8, 0x8a, 0xd2, 0x34, 0xa9, 0xa9, 0xd4, 0x63,
-	0x22, 0x37, 0xde, 0x26, 0x2b, 0x39, 0xde, 0xe0, 0x5d, 0x97, 0xe6, 0x06, 0x5f, 0x86, 0x3b, 0xdf,
+	0xe4, 0xe0, 0x09, 0x8c, 0x64, 0x3c, 0xae, 0x67, 0x9c, 0x86, 0x5b, 0x7b, 0xef, 0xa1, 0x7f, 0xc5,
-	0xa2, 0x47, 0x8e, 0x9c, 0x10, 0xcd, 0x27, 0x41, 0xeb, 0xb5, 0x13, 0xa7, 0xcd, 0x62, 0x7a, 0xb1,
+	0xde, 0xf7, 0xbf, 0xc8, 0x71, 0x8f, 0x7b, 0xca, 0x6e, 0xf8, 0x4b, 0x56, 0xe3, 0x1f, 0x60, 0x08,
-	0x66, 0xc6, 0x33, 0xbb, 0xf3, 0xfb, 0xcd, 0xfc, 0x16, 0x5e, 0x0f, 0x08, 0x1f, 0x46, 0xe7, 0x76,
+	0xb3, 0xde, 0x5c, 0xd0, 0x7b, 0x8f, 0xf7, 0xc6, 0xdf, 0xfb, 0xe6, 0xfb, 0x6c, 0xf8, 0x65, 0x4c,
-	0x9f, 0x8e, 0x5a, 0x7d, 0x1a, 0x70, 0x97, 0x04, 0x38, 0xf4, 0xb2, 0xa6, 0x3b, 0x26, 0x2d, 0x86,
+	0xf8, 0x24, 0xbc, 0x31, 0x47, 0x74, 0xda, 0x19, 0x51, 0x8f, 0xdb, 0xc4, 0xc3, 0x81, 0x93, 0x0d,
-	0xc3, 0x4b, 0xd2, 0xc7, 0xac, 0x85, 0xaf, 0x70, 0x3f, 0xe2, 0x84, 0x06, 0x73, 0xcb, 0x1e, 0x87,
+	0x6d, 0x9f, 0x74, 0x18, 0x0e, 0xee, 0xc8, 0x08, 0xb3, 0x0e, 0xbe, 0xc7, 0xa3, 0x90, 0x13, 0xea,
-	0x94, 0x53, 0x54, 0x9b, 0x97, 0xd8, 0x97, 0x4f, 0xed, 0xb4, 0xc2, 0x7c, 0x30, 0xa0, 0x74, 0xe0,
+	0x2d, 0x23, 0xd3, 0x0f, 0x28, 0xa7, 0xa8, 0xbe, 0x1c, 0x31, 0xef, 0xbe, 0x33, 0xd3, 0x09, 0xfd,
-	0xe3, 0x56, 0x9c, 0x75, 0x1e, 0x5d, 0xb4, 0xf0, 0x68, 0xcc, 0x27, 0xb2, 0xc8, 0xfc, 0xff, 0xf6,
+	0xcb, 0x31, 0xa5, 0x63, 0x17, 0x77, 0xa2, 0xae, 0x9b, 0xf0, 0xb6, 0x83, 0xa7, 0x3e, 0x9f, 0xc5,
-	0x4f, 0x37, 0x48, 0x7f, 0x6d, 0x0d, 0xe8, 0x80, 0xc6, 0x66, 0x4b, 0x58, 0x49, 0xf4, 0xc5, 0x5f,
+	0x43, 0xfa, 0x17, 0xeb, 0x7f, 0xda, 0x5e, 0xfa, 0xd7, 0xc1, 0x98, 0x8e, 0x69, 0x14, 0x76, 0x44,
-	0xb5, 0xcb, 0x27, 0x63, 0xcc, 0x5a, 0x23, 0x1a, 0x05, 0x5c, 0x7e, 0x93, 0xea, 0xc3, 0x7b, 0x54,
+	0x94, 0x54, 0x7f, 0xfc, 0x24, 0xb8, 0x7c, 0xe6, 0x63, 0xd6, 0x99, 0xd2, 0xd0, 0xe3, 0xf1, 0x6f,
-	0xcf, 0x82, 0x73, 0x4b, 0x9e, 0x62, 0x7d, 0x29, 0x40, 0xb5, 0x13, 0x62, 0x97, 0x63, 0x07, 0x7f,
+	0x32, 0x7d, 0xfa, 0x82, 0xe9, 0x45, 0x71, 0x19, 0x25, 0xa7, 0x34, 0xd7, 0x41, 0x73, 0x32, 0xc5,
-	0x8c, 0x30, 0xe3, 0xa8, 0x06, 0x05, 0xe2, 0x19, 0x5a, 0x43, 0x6b, 0xfe, 0x73, 0xa0, 0x4f, 0x7f,
+	0x8c, 0xdb, 0x53, 0x3f, 0x6e, 0x30, 0xfe, 0x2d, 0x40, 0xad, 0x1f, 0x60, 0x9b, 0x63, 0x0b, 0xff,
-	0x6e, 0x17, 0x8e, 0x0e, 0x9d, 0x02, 0xf1, 0x50, 0x13, 0x4a, 0x6c, 0x8c, 0xfb, 0x46, 0xa1, 0xa1,
+	0x15, 0x62, 0xc6, 0x51, 0x1d, 0x0a, 0xc4, 0xd1, 0x94, 0x96, 0xd2, 0xde, 0x39, 0x51, 0xe7, 0x8f,
-	0x35, 0x2b, 0xed, 0x2d, 0x5b, 0xa2, 0xb5, 0x53, 0xb4, 0xf6, 0x7e, 0x30, 0x71, 0xe2, 0x0c, 0xd4,
+	0xcd, 0xc2, 0xd9, 0xa9, 0x55, 0x20, 0x0e, 0x6a, 0x43, 0x89, 0xf9, 0x78, 0xa4, 0x15, 0x5a, 0x4a,
-	0x06, 0x3d, 0xa4, 0x94, 0x5f, 0x30, 0xa3, 0xd8, 0x28, 0x36, 0x2b, 0x6d, 0xd3, 0x5e, 0xa4, 0x33,
+	0xbb, 0xda, 0x3d, 0x30, 0xe3, 0x93, 0xcd, 0xf4, 0x64, 0xb3, 0xe7, 0xcd, 0xac, 0xa8, 0x03, 0x75,
-	0xee, 0xc9, 0x3e, 0x11, 0x58, 0x9c, 0x24, 0x13, 0x19, 0xb0, 0x1a, 0x46, 0x01, 0x27, 0x23, 0x6c,
+	0x41, 0x0d, 0x28, 0xe5, 0xb7, 0x4c, 0x2b, 0xb6, 0x8a, 0xed, 0x6a, 0x57, 0x37, 0x57, 0xf9, 0x8e,
-	0x94, 0xc4, 0xd5, 0x4e, 0xea, 0xa2, 0x2d, 0x28, 0x33, 0xee, 0x91, 0xc0, 0x28, 0xc7, 0x71, 0xe9,
+	0x40, 0x9b, 0x17, 0x62, 0x59, 0x2b, 0xe9, 0x44, 0x1a, 0x6c, 0x07, 0xa1, 0x27, 0xd0, 0x69, 0x25,
-	0xa0, 0x1a, 0xe8, 0x8c, 0x7b, 0x34, 0xe2, 0x86, 0x1e, 0x87, 0x13, 0x2f, 0x89, 0xe3, 0x30, 0x34,
+	0xf1, 0x68, 0x2b, 0x4d, 0xd1, 0x01, 0x94, 0x19, 0x77, 0x88, 0xa7, 0x95, 0xa3, 0x7a, 0x9c, 0xa0,
-	0x56, 0x67, 0x71, 0x1c, 0x86, 0xc8, 0x84, 0x35, 0x8e, 0xc3, 0x11, 0x09, 0x5c, 0xdf, 0x58, 0x6b,
+	0x3a, 0xa8, 0x8c, 0x3b, 0x34, 0xe4, 0x9a, 0x1a, 0x95, 0x93, 0x2c, 0xa9, 0xe3, 0x20, 0xd0, 0xb6,
-	0x68, 0xcd, 0x35, 0x67, 0xe6, 0x5b, 0xcf, 0x61, 0x23, 0xa5, 0x80, 0x8d, 0x69, 0xc0, 0xb0, 0x92,
+	0x17, 0x75, 0x1c, 0x04, 0x48, 0x87, 0x0a, 0xc7, 0xc1, 0x94, 0x78, 0xb6, 0xab, 0x55, 0x5a, 0x4a,
-	0x83, 0x4d, 0x28, 0x8e, 0x89, 0x17, 0x53, 0x50, 0x75, 0x84, 0x69, 0xed, 0xc1, 0x7a, 0x8f, 0xbb,
+	0xbb, 0x62, 0x2d, 0x72, 0xe3, 0x07, 0xd8, 0x4b, 0x29, 0x60, 0x3e, 0xf5, 0x18, 0x96, 0x72, 0xb0,
-	0x21, 0xcf, 0x61, 0xcf, 0x7a, 0x04, 0xd5, 0x43, 0xec, 0xe3, 0x5c, 0x9a, 0xad, 0x23, 0xd8, 0x48,
+	0x0f, 0x45, 0x9f, 0x38, 0x11, 0x05, 0x35, 0x4b, 0x84, 0xc6, 0x31, 0xec, 0x0e, 0xb9, 0x1d, 0xf0,
-	0x13, 0x73, 0x9a, 0xd9, 0x86, 0x0a, 0xbe, 0x22, 0xfc, 0x03, 0xe3, 0x2e, 0x8f, 0x58, 0xd2, 0x14,
+	0x1c, 0xf6, 0x8c, 0xaf, 0xa1, 0x76, 0x8a, 0x5d, 0x9c, 0x4b, 0xb3, 0xf1, 0x9f, 0x02, 0x7b, 0x69,
-	0x88, 0x50, 0x2f, 0x8e, 0x58, 0xbb, 0x50, 0x39, 0x0a, 0x2e, 0x68, 0xde, 0x8d, 0x55, 0xa8, 0xbc,
+	0x67, 0x0e, 0x9a, 0x26, 0x54, 0xf1, 0x3d, 0xe1, 0xd7, 0x8c, 0xdb, 0x3c, 0x64, 0x09, 0x2a, 0x10,
-	0x21, 0x2c, 0x45, 0x60, 0xbd, 0x85, 0x75, 0xe9, 0x26, 0xd7, 0xbf, 0x02, 0x98, 0x8d, 0x8f, 0x19,
+	0xa5, 0x61, 0x54, 0x41, 0x3d, 0xd8, 0x11, 0x19, 0x76, 0xae, 0x6d, 0xae, 0x15, 0xa3, 0x7b, 0xd3,
-	0x5a, 0x3c, 0xd1, 0xfa, 0xd2, 0x89, 0x76, 0xd2, 0x98, 0x93, 0xa9, 0xb0, 0x4e, 0xa1, 0x72, 0x4c,
+	0x9f, 0xdd, 0xdb, 0x1f, 0xa9, 0x22, 0x4e, 0x2a, 0x0f, 0x8f, 0xcd, 0xad, 0xff, 0xdf, 0x35, 0x15,
-	0x7c, 0x3f, 0x6f, 0xbd, 0xc4, 0xe0, 0xc8, 0x40, 0x8c, 0x47, 0x02, 0x49, 0x3c, 0x41, 0xb9, 0xeb,
+	0xab, 0x12, 0x8f, 0xf5, 0xb8, 0x71, 0x04, 0xd5, 0x33, 0xef, 0x96, 0xe6, 0xa1, 0xae, 0x41, 0xf5,
-	0xfb, 0x46, 0x31, 0x9e, 0x99, 0x30, 0xad, 0x7f, 0xa1, 0xda, 0xbd, 0xc4, 0x01, 0x67, 0x69, 0xc7,
+	0x57, 0xc2, 0x52, 0x16, 0x8c, 0xdf, 0x60, 0x37, 0x4e, 0x93, 0x0d, 0x7e, 0x06, 0x58, 0x48, 0x80,
-	0xdf, 0x34, 0xa8, 0x74, 0xaf, 0x70, 0x3f, 0xef, 0x8a, 0xec, 0x0e, 0x14, 0x16, 0x77, 0x60, 0xbe,
+	0x69, 0x4a, 0xa4, 0x8a, 0xc6, 0x46, 0x55, 0xf4, 0xd3, 0x9a, 0x95, 0x99, 0x30, 0x2e, 0xa1, 0x7a,
-	0x65, 0xc5, 0xe5, 0x5b, 0x56, 0x52, 0x6c, 0x59, 0x79, 0x61, 0xcb, 0x52, 0x8d, 0xe8, 0x79, 0x1a,
+	0x4e, 0x5c, 0x37, 0x4f, 0xa2, 0xe2, 0xf2, 0xc9, 0x58, 0x5c, 0x71, 0xcc, 0x45, 0x92, 0x89, 0x6b,
-	0xb1, 0x1a, 0xb0, 0x2e, 0x5b, 0x4e, 0x58, 0x4e, 0x36, 0x4b, 0x9b, 0x6f, 0x96, 0x07, 0x70, 0xc6,
+	0xb3, 0x5d, 0x37, 0x62, 0xa0, 0x62, 0x89, 0xd0, 0xf8, 0x0c, 0x6a, 0x83, 0x3b, 0xec, 0x71, 0x96,
-	0x27, 0x79, 0x98, 0xee, 0x6c, 0xa4, 0x40, 0xf2, 0x89, 0x78, 0x7c, 0x18, 0x23, 0xa9, 0x3a, 0xd2,
+	0x22, 0x7e, 0xad, 0x40, 0x75, 0x70, 0x8f, 0x47, 0x79, 0x8f, 0xc8, 0xea, 0xa8, 0xb0, 0xaa, 0xa3,
-	0x11, 0x1d, 0x0f, 0x31, 0x19, 0x0c, 0x25, 0x92, 0xaa, 0x93, 0x78, 0xd6, 0x4b, 0xf8, 0xaf, 0xe3,
+	0xa5, 0x52, 0x8b, 0x9b, 0x95, 0x5a, 0x92, 0x28, 0xb5, 0xbc, 0xa2, 0xd4, 0xd4, 0x67, 0x6a, 0x9e,
-	0x53, 0x86, 0x7b, 0x02, 0xef, 0xbd, 0x2f, 0x6b, 0x7f, 0xd5, 0x61, 0x73, 0x36, 0xf6, 0x9e, 0x7c,
+	0xcf, 0x8c, 0x16, 0xec, 0xc6, 0x90, 0x13, 0x96, 0x13, 0x75, 0x2a, 0x4b, 0x75, 0x3a, 0x00, 0x57,
-	0x26, 0xd1, 0x7b, 0xd0, 0xa5, 0x9e, 0xd0, 0xae, 0xbd, 0xfc, 0x21, 0xb5, 0x17, 0x9e, 0x1c, 0x73,
+	0x7c, 0x96, 0xb7, 0xd3, 0x33, 0x55, 0x8b, 0x4d, 0xfe, 0x26, 0x0e, 0x9f, 0x44, 0x9b, 0xd4, 0xac,
-	0x2f, 0x2f, 0x2d, 0x21, 0xa9, 0x0b, 0xe5, 0x58, 0x6c, 0x68, 0x47, 0x55, 0x90, 0xd5, 0xa2, 0x59,
+	0x38, 0x11, 0x88, 0x27, 0x98, 0x8c, 0x27, 0xf1, 0x26, 0x35, 0x2b, 0xc9, 0x8c, 0x9f, 0xe0, 0xf3,
-	0xbb, 0xc3, 0x7f, 0x57, 0x3c, 0xd7, 0xa2, 0x3f, 0x29, 0x31, 0x75, 0x7f, 0x0b, 0x5a, 0x55, 0xf7,
+	0xbe, 0x4b, 0x19, 0x1e, 0x8a, 0x7d, 0x5f, 0xfc, 0xb0, 0xee, 0x2b, 0x15, 0xf6, 0x17, 0xd7, 0x3e,
-	0x77, 0x4b, 0xa9, 0xc7, 0x50, 0x12, 0x82, 0x43, 0x0f, 0x55, 0xf9, 0x19, 0x39, 0x9a, 0x39, 0x1a,
+	0x8c, 0xdf, 0xc5, 0xe8, 0x4f, 0x50, 0x63, 0x4f, 0xa2, 0x23, 0x73, 0xf3, 0xdb, 0xda, 0x5c, 0x79,
-	0x42, 0xef, 0xa0, 0x24, 0x74, 0xa8, 0x3e, 0x2c, 0x23, 0x5a, 0x73, 0xe7, 0xcf, 0x49, 0x49, 0x7f,
+	0x6d, 0xe9, 0xc7, 0x79, 0x6d, 0x09, 0x49, 0x03, 0x28, 0x47, 0x86, 0x45, 0x87, 0xb2, 0x81, 0xac,
-	0x1d, 0x28, 0x09, 0x29, 0xaa, 0x8f, 0xcc, 0x08, 0x55, 0xc9, 0xde, 0x09, 0xe8, 0x52, 0x7e, 0x6a,
+	0x9f, 0xf5, 0xfa, 0x33, 0xfe, 0x07, 0xe2, 0x9b, 0x20, 0xf0, 0xc5, 0x2e, 0x95, 0xe3, 0x5b, 0xf1,
-	0xf6, 0x16, 0xe4, 0x69, 0x2e, 0x7f, 0xfe, 0xe3, 0x9c, 0x27, 0x9a, 0x80, 0x29, 0x84, 0xa0, 0xee,
+	0xbb, 0x1c, 0xdf, 0x9a, 0xd9, 0xcf, 0xa1, 0x24, 0x0c, 0x87, 0xbe, 0x92, 0xf5, 0x67, 0xec, 0xa8,
-	0x29, 0xa3, 0x6c, 0x35, 0xcc, 0x05, 0x2d, 0xed, 0x43, 0xf1, 0x8c, 0x4f, 0x90, 0xa5, 0x4a, 0x9e,
+	0xe7, 0x78, 0x08, 0xfd, 0x0e, 0x25, 0xe1, 0x43, 0xf9, 0x61, 0x19, 0xd3, 0xea, 0x87, 0x1f, 0x6f,
-	0xcb, 0x4a, 0x09, 0xf2, 0x14, 0x60, 0x2e, 0x0b, 0xf4, 0x58, 0xb9, 0x9f, 0xb7, 0xa5, 0xa3, 0x3a,
+	0x4a, 0xf0, 0xf5, 0xa1, 0x24, 0xac, 0x28, 0x3f, 0x32, 0x63, 0x54, 0x29, 0x7b, 0x17, 0xa0, 0xc6,
-	0xf0, 0xc0, 0xb8, 0xbe, 0xa9, 0xaf, 0xfc, 0xb8, 0xa9, 0xaf, 0x7c, 0x9e, 0xd6, 0xb5, 0xeb, 0x69,
+	0xf6, 0x93, 0xb3, 0xb7, 0x62, 0x4f, 0x7d, 0xf3, 0x27, 0x24, 0xea, 0xf9, 0x56, 0x11, 0x6b, 0x0a,
-	0x5d, 0xfb, 0x3e, 0xad, 0x6b, 0xbf, 0xa6, 0x75, 0xed, 0x5c, 0x8f, 0x33, 0x9f, 0xfd, 0x0e, 0x00,
+	0x23, 0xc8, 0x31, 0x65, 0x9c, 0x2d, 0x5f, 0x73, 0xc5, 0x4b, 0x3d, 0x28, 0x5e, 0xf1, 0x19, 0x32,
-	0x00, 0xff, 0xff, 0x98, 0xf8, 0x83, 0xab, 0xbd, 0x08, 0x00, 0x00,
+	0x64, 0xcd, 0x4b, 0x5b, 0x49, 0x97, 0xbc, 0x04, 0x58, 0xda, 0x02, 0x7d, 0x23, 0xd5, 0xe7, 0xba,
+	0x75, 0x64, 0x07, 0x9e, 0x68, 0x0f, 0x4f, 0x8d, 0xad, 0xb7, 0x4f, 0x8d, 0xad, 0x7f, 0xe6, 0x0d,
+	0xe5, 0x61, 0xde, 0x50, 0xde, 0xcc, 0x1b, 0xca, 0xfb, 0x79, 0x43, 0xb9, 0x51, 0xa3, 0xce, 0xef,
+	0x3f, 0x04, 0x00, 0x00, 0xff, 0xff, 0x74, 0xa6, 0x26, 0x26, 0x22, 0x09, 0x00, 0x00,
 }

api/services/execution/execution.proto

@@ -7,6 +7,7 @@ import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/api/types/mount/mount.proto";
 import "github.com/containerd/containerd/api/types/container/container.proto";
+import "google/protobuf/timestamp.proto";
 
 service ContainerService {
 	rpc Create(CreateRequest) returns (CreateResponse);
@@ -48,6 +49,7 @@ message DeleteRequest {
 message DeleteResponse {
 	string id = 1 [(gogoproto.customname) = "ID"];
 	uint32 exit_status = 2;
+	google.protobuf.Timestamp exited_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
 }
 
 message InfoRequest {

api/services/shim/shim.pb.go

@@ -37,12 +37,17 @@ import google_protobuf1 "github.com/golang/protobuf/ptypes/empty"
 import _ "github.com/gogo/protobuf/gogoproto"
 import containerd_v1_types "github.com/containerd/containerd/api/types/mount"
 import containerd_v1_types1 "github.com/containerd/containerd/api/types/container"
+import _ "github.com/gogo/protobuf/types"
+
+import time "time"
 
 import (
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )
 
+import github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
+
 import strings "strings"
 import reflect "reflect"
 
@@ -52,6 +57,7 @@ import io "io"
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
+var _ = time.Kitchen
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
@@ -99,7 +105,8 @@ func (*DeleteRequest) ProtoMessage()               {}
 func (*DeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{3} }
 
 type DeleteResponse struct {
-	ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	ExitStatus uint32    `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	ExitedAt   time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
 }
 
 func (m *DeleteResponse) Reset()                    { *m = DeleteResponse{} }
@@ -242,34 +249,17 @@ const _ = grpc.SupportPackageIsVersion4
 // Client API for Shim service
 
 type ShimClient interface {
-	// container rpcs
-	// Create will create the container within the runtime.  At this point in time the container
-	// should be created along with its resources without its user defined process being started
 	Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error)
-	// Start executes the user defined process of the container
 	Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-	// Delete removes the container and its resources from the runtime after it has been stopped
 	Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error)
-	// State returns the state of the container that the shim owns and its additional processes
 	State(ctx context.Context, in *StateRequest, opts ...grpc.CallOption) (*StateResponse, error)
-	// Pause pauses the container
 	Pause(ctx context.Context, in *PauseRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-	// Resume resumes a paused container back into a running state
 	Resume(ctx context.Context, in *ResumeRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-	// shim rpcs
-	// Exit causes the shim to reap all remaining processes and exit
 	Exit(ctx context.Context, in *ExitRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-	// Events returns all events for the container owned by the shim including
-	// additional processes being added and removed and state changes
 	Events(ctx context.Context, in *EventsRequest, opts ...grpc.CallOption) (Shim_EventsClient, error)
-	// process rpcs
-	// Kill kills a container process owned by the shim
 	Kill(ctx context.Context, in *KillRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-	// Exec adds and additional process to the container
 	Exec(ctx context.Context, in *ExecRequest, opts ...grpc.CallOption) (*ExecResponse, error)
-	// Pty handles resizing the pty/console for a container
 	Pty(ctx context.Context, in *PtyRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
-	// CloseStdin closes the STDIN for a process that is owned by the shim
 	CloseStdin(ctx context.Context, in *CloseStdinRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
 }
 
@@ -415,34 +405,17 @@ func (c *shimClient) CloseStdin(ctx context.Context, in *CloseStdinRequest, opts
 // Server API for Shim service
 
 type ShimServer interface {
-	// container rpcs
-	// Create will create the container within the runtime.  At this point in time the container
-	// should be created along with its resources without its user defined process being started
 	Create(context.Context, *CreateRequest) (*CreateResponse, error)
-	// Start executes the user defined process of the container
 	Start(context.Context, *StartRequest) (*google_protobuf1.Empty, error)
-	// Delete removes the container and its resources from the runtime after it has been stopped
 	Delete(context.Context, *DeleteRequest) (*DeleteResponse, error)
-	// State returns the state of the container that the shim owns and its additional processes
 	State(context.Context, *StateRequest) (*StateResponse, error)
-	// Pause pauses the container
 	Pause(context.Context, *PauseRequest) (*google_protobuf1.Empty, error)
-	// Resume resumes a paused container back into a running state
 	Resume(context.Context, *ResumeRequest) (*google_protobuf1.Empty, error)
-	// shim rpcs
-	// Exit causes the shim to reap all remaining processes and exit
 	Exit(context.Context, *ExitRequest) (*google_protobuf1.Empty, error)
-	// Events returns all events for the container owned by the shim including
-	// additional processes being added and removed and state changes
 	Events(*EventsRequest, Shim_EventsServer) error
-	// process rpcs
-	// Kill kills a container process owned by the shim
 	Kill(context.Context, *KillRequest) (*google_protobuf1.Empty, error)
-	// Exec adds and additional process to the container
 	Exec(context.Context, *ExecRequest) (*ExecResponse, error)
-	// Pty handles resizing the pty/console for a container
 	Pty(context.Context, *PtyRequest) (*google_protobuf1.Empty, error)
-	// CloseStdin closes the STDIN for a process that is owned by the shim
 	CloseStdin(context.Context, *CloseStdinRequest) (*google_protobuf1.Empty, error)
 }
 
@@ -898,6 +871,14 @@ func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) {
 		i++
 		i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
 	}
+	dAtA[i] = 0x12
+	i++
+	i = encodeVarintShim(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)))
+	n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i:])
+	if err != nil {
+		return 0, err
+	}
+	i += n1
 	return i, nil
 }
 
@@ -948,11 +929,11 @@ func (m *ExecRequest) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x2a
 		i++
 		i = encodeVarintShim(dAtA, i, uint64(m.Spec.Size()))
-		n1, err := m.Spec.MarshalTo(dAtA[i:])
+		n2, err := m.Spec.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n1
+		i += n2
 	}
 	return i, nil
 }
@@ -1349,6 +1330,8 @@ func (m *DeleteResponse) Size() (n int) {
 	if m.ExitStatus != 0 {
 		n += 1 + sovShim(uint64(m.ExitStatus))
 	}
+	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
+	n += 1 + l + sovShim(uint64(l))
 	return n
 }
 
@@ -1563,6 +1546,7 @@ func (this *DeleteResponse) String() string {
 	}
 	s := strings.Join([]string{`&DeleteResponse{`,
 		`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
+		`ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf3.Timestamp", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -2235,6 +2219,36 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExitedAt", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowShim
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthShim
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipShim(dAtA[iNdEx:])
@@ -3453,60 +3467,63 @@ func init() {
 }
 
 var fileDescriptorShim = []byte{
-	// 871 bytes of a gzipped FileDescriptorProto
+	// 913 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcd, 0x6e, 0xdb, 0x46,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4f, 0x6f, 0xe3, 0x44,
-	0x10, 0x0e, 0x25, 0x99, 0x96, 0x47, 0xa1, 0xd3, 0x2e, 0x0c, 0x83, 0xa1, 0x0b, 0xc5, 0x25, 0x50,
+	0x14, 0xaf, 0x93, 0xd4, 0x4d, 0x5f, 0xd6, 0x5d, 0x18, 0x55, 0x95, 0x37, 0x45, 0x49, 0xb1, 0x84,
-	0x54, 0x49, 0x01, 0xaa, 0x51, 0x6e, 0x45, 0x7b, 0x68, 0x62, 0x17, 0x4d, 0x9b, 0x02, 0xc2, 0xba,
+	0xc8, 0x2e, 0x92, 0x03, 0xd9, 0x1b, 0x82, 0x43, 0xbb, 0x2d, 0x62, 0x61, 0x91, 0xa2, 0xe9, 0xde,
-	0xb7, 0x02, 0x0d, 0x68, 0x71, 0x2d, 0x2d, 0x40, 0x72, 0x59, 0xee, 0xd2, 0x8d, 0x6e, 0x3d, 0xf7,
+	0x90, 0xa8, 0xdc, 0x78, 0x9a, 0x8c, 0x64, 0x7b, 0x8c, 0x67, 0x5c, 0x36, 0x37, 0xce, 0x9c, 0xb8,
-	0x0d, 0xfa, 0x3a, 0x3d, 0xe5, 0xd8, 0x63, 0x4f, 0x45, 0xa3, 0x77, 0xe8, 0xbd, 0xd8, 0x1f, 0x92,
+	0xf2, 0x75, 0x38, 0xf5, 0xc8, 0x91, 0xd3, 0xc2, 0xe6, 0x3b, 0x70, 0x47, 0xf3, 0xc7, 0x76, 0xd2,
-	0x92, 0x6d, 0x8a, 0xca, 0x45, 0x98, 0x19, 0xce, 0xce, 0x7e, 0xf3, 0xcd, 0x37, 0x2b, 0xf8, 0x6a,
+	0xd6, 0x49, 0xf7, 0x62, 0xbd, 0xf7, 0xe6, 0xcd, 0x9b, 0xdf, 0xfb, 0xbd, 0x3f, 0x86, 0xaf, 0xa7,
-	0x4e, 0xc5, 0xa2, 0xb8, 0x0c, 0x66, 0x2c, 0x19, 0xcf, 0x58, 0x2a, 0x42, 0x9a, 0x92, 0x3c, 0x5a,
+	0x54, 0xcc, 0xf2, 0x4b, 0x7f, 0xc2, 0xe2, 0xe1, 0x84, 0x25, 0x22, 0xa0, 0x09, 0xc9, 0xc2, 0x65,
-	0x37, 0xc3, 0x8c, 0x8e, 0x39, 0xc9, 0xaf, 0xe9, 0x8c, 0xf0, 0x31, 0x5f, 0xd0, 0x44, 0xfd, 0x04,
+	0x31, 0x48, 0xe9, 0x90, 0x93, 0xec, 0x9a, 0x4e, 0x08, 0x1f, 0xf2, 0x19, 0x8d, 0xd5, 0xc7, 0x4f,
-	0x59, 0xce, 0x04, 0x43, 0x27, 0x75, 0x62, 0x70, 0xfd, 0x34, 0x28, 0xf3, 0x02, 0x99, 0xe2, 0x3d,
+	0x33, 0x26, 0x18, 0x3a, 0xac, 0x1c, 0xfd, 0xeb, 0x2f, 0xfc, 0xc2, 0xcf, 0x97, 0x2e, 0xdd, 0x27,
-	0x9c, 0x33, 0x36, 0x8f, 0xc9, 0x58, 0xa5, 0x5e, 0x16, 0x57, 0xe3, 0x30, 0x5d, 0xea, 0x73, 0xde,
+	0x53, 0xc6, 0xa6, 0x11, 0x19, 0x2a, 0xd7, 0xcb, 0xfc, 0x6a, 0x18, 0x24, 0x73, 0x7d, 0xaf, 0x7b,
-	0xc9, 0xcd, 0x4f, 0x24, 0xc9, 0x44, 0xf9, 0xf1, 0x68, 0xce, 0xe6, 0x4c, 0x99, 0x63, 0x69, 0x99,
+	0x78, 0xfb, 0x88, 0xc4, 0xa9, 0x28, 0x0e, 0xf7, 0xa7, 0x6c, 0xca, 0x94, 0x38, 0x94, 0x92, 0xb1,
-	0xe8, 0x97, 0x3b, 0x21, 0x15, 0xcb, 0x8c, 0xf0, 0x71, 0xc2, 0x8a, 0x54, 0xe8, 0x5f, 0x73, 0xfa,
+	0x7e, 0xf5, 0x20, 0xa4, 0x62, 0x9e, 0x12, 0x3e, 0x8c, 0x59, 0x9e, 0x08, 0xfd, 0x35, 0xb7, 0x4f,
-	0xec, 0x3d, 0x4e, 0x57, 0xc1, 0xda, 0xd2, 0x55, 0xfc, 0xdf, 0x3b, 0xe0, 0xbc, 0xc8, 0x49, 0x28,
+	0xdf, 0xe3, 0x76, 0x69, 0xac, 0x24, 0x13, 0xa5, 0x7f, 0x1b, 0xb6, 0xa0, 0x31, 0xe1, 0x22, 0x88,
-	0x08, 0x26, 0xbf, 0x14, 0x84, 0x0b, 0x74, 0x0c, 0x1d, 0x1a, 0xb9, 0xd6, 0xa9, 0x35, 0x3a, 0x78,
+	0x53, 0xed, 0xe0, 0xfd, 0xd6, 0x00, 0xe7, 0x45, 0x46, 0x02, 0x41, 0x30, 0xf9, 0x39, 0x27, 0x5c,
-	0x6e, 0xaf, 0xfe, 0x79, 0xd4, 0x79, 0x79, 0x86, 0x3b, 0x34, 0x42, 0xc7, 0x60, 0x5f, 0x16, 0x69,
+	0xa0, 0x03, 0x68, 0xd0, 0xd0, 0xb5, 0x8e, 0xac, 0xc1, 0xee, 0x89, 0xbd, 0x78, 0xdb, 0x6f, 0xbc,
-	0x14, 0x13, 0xb7, 0x23, 0xbf, 0x61, 0xe3, 0x21, 0x17, 0xf6, 0xf3, 0x22, 0x15, 0x34, 0x21, 0x6e,
+	0x3c, 0xc5, 0x0d, 0x1a, 0xa2, 0x03, 0xb0, 0x2f, 0xf3, 0x24, 0x8c, 0x88, 0xdb, 0x90, 0x67, 0xd8,
-	0x57, 0x7d, 0x28, 0x5d, 0xf4, 0x10, 0xfa, 0x29, 0x7b, 0x9d, 0xd1, 0x6b, 0x26, 0xdc, 0xde, 0xa9,
+	0x68, 0xc8, 0x85, 0x9d, 0x2c, 0x4f, 0x64, 0x5c, 0xb7, 0xa9, 0x0e, 0x0a, 0x15, 0x3d, 0x81, 0x76,
-	0x35, 0xea, 0xe3, 0xfd, 0x94, 0x4d, 0xa5, 0x8b, 0x3c, 0xe8, 0x0b, 0x92, 0x27, 0x34, 0x0d, 0x63,
+	0xc2, 0x2e, 0x52, 0x7a, 0xcd, 0x84, 0xdb, 0x3a, 0xb2, 0x06, 0x6d, 0xbc, 0x93, 0xb0, 0xb1, 0x54,
-	0x77, 0x4f, 0x7d, 0xaa, 0x7c, 0x74, 0x04, 0x7b, 0x5c, 0x44, 0x34, 0x75, 0x6d, 0x55, 0x4e, 0x3b,
+	0x51, 0x17, 0xda, 0x82, 0x64, 0x31, 0x4d, 0x82, 0xc8, 0xdd, 0x56, 0x47, 0xa5, 0x8e, 0xf6, 0x61,
-	0xf2, 0x7a, 0x2e, 0x22, 0x56, 0x08, 0x77, 0x5f, 0x5f, 0xaf, 0x3d, 0x13, 0x27, 0x79, 0xee, 0xf6,
+	0x9b, 0x8b, 0x90, 0x26, 0xae, 0xad, 0xc2, 0x69, 0x45, 0x3e, 0xcf, 0x45, 0xc8, 0x72, 0xe1, 0xee,
-	0xab, 0x38, 0xc9, 0x73, 0x34, 0x01, 0x3b, 0x67, 0x4c, 0x5c, 0x71, 0xf7, 0xe0, 0xb4, 0x3b, 0x1a,
+	0xe8, 0xe7, 0xb5, 0x66, 0xec, 0x24, 0xcb, 0xdc, 0x76, 0x69, 0x27, 0x59, 0x86, 0x46, 0x60, 0x67,
-	0x4c, 0xbc, 0x60, 0x73, 0xb0, 0x8a, 0x98, 0xe0, 0x07, 0x49, 0x28, 0x36, 0x99, 0xbe, 0x0f, 0x87,
+	0x8c, 0x89, 0x2b, 0xee, 0xee, 0x1e, 0x35, 0x07, 0x9d, 0x51, 0xd7, 0x5f, 0xad, 0xbc, 0x62, 0xce,
-	0x25, 0x17, 0x3c, 0x63, 0x29, 0x27, 0xe8, 0x03, 0xe8, 0x66, 0x86, 0x0d, 0x07, 0x4b, 0xd3, 0x3f,
+	0xff, 0x41, 0x32, 0x8e, 0x8d, 0xa7, 0xe7, 0xc1, 0x5e, 0xc1, 0x05, 0x4f, 0x59, 0xc2, 0x09, 0xfa,
-	0x84, 0xfb, 0x17, 0x22, 0xcc, 0x85, 0xa1, 0xcb, 0xff, 0x18, 0x9c, 0x33, 0x12, 0x93, 0x9a, 0xbf,
+	0x00, 0x9a, 0xa9, 0x61, 0xc3, 0xc1, 0x52, 0xf4, 0xf6, 0xe0, 0xd1, 0xb9, 0x08, 0x32, 0x61, 0xe8,
-	0xdb, 0x47, 0x9e, 0xc2, 0x61, 0x99, 0x62, 0xca, 0x3e, 0x82, 0x01, 0x79, 0x43, 0xc5, 0x6b, 0x2e,
+	0xf2, 0x3e, 0x06, 0xe7, 0x94, 0x44, 0xa4, 0xe2, 0xef, 0xee, 0x15, 0x01, 0x7b, 0x85, 0x8b, 0x09,
-	0x42, 0x51, 0x70, 0x93, 0x0b, 0x32, 0x74, 0xa1, 0x22, 0xfe, 0x1f, 0x16, 0x0c, 0xce, 0xdf, 0x90,
+	0xdb, 0x87, 0x0e, 0x79, 0x43, 0xc5, 0x05, 0x17, 0x81, 0xc8, 0xb9, 0xf1, 0x05, 0x69, 0x3a, 0x57,
-	0x59, 0x59, 0x74, 0x9d, 0x2f, 0xab, 0x89, 0xaf, 0xce, 0xdd, 0x7c, 0x75, 0x1b, 0xf8, 0xea, 0x6d,
+	0x16, 0x74, 0x0c, 0xbb, 0x52, 0x23, 0xe1, 0x45, 0x20, 0x14, 0xdf, 0x32, 0x01, 0x5d, 0x4b, 0xbf,
-	0xf0, 0x35, 0x82, 0x1e, 0xcf, 0xc8, 0x4c, 0x4d, 0x63, 0x30, 0x39, 0x0a, 0xb4, 0x9c, 0x83, 0x52,
+	0xa8, 0xa5, 0xff, 0xba, 0xa8, 0xe5, 0x49, 0xfb, 0xe6, 0x6d, 0x7f, 0xeb, 0xf7, 0x7f, 0xfa, 0x16,
-	0xce, 0xc1, 0xd7, 0xe9, 0x12, 0xab, 0x0c, 0xff, 0x0c, 0x6c, 0x1c, 0xd3, 0x84, 0x0a, 0x84, 0xa0,
+	0x6e, 0xeb, 0x6b, 0xc7, 0xc2, 0xfb, 0xc3, 0x82, 0xce, 0xd9, 0x1b, 0x32, 0x29, 0x70, 0x2d, 0x53,
-	0x27, 0x69, 0xd4, 0x62, 0xc1, 0xca, 0x96, 0xb1, 0x45, 0x98, 0x47, 0x0a, 0x4c, 0x0f, 0x2b, 0x5b,
+	0x6e, 0xd5, 0x51, 0xde, 0xb8, 0x9f, 0xf2, 0x66, 0x0d, 0xe5, 0xad, 0x15, 0xca, 0x07, 0xd0, 0xe2,
-	0xc6, 0x38, 0xbb, 0xd2, 0x48, 0x7a, 0x58, 0xd9, 0xfe, 0x29, 0xdc, 0xd7, 0x0d, 0x36, 0x32, 0xfd,
+	0x29, 0x99, 0xa8, 0x82, 0x76, 0x46, 0xfb, 0x77, 0xf0, 0x1e, 0x27, 0x73, 0xac, 0x3c, 0xbc, 0x53,
-	0x0a, 0x60, 0x2a, 0x96, 0x8d, 0xb4, 0xca, 0xbe, 0x7f, 0xa5, 0x91, 0x58, 0xa8, 0xab, 0x1c, 0xac,
+	0xb0, 0x71, 0x44, 0x63, 0x2a, 0x10, 0x82, 0x96, 0xac, 0x84, 0xee, 0x37, 0xac, 0x64, 0x69, 0x9b,
-	0x1d, 0xd9, 0xdf, 0x82, 0xd0, 0xf9, 0x42, 0xdf, 0xe6, 0x60, 0xe3, 0xf9, 0x0f, 0xc0, 0x39, 0xbf,
+	0x05, 0x59, 0xa8, 0xc0, 0xb4, 0xb0, 0x92, 0xa5, 0x8d, 0xb3, 0x2b, 0x8d, 0xa4, 0x85, 0x95, 0xec,
-	0x26, 0xa9, 0xe0, 0xe5, 0xe0, 0xf4, 0x20, 0xab, 0xb9, 0xf9, 0x7f, 0x5a, 0xe0, 0x98, 0x80, 0x81,
+	0x1d, 0xc1, 0x23, 0x9d, 0x60, 0x6d, 0xb1, 0x5e, 0x01, 0x8c, 0xc5, 0xbc, 0xb6, 0x32, 0x32, 0xef,
-	0xf4, 0xbe, 0x9b, 0x60, 0x20, 0x76, 0x6b, 0x88, 0xcf, 0x24, 0xd9, 0x6a, 0xc4, 0x92, 0xec, 0xc3,
+	0x5f, 0x68, 0x28, 0x66, 0xea, 0x29, 0x07, 0x6b, 0x45, 0xe6, 0x37, 0x23, 0x74, 0x3a, 0xd3, 0xaf,
-	0xc9, 0xc9, 0x9d, 0x22, 0xd4, 0x33, 0xc7, 0x26, 0x15, 0x7d, 0x01, 0x07, 0x59, 0xce, 0x66, 0x84,
+	0x39, 0xd8, 0x68, 0xde, 0x63, 0x70, 0xce, 0xae, 0x49, 0x22, 0x78, 0x51, 0x7b, 0xdd, 0x0b, 0x65,
-	0x73, 0xc2, 0xdd, 0x3d, 0x25, 0xde, 0x8f, 0xee, 0x3c, 0x37, 0xd5, 0x59, 0xb8, 0x4e, 0x97, 0x4d,
+	0xe9, 0xbd, 0x3f, 0x2d, 0x70, 0x8c, 0xc1, 0x40, 0x7a, 0xdf, 0x61, 0x32, 0x10, 0x9b, 0x15, 0xc4,
-	0x4d, 0xc3, 0x82, 0x57, 0x4d, 0x3d, 0x00, 0x07, 0x13, 0x5e, 0x24, 0x55, 0xc0, 0x91, 0xba, 0xa2,
+	0xe7, 0x92, 0x6c, 0xd5, 0x25, 0x92, 0xec, 0xbd, 0xd1, 0xe1, 0xbd, 0x7d, 0xac, 0xdb, 0x06, 0x1b,
-	0x95, 0x7a, 0x5f, 0xc2, 0xe0, 0x7b, 0x1a, 0xc7, 0xf5, 0xee, 0xdb, 0x9c, 0xce, 0x4b, 0x91, 0x39,
+	0x57, 0xf4, 0x25, 0xec, 0xa6, 0x19, 0x9b, 0x10, 0xce, 0x09, 0x77, 0xb7, 0x55, 0xff, 0x7f, 0x74,
-	0xd8, 0x78, 0xb2, 0xb3, 0x30, 0x8e, 0x55, 0xbb, 0x7d, 0x2c, 0xcd, 0xdb, 0xbd, 0xfa, 0x9f, 0xc0,
+	0xef, 0xbd, 0xb1, 0xf6, 0xc2, 0x95, 0xbb, 0x4c, 0x6a, 0x1c, 0xe4, 0xbc, 0x4c, 0xea, 0x31, 0x38,
-	0x87, 0x2f, 0x62, 0xc6, 0xc9, 0x85, 0x94, 0x5f, 0xe3, 0xd4, 0x26, 0xff, 0xed, 0x43, 0xef, 0x62,
+	0x98, 0xf0, 0x3c, 0x2e, 0x0d, 0x8e, 0xec, 0x2b, 0x5a, 0x0e, 0xc0, 0x4b, 0xe8, 0x7c, 0x4f, 0xa3,
-	0x41, 0x13, 0x14, 0x82, 0xad, 0x97, 0x0d, 0x3d, 0x09, 0xb6, 0xbc, 0xb9, 0xc1, 0xc6, 0xeb, 0xe4,
+	0xa8, 0x5a, 0x1f, 0x36, 0xa7, 0xd3, 0xa2, 0xc9, 0x1c, 0x6c, 0x34, 0x99, 0x59, 0x10, 0x45, 0x2a,
-	0x7d, 0xb6, 0x53, 0xae, 0x19, 0xe0, 0x77, 0xb0, 0xa7, 0x76, 0x15, 0x3d, 0xde, 0x7a, 0x6a, 0x7d,
+	0xdd, 0x36, 0x96, 0xe2, 0xdd, 0x5c, 0xbd, 0x4f, 0xe0, 0xc3, 0x17, 0x11, 0xe3, 0xe4, 0x5c, 0xb6,
-	0x9f, 0xbd, 0xe3, 0x5b, 0xca, 0x3f, 0x97, 0x0f, 0xb9, 0x84, 0xab, 0x97, 0xb8, 0x05, 0xee, 0xc6,
+	0x5f, 0x6d, 0xd5, 0x46, 0xff, 0xed, 0x40, 0xeb, 0x7c, 0x46, 0x63, 0x14, 0x80, 0xad, 0xe7, 0x15,
-	0x63, 0xd0, 0x02, 0xf7, 0xc6, 0xab, 0xf0, 0xb3, 0x82, 0x2b, 0x48, 0x3b, 0xdc, 0xfa, 0x82, 0x27,
+	0x3d, 0xf3, 0xd7, 0xec, 0x75, 0x7f, 0x65, 0xc1, 0x75, 0x3f, 0x7b, 0x90, 0xaf, 0x29, 0xe0, 0x77,
-	0xbb, 0xa4, 0xd6, 0x74, 0x28, 0x71, 0xb4, 0xd4, 0x5f, 0x17, 0x50, 0x23, 0x1d, 0xaf, 0xc0, 0xd6,
+	0xb0, 0xad, 0xc6, 0x1d, 0x3d, 0x5d, 0x7b, 0x6b, 0x79, 0x25, 0x74, 0x0f, 0xee, 0x74, 0xfe, 0x99,
-	0xc2, 0x6a, 0xa1, 0x63, 0x43, 0x7d, 0x8d, 0xd5, 0xbe, 0x85, 0x9e, 0x54, 0x25, 0x1a, 0x6d, 0xad,
+	0xfc, 0x59, 0x48, 0xb8, 0x7a, 0x0f, 0x6c, 0x80, 0xbb, 0xb2, 0x4f, 0x36, 0xc0, 0xbd, 0xb5, 0x58,
-	0xb5, 0x26, 0xdc, 0xc6, 0x4a, 0x18, 0x6c, 0xbd, 0xe6, 0x2d, 0xb8, 0x36, 0xde, 0x02, 0xef, 0xee,
+	0x7e, 0x52, 0x70, 0x05, 0xd9, 0x0c, 0xb7, 0x7a, 0xe0, 0xd9, 0x43, 0x5c, 0x2b, 0x3a, 0x54, 0x73,
-	0x3f, 0x07, 0x95, 0xf3, 0xb9, 0x25, 0xd1, 0xc9, 0x25, 0x69, 0x41, 0xb7, 0xb6, 0x47, 0x8d, 0xe8,
+	0x6c, 0x88, 0xbf, 0xdc, 0x40, 0xb5, 0x74, 0xbc, 0x02, 0x5b, 0x37, 0xd6, 0x06, 0x3a, 0x56, 0xba,
-	0x7e, 0x92, 0x7d, 0x92, 0x59, 0x6b, 0x9f, 0xd5, 0xc3, 0xef, 0x3d, 0xde, 0x21, 0xd3, 0x8c, 0xf7,
+	0xaf, 0x36, 0xda, 0xb7, 0xd0, 0x92, 0x5d, 0x89, 0x06, 0x6b, 0x63, 0x2d, 0x35, 0x6e, 0x6d, 0x24,
-	0x1b, 0xe8, 0x4e, 0xc5, 0x12, 0x7d, 0xba, 0x7d, 0xb8, 0xd5, 0x8b, 0xda, 0x08, 0xf2, 0x47, 0x80,
+	0x0c, 0xb6, 0x1e, 0xf3, 0x0d, 0xb8, 0x56, 0x76, 0x41, 0xf7, 0xfe, 0xff, 0x8b, 0xf2, 0xf9, 0xdc,
-	0x7a, 0x91, 0x51, 0xb0, 0x7d, 0xe1, 0x6e, 0x6e, 0x7c, 0x53, 0xd5, 0xe7, 0xee, 0xdb, 0x77, 0xc3,
+	0x92, 0xe8, 0xe4, 0x90, 0x6c, 0x40, 0xb7, 0x34, 0x47, 0xb5, 0xe8, 0x7e, 0x94, 0x79, 0x92, 0xc9,
-	0x7b, 0x7f, 0xbf, 0x1b, 0xde, 0xfb, 0x6d, 0x35, 0xb4, 0xde, 0xae, 0x86, 0xd6, 0x5f, 0xab, 0xa1,
+	0xc6, 0x3c, 0xcb, 0xc5, 0xdf, 0x7d, 0xfa, 0x00, 0x4f, 0x53, 0xde, 0x6f, 0xa0, 0x39, 0x16, 0x73,
-	0xf5, 0xef, 0x6a, 0x68, 0x5d, 0xda, 0x2a, 0xf3, 0xd9, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x55,
+	0xf4, 0xe9, 0xfa, 0xe2, 0x96, 0x1b, 0xb5, 0x16, 0xe4, 0x6b, 0x80, 0x6a, 0x90, 0x91, 0xbf, 0x7e,
-	0x1a, 0x40, 0xbc, 0xb9, 0x09, 0x00, 0x00,
+	0xe0, 0x6e, 0x4f, 0x7c, 0x5d, 0xd4, 0x13, 0xf7, 0xe6, 0x5d, 0x6f, 0xeb, 0xef, 0x77, 0xbd, 0xad,
+	0x5f, 0x17, 0x3d, 0xeb, 0x66, 0xd1, 0xb3, 0xfe, 0x5a, 0xf4, 0xac, 0x7f, 0x17, 0x3d, 0xeb, 0xd2,
+	0x56, 0x9e, 0xcf, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x79, 0x60, 0xe3, 0x1d, 0x0a, 0x00,
+	0x00,
 }

api/services/shim/shim.proto

@@ -7,6 +7,7 @@ import "google/protobuf/empty.proto";
 import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/api/types/mount/mount.proto";
 import "github.com/containerd/containerd/api/types/container/container.proto";
+import "google/protobuf/timestamp.proto";
 
 // Shim service is launched for each container and is responsible for owning the IO
 // for the container and its additional processes.  The shim is also the parent of
@@ -53,6 +54,7 @@ message DeleteRequest {
 
 message DeleteResponse {
 	uint32 exit_status = 1;
+	google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
 }
 
 message ExecRequest {

api/types/container/container.pb.go

@@ -20,6 +20,11 @@ import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import _ "github.com/gogo/protobuf/gogoproto"
+import _ "github.com/gogo/protobuf/types"
+
+import time "time"
+
+import github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 
 import strings "strings"
 import reflect "reflect"
@@ -30,6 +35,7 @@ import io "io"
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
+var _ = time.Kitchen
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
@@ -140,6 +146,7 @@ type Event struct {
 	Type       Event_EventType `protobuf:"varint,2,opt,name=type,proto3,enum=containerd.v1.types.Event_EventType" json:"type,omitempty"`
 	Pid        uint32          `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
 	ExitStatus uint32          `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
+	ExitedAt   time.Time       `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
 }
 
 func (m *Event) Reset()                    { *m = Event{} }
@@ -358,6 +365,14 @@ func (m *Event) MarshalTo(dAtA []byte) (int, error) {
 		i++
 		i = encodeVarintContainer(dAtA, i, uint64(m.ExitStatus))
 	}
+	dAtA[i] = 0x2a
+	i++
+	i = encodeVarintContainer(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)))
+	n4, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i:])
+	if err != nil {
+		return 0, err
+	}
+	i += n4
 	return i, nil
 }
 
@@ -477,6 +492,8 @@ func (m *Event) Size() (n int) {
 	if m.ExitStatus != 0 {
 		n += 1 + sovContainer(uint64(m.ExitStatus))
 	}
+	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
+	n += 1 + l + sovContainer(uint64(l))
 	return n
 }
 
@@ -543,6 +560,7 @@ func (this *Event) String() string {
 		`Type:` + fmt.Sprintf("%v", this.Type) + `,`,
 		`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
 		`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
+		`ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf1.Timestamp", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -1184,6 +1202,36 @@ func (m *Event) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 5:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExitedAt", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowContainer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthContainer
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipContainer(dAtA[iNdEx:])
@@ -1315,38 +1363,41 @@ func init() {
 }
 
 var fileDescriptorContainer = []byte{
-	// 516 bytes of a gzipped FileDescriptorProto
+	// 576 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x8b, 0xd3, 0x5c,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcf, 0x6e, 0xd3, 0x4e,
-	0x14, 0xed, 0x4b, 0xd2, 0xb4, 0xbd, 0x65, 0xfa, 0x3d, 0xde, 0x27, 0x12, 0x47, 0xc8, 0x84, 0x22,
+	0x18, 0xcc, 0xda, 0xce, 0xbf, 0x2f, 0x6a, 0x7e, 0xd6, 0xfe, 0x10, 0x32, 0x41, 0x4a, 0xa2, 0x08,
-	0x18, 0x04, 0x53, 0xec, 0x6c, 0xdc, 0x76, 0x9a, 0x30, 0x16, 0x31, 0xad, 0xaf, 0x29, 0xce, 0xae,
+	0x09, 0x0b, 0x09, 0x47, 0xa4, 0x17, 0xae, 0x6e, 0x6d, 0x95, 0x0a, 0xe1, 0x84, 0x8d, 0x23, 0x7a,
-	0x64, 0x9a, 0x10, 0x9f, 0xcc, 0x24, 0x25, 0x79, 0xad, 0xce, 0xce, 0x9f, 0x37, 0x4b, 0x97, 0xae,
+	0x8b, 0xdc, 0x78, 0x31, 0x8b, 0x1a, 0xdb, 0xb2, 0xd7, 0x85, 0xde, 0x78, 0x04, 0x9e, 0x81, 0xa7,
-	0xd4, 0xe9, 0x6f, 0xf0, 0x07, 0xc8, 0x7b, 0x69, 0x27, 0x65, 0xa8, 0xe0, 0x26, 0x9c, 0x7b, 0x73,
+	0xe9, 0x91, 0x23, 0xa7, 0x42, 0xf3, 0x0c, 0x3c, 0x00, 0xda, 0x75, 0x52, 0x57, 0x50, 0x24, 0x2e,
-	0x72, 0xee, 0x3d, 0xe7, 0x12, 0x70, 0x13, 0xc6, 0x3f, 0xae, 0x2e, 0x9d, 0x45, 0x76, 0xdd, 0x5b,
+	0xd1, 0xcc, 0x97, 0xd9, 0xf1, 0xcc, 0xb7, 0x0b, 0x4e, 0xc4, 0xf8, 0xbb, 0xe2, 0xd4, 0x5a, 0x25,
-	0x64, 0x29, 0x0f, 0x59, 0x1a, 0xe7, 0xd1, 0x3e, 0x0c, 0x97, 0xac, 0xc7, 0x6f, 0x96, 0x71, 0x51,
+	0xeb, 0xf1, 0x2a, 0x89, 0x79, 0xc0, 0x62, 0x9a, 0x85, 0xb7, 0x61, 0x90, 0xb2, 0x31, 0xbf, 0x48,
-	0x35, 0x2b, 0xe4, 0x2c, 0xf3, 0x8c, 0x67, 0xe4, 0xff, 0x8a, 0xef, 0xac, 0x5f, 0x39, 0x92, 0x7e,
+	0x69, 0x5e, 0x0d, 0x2b, 0x64, 0xa5, 0x59, 0xc2, 0x13, 0xfc, 0x7f, 0xa5, 0xb7, 0xce, 0x9f, 0x59,
-	0xfc, 0x28, 0xc9, 0x92, 0x4c, 0xbe, 0xef, 0x09, 0x54, 0x52, 0xbb, 0x9f, 0xa0, 0x35, 0xdc, 0x91,
+	0x52, 0xde, 0xbb, 0x17, 0x25, 0x51, 0x22, 0xff, 0x1f, 0x0b, 0x54, 0x4a, 0x7b, 0x83, 0x28, 0x49,
-	0xc9, 0x63, 0x50, 0x58, 0x64, 0x20, 0x0b, 0xd9, 0xad, 0x33, 0x7d, 0xf3, 0xe3, 0x44, 0x19, 0xb9,
+	0xa2, 0x33, 0x3a, 0x96, 0xec, 0xb4, 0x78, 0x3b, 0xe6, 0x6c, 0x4d, 0x73, 0x1e, 0xac, 0xd3, 0x52,
-	0x54, 0x61, 0x11, 0xc1, 0xa0, 0x2e, 0x59, 0x64, 0x28, 0x16, 0xb2, 0x8f, 0xa8, 0x80, 0xe4, 0x14,
+	0x30, 0x7a, 0x0f, 0xed, 0xc3, 0x9d, 0x1b, 0xbe, 0x0f, 0x0a, 0x0b, 0x0d, 0x34, 0x44, 0x66, 0xfb,
-	0xf4, 0x82, 0x87, 0x7c, 0x55, 0x18, 0xaa, 0x85, 0xec, 0x4e, 0xff, 0xa9, 0x73, 0x60, 0xa4, 0x33,
+	0xa0, 0xb1, 0xb9, 0x1a, 0x28, 0xc7, 0x0e, 0x51, 0x58, 0x88, 0x75, 0x50, 0x53, 0x16, 0x1a, 0xca,
-	0x95, 0x14, 0xba, 0xa5, 0x76, 0x7f, 0x23, 0x68, 0x4c, 0xf2, 0x6c, 0x11, 0x17, 0xc5, 0x4e, 0x12,
+	0x10, 0x99, 0x7b, 0x44, 0x40, 0xbc, 0x0f, 0x8d, 0x9c, 0x07, 0xbc, 0xc8, 0x0d, 0x75, 0x88, 0xcc,
-	0x55, 0x92, 0x04, 0xb4, 0x30, 0x4f, 0x0a, 0x43, 0xb1, 0x54, 0xbb, 0x45, 0x25, 0x16, 0xac, 0x38,
+	0xee, 0xe4, 0xa1, 0x75, 0x47, 0x26, 0x6b, 0x2e, 0x25, 0x64, 0x2b, 0x1d, 0xfd, 0x44, 0xd0, 0x9c,
-	0x5d, 0x1b, 0xaa, 0x6c, 0x09, 0x48, 0x5e, 0x82, 0xb6, 0x2a, 0xe2, 0xdc, 0xd0, 0x2c, 0x64, 0xb7,
+	0x65, 0xc9, 0x8a, 0xe6, 0xf9, 0xce, 0x12, 0x55, 0x96, 0x18, 0xb4, 0x20, 0x8b, 0x72, 0x43, 0x19,
-	0xfb, 0x4f, 0x0e, 0x8e, 0x9d, 0x15, 0x71, 0x4e, 0x25, 0x4d, 0x08, 0x2c, 0x3e, 0x47, 0x46, 0x5d,
+	0xaa, 0x66, 0x9b, 0x48, 0x2c, 0x54, 0x34, 0x3e, 0x37, 0x54, 0x39, 0x12, 0x10, 0x3f, 0x05, 0xad,
-	0x58, 0xa2, 0x02, 0x92, 0x63, 0x68, 0xf2, 0x38, 0xbf, 0x66, 0x69, 0x78, 0x65, 0xe8, 0x16, 0xb2,
+	0xc8, 0x69, 0x66, 0x68, 0x43, 0x64, 0x76, 0x26, 0x0f, 0xee, 0xfc, 0xec, 0x22, 0xa7, 0x19, 0x91,
-	0x9b, 0xf4, 0xbe, 0x26, 0x27, 0xd0, 0x8e, 0xbf, 0x30, 0x3e, 0xdf, 0x5a, 0x6b, 0xc8, 0xe5, 0x40,
+	0x32, 0x61, 0xb0, 0xfa, 0x10, 0x1a, 0x75, 0x51, 0x89, 0x08, 0x88, 0x7b, 0xd0, 0xe2, 0x34, 0x5b,
-	0xb4, 0x4a, 0x27, 0x7b, 0xb6, 0x9b, 0xff, 0x6e, 0x7b, 0x0a, 0xda, 0x6c, 0xbb, 0xcb, 0xaa, 0xb2,
+	0xb3, 0x38, 0x38, 0x33, 0x1a, 0x43, 0x64, 0xb6, 0xc8, 0x0d, 0xc7, 0x03, 0xe8, 0xd0, 0x8f, 0x8c,
-	0xbc, 0x2a, 0x73, 0x4d, 0xaa, 0x5c, 0x13, 0x16, 0x91, 0xe7, 0xf0, 0x5f, 0x18, 0x45, 0x8c, 0xb3,
+	0x2f, 0xb7, 0xd5, 0x9a, 0x32, 0x1c, 0x88, 0x51, 0xd9, 0xe4, 0x56, 0xed, 0xd6, 0xbf, 0xd7, 0x9e,
-	0x2c, 0x0d, 0xaf, 0xe6, 0x09, 0x8b, 0x0a, 0x69, 0xfe, 0x88, 0x76, 0xaa, 0xf6, 0x39, 0x8b, 0x8a,
+	0x83, 0xb6, 0xd8, 0x66, 0x29, 0xaa, 0xca, 0x45, 0xb9, 0xd7, 0xa8, 0xda, 0x6b, 0xc4, 0x42, 0xfc,
-	0xee, 0x4f, 0x04, 0x75, 0x6f, 0x1d, 0xa7, 0xfc, 0xaf, 0x47, 0x7b, 0x0d, 0x9a, 0x58, 0x47, 0xaa,
+	0x18, 0xfe, 0x0b, 0xc2, 0x90, 0x71, 0x96, 0xc4, 0xc1, 0xd9, 0x32, 0x62, 0x61, 0x2e, 0xcb, 0xef,
-	0x77, 0xfa, 0xcf, 0x0e, 0x6e, 0x2a, 0x15, 0xca, 0x67, 0x70, 0xb3, 0x8c, 0xa9, 0xfc, 0x62, 0x77,
+	0x91, 0x6e, 0x35, 0x3e, 0x62, 0x61, 0x3e, 0xfa, 0xa2, 0x40, 0xdd, 0x3d, 0xa7, 0x31, 0xff, 0xeb,
-	0x1b, 0xb5, 0xba, 0xcd, 0x83, 0x60, 0xb4, 0x87, 0xc1, 0x74, 0xdf, 0x43, 0xeb, 0x5e, 0x85, 0x34,
+	0xa5, 0x3d, 0x07, 0x4d, 0xc4, 0x91, 0xee, 0xdd, 0xc9, 0xa3, 0x3b, 0x93, 0x4a, 0x87, 0xf2, 0xd7,
-	0x41, 0xf3, 0x2e, 0x46, 0x01, 0xae, 0x91, 0x06, 0xa8, 0xe3, 0xf1, 0x3b, 0x8c, 0x08, 0x80, 0x3e,
+	0xbf, 0x48, 0x29, 0x91, 0x27, 0x76, 0x77, 0xa3, 0x56, 0x77, 0xf3, 0xdb, 0x62, 0xb4, 0x3f, 0x16,
-	0xa4, 0xde, 0x20, 0xf0, 0xb0, 0x42, 0x5a, 0x50, 0x9f, 0x06, 0x03, 0x1a, 0x60, 0x95, 0x74, 0x00,
+	0x63, 0x43, 0x5b, 0x30, 0x1a, 0x2e, 0x03, 0x2e, 0xb7, 0xdd, 0x99, 0xf4, 0xac, 0xf2, 0xed, 0x59,
-	0xbc, 0x0b, 0x6f, 0x38, 0x1f, 0xb8, 0xae, 0xe7, 0x62, 0x4d, 0xd0, 0x26, 0x83, 0xd9, 0xd4, 0x73,
+	0xbb, 0xb7, 0x67, 0xf9, 0xbb, 0xb7, 0x77, 0xd0, 0xba, 0xbc, 0x1a, 0xd4, 0x3e, 0x7f, 0x1f, 0x20,
-	0x71, 0xfd, 0xc5, 0x1b, 0xd0, 0xb7, 0xa9, 0xb7, 0xa1, 0x31, 0xf3, 0xdf, 0xfa, 0xe3, 0x0f, 0x3e,
+	0xd2, 0x2a, 0x8f, 0xd9, 0x7c, 0xf4, 0x1a, 0xda, 0x37, 0x41, 0x70, 0x0b, 0x34, 0xf7, 0xe4, 0xd8,
-	0xae, 0x89, 0xa2, 0x54, 0x72, 0x31, 0x12, 0x05, 0x9d, 0xf9, 0xfe, 0xc8, 0x3f, 0xc7, 0x8a, 0x28,
+	0xd7, 0x6b, 0xb8, 0x09, 0xea, 0x74, 0xfa, 0x4a, 0x47, 0x18, 0xa0, 0x71, 0x48, 0x5c, 0xdb, 0x77,
-	0xa6, 0xc1, 0x78, 0x32, 0xf1, 0x5c, 0xac, 0xee, 0x29, 0x69, 0x67, 0xc6, 0xed, 0x9d, 0x59, 0xfb,
+	0x75, 0x05, 0xb7, 0xa1, 0x3e, 0xf7, 0x6d, 0xe2, 0xeb, 0x2a, 0xee, 0x02, 0xb8, 0x27, 0xee, 0xe1,
-	0x7e, 0x67, 0xd6, 0xbe, 0x6e, 0x4c, 0x74, 0xbb, 0x31, 0xd1, 0xb7, 0x8d, 0x89, 0x7e, 0x6d, 0x4c,
+	0xd2, 0x76, 0x1c, 0xd7, 0xd1, 0x35, 0x21, 0x9b, 0xd9, 0x8b, 0xb9, 0xeb, 0xe8, 0xf5, 0x27, 0x2f,
-	0x74, 0xa9, 0xcb, 0x9f, 0xe0, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0x66, 0x96, 0xba,
+	0xa0, 0xb1, 0xcd, 0xd7, 0x81, 0xe6, 0xc2, 0x7b, 0xe9, 0x4d, 0xdf, 0x78, 0x7a, 0x4d, 0x90, 0xd2,
-	0x77, 0x03, 0x00, 0x00,
+	0xc9, 0xd1, 0x91, 0x20, 0x64, 0xe1, 0x79, 0xc7, 0xde, 0x91, 0xae, 0x08, 0x32, 0xf7, 0xa7, 0xb3,
+	0x99, 0xeb, 0xe8, 0xea, 0x2d, 0x27, 0xed, 0xc0, 0xb8, 0xbc, 0xee, 0xd7, 0xbe, 0x5d, 0xf7, 0x6b,
+	0x9f, 0x36, 0x7d, 0x74, 0xb9, 0xe9, 0xa3, 0xaf, 0x9b, 0x3e, 0xfa, 0xb1, 0xe9, 0xa3, 0xd3, 0x86,
+	0xac, 0xb7, 0xff, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xfb, 0xbb, 0xac, 0xdb, 0x03, 0x00, 0x00,
 }

api/types/container/container.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 package containerd.v1.types;
 
 import "gogoproto/gogo.proto";
+import "google/protobuf/timestamp.proto";
 
 enum Status {
 	UNKNOWN = 0;
@@ -50,4 +51,5 @@ message Event {
 	EventType type = 2;
 	uint32 pid = 3;
 	uint32 exit_status = 4;
+	google.protobuf.Timestamp exited_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
 }

event.go

@@ -38,4 +38,5 @@ type Event struct {
 	ID         string
 	Pid        uint32
 	ExitStatus uint32
+	ExitedAt   time.Time
 }

linux/runtime.go

@@ -120,22 +120,25 @@ func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateO
 	return c, nil
 }
 
-func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (uint32, error) {
+func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (*containerd.Exit, error) {
 	lc, ok := c.(*Container)
 	if !ok {
-		return 0, fmt.Errorf("container cannot be cast as *linux.Container")
+		return nil, fmt.Errorf("container cannot be cast as *linux.Container")
 	}
 	// remove the container from the monitor
 	if err := r.monitor.Stop(lc); err != nil {
 		// TODO: log error here
-		return 0, err
+		return nil, err
 	}
 	rsp, err := lc.shim.Delete(ctx, &shim.DeleteRequest{})
 	if err != nil {
-		return 0, err
+		return nil, err
 	}
 	lc.shim.Exit(ctx, &shim.ExitRequest{})
-	return rsp.ExitStatus, r.deleteBundle(lc.id)
+	return &containerd.Exit{
+		Status:    rsp.ExitStatus,
+		Timestamp: rsp.ExitedAt,
+	}, r.deleteBundle(lc.id)
 }
 
 func (r *Runtime) Containers(ctx context.Context) ([]containerd.Container, error) {
@@ -204,6 +207,7 @@ func (r *Runtime) forward(events shim.Shim_EventsClient) {
 			Pid:        e.Pid,
 			ID:         e.ID,
 			ExitStatus: e.ExitStatus,
+			ExitedAt:   e.ExitedAt,
 		}
 	}
 }

linux/shim/exec.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"sync"
 	"syscall"
+	"time"
 
 	"golang.org/x/sys/unix"
 
@@ -28,6 +29,7 @@ type execProcess struct {
 	console console.Console
 	io      runc.IO
 	status  int
+	exited  time.Time
 	pid     int
 	closers []io.Closer
 	stdin   io.Closer
@@ -125,8 +127,13 @@ func (e *execProcess) Status() int {
 	return e.status
 }
 
+func (e *execProcess) ExitedAt() time.Time {
+	return e.exited
+}
+
 func (e *execProcess) Exited(status int) {
 	e.status = status
+	e.exited = time.Now()
 	e.Wait()
 	if e.io != nil {
 		for _, c := range e.closers {

linux/shim/init.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"sync"
 	"syscall"
+	"time"
 
 	"golang.org/x/sys/unix"
 
@@ -28,6 +29,7 @@ type initProcess struct {
 	io      runc.IO
 	runc    *runc.Runc
 	status  int
+	exited  time.Time
 	pid     int
 	closers []io.Closer
 	stdin   io.Closer
@@ -121,6 +123,10 @@ func (p *initProcess) Status() int {
 	return p.status
 }
 
+func (p *initProcess) ExitedAt() time.Time {
+	return p.exited
+}
+
 // ContainerStatus return the state of the container (created, running, paused, stopped)
 func (p *initProcess) ContainerStatus(ctx context.Context) (string, error) {
 	c, err := p.runc.State(ctx, p.id)
@@ -136,6 +142,7 @@ func (p *initProcess) Start(context context.Context) error {
 
 func (p *initProcess) Exited(status int) {
 	p.status = status
+	p.exited = time.Now()
 }
 
 func (p *initProcess) Delete(context context.Context) error {

linux/shim/process.go

@@ -5,6 +5,7 @@ package shim
 import (
 	"context"
 	"io"
+	"time"
 
 	"github.com/crosbymichael/console"
 )
@@ -18,6 +19,8 @@ type process interface {
 	Exited(status int)
 	// Status returns the exit status
 	Status() int
+	// ExitedAt is the time the process exited
+	ExitedAt() time.Time
 	// Delete deletes the process and its resourcess
 	Delete(context.Context) error
 	// Signal directly signals the process

linux/shim/service.go

@@ -94,6 +94,7 @@ func (s *Service) Delete(ctx context.Context, r *shimapi.DeleteRequest) (*shimap
 	s.mu.Unlock()
 	return &shimapi.DeleteResponse{
 		ExitStatus: uint32(p.Status()),
+		ExitedAt:   p.ExitedAt(),
 	}, nil
 }
 
@@ -253,5 +254,6 @@ func (s *Service) waitExit(p process, pid int, cmd *reaper.Cmd) {
 		ID:         s.id,
 		Pid:        uint32(pid),
 		ExitStatus: uint32(status),
+		ExitedAt:   p.ExitedAt(),
 	}
 }

runtime.go

@@ -1,6 +1,10 @@
 package containerd
 
-import "golang.org/x/net/context"
+import (
+	"time"
+
+	"golang.org/x/net/context"
+)
 
 type IO struct {
 	Stdin    string
@@ -18,6 +22,11 @@ type CreateOpts struct {
 	IO IO
 }
 
+type Exit struct {
+	Status    uint32
+	Timestamp time.Time
+}
+
 // Runtime is responsible for the creation of containers for a certain platform,
 // arch, or custom usage.
 type Runtime interface {
@@ -26,7 +35,7 @@ type Runtime interface {
 	// Containers returns all the current containers for the runtime
 	Containers(context.Context) ([]Container, error)
 	// Delete removes the container in the runtime
-	Delete(context.Context, Container) (uint32, error)
+	Delete(context.Context, Container) (*Exit, error)
 	// Events returns events for the runtime and all containers created by the runtime
 	Events(context.Context) <-chan *Event
 }

services/execution/service.go

@@ -127,14 +127,17 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteRequest) (*api.Delete
 	if err != nil {
 		return nil, err
 	}
-	status, err := runtime.Delete(ctx, c)
+	exit, err := runtime.Delete(ctx, c)
 	if err != nil {
 		return nil, err
 	}
 
 	delete(s.containers, r.ID)
 
-	return &api.DeleteResponse{ExitStatus: status}, nil
+	return &api.DeleteResponse{
+		ExitStatus: exit.Status,
+		ExitedAt:   exit.Timestamp,
+	}, nil
 }
 
 func containerFromContainerd(ctx context.Context, c containerd.Container) (*container.Container, error) {

windows/container.go

@@ -5,6 +5,7 @@ package windows
 import (
 	"encoding/json"
 	"sync"
+	"time"
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/log"
@@ -19,7 +20,7 @@ var (
 	ErrLoadedContainer = errors.New("loaded container can only be terminated")
 )
 
-type eventCallback func(id string, evType containerd.EventType, pid, exitStatus uint32)
+type eventCallback func(id string, evType containerd.EventType, pid, exitStatus uint32, exitedAt time.Time)
 
 func loadContainers(ctx context.Context, h *hcs.HCS, sendEvent eventCallback) ([]*container, error) {
 	hCtr, err := h.LoadContainers(ctx)
@@ -49,7 +50,7 @@ func newContainer(ctx context.Context, h *hcs.HCS, id string, spec RuntimeSpec,
 	if err != nil {
 		return nil, err
 	}
-	sendEvent(id, containerd.CreateEvent, hcsCtr.Pid(), 0)
+	sendEvent(id, containerd.CreateEvent, hcsCtr.Pid(), 0, time.Time{})
 
 	return &container{
 		ctr:       hcsCtr,
@@ -85,7 +86,7 @@ func (c *container) Start(ctx context.Context) error {
 	}
 
 	c.setStatus(containerd.RunningStatus)
-	c.sendEvent(c.ctr.ID(), containerd.StartEvent, c.ctr.Pid(), 0)
+	c.sendEvent(c.ctr.ID(), containerd.StartEvent, c.ctr.Pid(), 0, time.Time{})
 
 	// Wait for our process to terminate
 	go func() {
@@ -94,7 +95,7 @@ func (c *container) Start(ctx context.Context) error {
 			log.G(ctx).Debug(err)
 		}
 		c.setStatus(containerd.StoppedStatus)
-		c.sendEvent(c.ctr.ID(), containerd.ExitEvent, c.ctr.Pid(), ec)
+		c.sendEvent(c.ctr.ID(), containerd.ExitEvent, c.ctr.Pid(), ec, c.ctr.Processes()[0].ExitedAt())
 	}()
 
 	return nil
@@ -136,7 +137,7 @@ func (c *container) Exec(ctx context.Context, opts containerd.ExecOpts) (contain
 		if err != nil {
 			log.G(ctx).Debug(err)
 		}
-		c.sendEvent(c.ctr.ID(), containerd.ExitEvent, p.Pid(), ec)
+		c.sendEvent(c.ctr.ID(), containerd.ExitEvent, p.Pid(), ec, p.ExitedAt())
 	}()
 
 	return &process{p}, nil

windows/hcs/hcs.go

@@ -167,6 +167,10 @@ func (c *Container) Pid() uint32 {
 	return c.pid
 }
 
+func (c *Container) Processes() []*Process {
+	return c.processes
+}
+
 func (c *Container) Start(ctx context.Context) error {
 	_, err := c.addProcess(ctx, c.spec.Process, c.io)
 	return err

windows/hcs/process.go

@@ -4,6 +4,7 @@ package hcs
 
 import (
 	"syscall"
+	"time"
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/containerd/containerd"
@@ -13,11 +14,12 @@ import (
 type Process struct {
 	hcsshim.Process
 
-	pid    uint32
+	pid      uint32
-	io     *IO
+	io       *IO
-	ec     uint32
+	ec       uint32
-	ecErr  error
+	exitedAt time.Time
-	ecSync chan struct{}
+	ecErr    error
+	ecSync   chan struct{}
 }
 
 func (p *Process) Pid() uint32 {
@@ -29,6 +31,10 @@ func (p *Process) ExitCode() (uint32, error) {
 	return p.ec, p.ecErr
 }
 
+func (p *Process) ExitedAt() time.Time {
+	return p.exitedAt
+}
+
 func (p *Process) Status() containerd.Status {
 	select {
 	case <-p.ecSync:
@@ -60,6 +66,6 @@ func processExitCode(containerID string, p *Process) (uint32, error) {
 		// Well, unknown exit code it is
 		ec = 255
 	}
-
+	p.exitedAt = time.Now()
 	return uint32(ec), err
 }

windows/runtime.go

@@ -53,20 +53,16 @@ func New(ic *plugin.InitContext) (interface{}, error) {
 		hcs:           hcs.New(owner, rootDir),
 	}
 
-	sendEvent := func(id string, evType containerd.EventType, pid, exitStatus uint32) {
-		r.sendEvent(id, evType, pid, exitStatus)
-	}
-
 	// Terminate all previous container that we may have started. We don't
 	// support restoring containers
-	ctrs, err := loadContainers(ic.Context, r.hcs, sendEvent)
+	ctrs, err := loadContainers(ic.Context, r.hcs, r.sendEvent)
 	if err != nil {
 		return nil, err
 	}
 
 	for _, c := range ctrs {
 		c.ctr.Delete(ic.Context)
-		r.sendEvent(c.ctr.ID(), containerd.ExitEvent, c.ctr.Pid(), 255)
+		r.sendEvent(c.ctr.ID(), containerd.ExitEvent, c.ctr.Pid(), 255, time.Time{})
 	}
 
 	// Try to delete the old state dir and recreate it
@@ -112,11 +108,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateO
 		return nil, errors.Wrap(err, "failed to unmarshal oci spec")
 	}
 
-	sendEvent := func(id string, evType containerd.EventType, pid, exitStatus uint32) {
+	ctr, err := newContainer(ctx, r.hcs, id, rtSpec, opts.IO, r.sendEvent)
-		r.sendEvent(id, evType, pid, exitStatus)
-	}
-
-	ctr, err := newContainer(ctx, r.hcs, id, rtSpec, opts.IO, sendEvent)
 	if err != nil {
 		return nil, err
 	}
@@ -128,10 +120,10 @@ func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateO
 	return ctr, nil
 }
 
-func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (uint32, error) {
+func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (*containerd.Exit, error) {
 	wc, ok := c.(*container)
 	if !ok {
-		return 0, fmt.Errorf("container cannot be cast as *windows.container")
+		return nil, fmt.Errorf("container cannot be cast as *windows.container")
 	}
 	ec, err := wc.ctr.ExitCode()
 	if err != nil {
@@ -144,7 +136,10 @@ func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (uint32, e
 	delete(r.containers, wc.ctr.ID())
 	r.Unlock()
 
-	return ec, err
+	return &containerd.Exit{
+		Status:    ec,
+		Timestamp: wc.ctr.Processes()[0].ExitedAt(),
+	}, nil
 }
 
 func (r *Runtime) Containers(ctx context.Context) ([]containerd.Container, error) {
@@ -167,7 +162,7 @@ func (r *Runtime) Events(ctx context.Context) <-chan *containerd.Event {
 	return r.events
 }
 
-func (r *Runtime) sendEvent(id string, evType containerd.EventType, pid, exitStatus uint32) {
+func (r *Runtime) sendEvent(id string, evType containerd.EventType, pid, exitStatus uint32, exitedAt time.Time) {
 	r.events <- &containerd.Event{
 		Timestamp:  time.Now(),
 		Runtime:    runtimeName,
@@ -175,5 +170,6 @@ func (r *Runtime) sendEvent(id string, evType containerd.EventType, pid, exitSta
 		Pid:        pid,
 		ID:         id,
 		ExitStatus: exitStatus,
+		ExitedAt:   exitedAt,
 	}
 }