#130 Add debug output with event/insight/blob data to committer

.gitignore

@@ -22,4 +22,4 @@ client
 ionctl
 frontapi
 imagetag.temp
-cmd/management/debug
+**/debug

internal/app/handler/committer/committer.go

@@ -146,6 +146,9 @@ func (c *Committer) commitBlob(blobsPath string) (map[string]string, error) {
 	}
 
 	logger.Info(c.context, "committed blob data")
+	logger.DebugWithFields(c.context, "blob file names", map[string]interface{}{
+		"files": fileNames,
+	})
 	return blobURIs, nil
 }
 
@@ -183,6 +186,9 @@ func (c *Committer) commitInsights(insightsPath string) error {
 	}
 
 	logger.Info(c.context, "committed insights data")
+	logger.DebugWithFields(c.context, "insights data", map[string]interface{}{
+		"insight": insight,
+	})
 	return nil
 }
 
@@ -220,6 +226,9 @@ func (c *Committer) commitEvents(eventsPath string, blobURIs map[string]string)
 		if err != nil {
 			return fmt.Errorf("failed to unmarshal map '%s' with error: '%+v'", fileName, err)
 		}
+		logger.DebugWithFields(c.context, "event data", map[string]interface{}{
+			"event": keyValuePairs,
+		})
 
 		var eventType string
 		var includedFilesCSV string

internal/app/handler/logger/logger.go

@@ -16,6 +16,16 @@ func Info(c *common.Context, message string) {
 	}).Info(message)
 }
 
+// InfoWithFields logs an info message with context
+func InfoWithFields(c *common.Context, message string, fields map[string]interface{}) {
+	log.WithFields(log.Fields{
+		"eventID":       c.EventID,
+		"correlationID": c.CorrelationID,
+		"name":          c.Name,
+		"timestamp":     time.Now(),
+	}).WithFields(fields).Info(message)
+}
+
 // Debug logs a debug message with context
 func Debug(c *common.Context, message string) {
 	log.WithFields(log.Fields{
@@ -26,6 +36,16 @@ func Debug(c *common.Context, message string) {
 	}).Debug(message)
 }
 
+// DebugWithFields logs an info message with context
+func DebugWithFields(c *common.Context, message string, fields map[string]interface{}) {
+	log.WithFields(log.Fields{
+		"eventID":       c.EventID,
+		"correlationID": c.CorrelationID,
+		"name":          c.Name,
+		"timestamp":     time.Now(),
+	}).WithFields(fields).Debug(message)
+}
+
 // Error logs an error message with context
 func Error(c *common.Context, message string) {
 	log.WithFields(log.Fields{

tools/end2end-smoketest.sh

@@ -92,8 +92,15 @@ echo "Deploying downloader and transcoder module with tag $ION_IMAGE_TAG"
 echo "--------------------------------------------------------"
 
 docker run --network host ion-cli module create -i frontapi.new_link -o file_downloaded -n downloader -m $DOCKER_USER/ion-module-download-file:$ION_IMAGE_TAG -p kubernetes --handler-image $DOCKER_USER/ion-handler:$ION_IMAGE_TAG
-docker run --network host ion-cli module create -i file_downloaded -o file_transcoded -n transcodegpu -m $DOCKER_USER/ion-module-transcode:$ION_IMAGE_TAG -p azurebatch --handler-image $DOCKER_USER/ion-handler:$ION_IMAGE_TAG
+docker run --network host ion-cli module create -i file_downloaded -o file_transcoded -n transcode -m $DOCKER_USER/ion-module-transcode:$ION_IMAGE_TAG -p azurebatch --handler-image $DOCKER_USER/ion-handler:$ION_IMAGE_TAG
+sleep 30
+
+
+echo "--------------------------------------------------------"
+echo "Submitting a video for processing to the frontapi"
+echo "--------------------------------------------------------"
+
+curl --header "Content-Type: application/json"   --request POST   --data '{"url": "http://www.engr.colostate.edu/me/facil/dynamics/files/bird.avi"}'   http://localhost:9001/
 
 read -p "Press enter to to stop forwarding ports to management api and front api and exit..." key
-kill $FORWARD_PID1
-kill $FORWARD_PID2
+ps aux | grep [k]ubectl | awk '{print $2}' | xargs kill || true