[executor] Carry environment ID in DeviceEvents and output

Author: teo

executor/eventloop.go

@@ -77,9 +77,9 @@ func eventLoop(state *internalState, decoder encoding.Decoder, h events.Handler)
 			// Any error coming through here should immediately destroy the event loop and return
 			// control to the Mesos subscription handling.
 		case status := <-state.statusCh:
-			handleStatusUpdate(state, status)
+			performStatusUpdate(state, status)
 		case message := <-state.messageCh:
-			handleOutgoingMessage(state, message)
+			sendOutgoingMessage(state, message)
 		}
 	}
 	return err

executor/executable/basictaskcommon.go

@@ -208,6 +208,7 @@ func (t *basicTaskBase) startBasicTask() (err error) {
 			btt.FinalMesosState = pendingState
 			btt.Stderr = stderrBuf.String()
 			btt.Stdout = stdoutBuf.String()
+			btt.SetLabels(map[string]string{"environmentId": t.knownEnvironmentId.String()})
 			t.sendDeviceEvent(t.knownEnvironmentId, btt)
 		}
 	}()

executor/executable/controllabletask.go

@@ -446,6 +446,7 @@ func (t *ControllableTask) Launch() error {
 						Debug("nil DeviceEvent received (NULL_DEVICE_EVENT) - closing stream")
 					break
 				}
+				deviceEvent.SetLabels(map[string]string{"environmentId": t.knownEnvironmentId.String()})
 
 				t.sendDeviceEvent(t.knownEnvironmentId, deviceEvent)
 			}

executor/executorutil/executorutil.go

@@ -41,10 +41,12 @@ type Labeler interface {
 func GetEnvironmentIdFromLabelerType(labeler Labeler) uid.ID {
 	envId := uid.NilID()
 	var err error
-	if labeler.GetLabels() != nil && len(labeler.GetLabels().Labels) > 0 {
-		for _, label := range labeler.GetLabels().Labels {
-			if label.Key == "environmentId" && label.Value != nil {
-				envId, err = uid.FromString(*label.Value)
+	labels := labeler.GetLabels()
+
+	if labels != nil && len(labels.GetLabels()) > 0 {
+		for _, label := range labels.GetLabels() {
+			if label.GetKey() == "environmentId" && label.GetValue() != "" {
+				envId, err = uid.FromString(label.GetValue())
 				if err != nil {
 					envId = uid.NilID()
 				}