fix(empty-devicename): Added check for empty device name.

Squashed commit of the following:

commit c2646f592a3f7dc24097e2a91a6152c3e4589693
Author: Shubhashri Shirode <[email protected]>
Date:   Fri May 7 17:56:47 2021 +0530

    DEVTS-10495: fixed review comments.

commit 7b8778f5255209e13318e8523dbf87170fb019dd
Author: Shubhashri Shirode <[email protected]>
Date:   Thu May 6 14:31:20 2021 +0530

    DEVTS-10495:review comments fixed.

commit 371284d4e721c56bcb9fa80eda0e1b1f5df3cef7
Author: Shubhashri Shirode <[email protected]>
Date:   Wed May 5 19:31:22 2021 +0530

    DEVTS-10495:corrected log formats.

commit 4f289798400cea963c30c2e9e72c5a72ab7fa2e4
Author: Shubhashri Shirode <[email protected]>
Date:   Wed May 5 19:16:07 2021 +0530

    DEVTS-10495:corrected typo.

commit 8e0cf7e2c366f067778a7ed9dcb770b3fde43f55
Author: Shubhashri Shirode <[email protected]>
Date:   Wed May 5 19:15:00 2021 +0530

    DEVTS-10495:calculated latency for delete event.

commit 8940a30ab1218af2fc564ceab0c4f19768beb143
Author: Shubhashri Shirode <[email protected]>
Date:   Wed May 5 17:23:01 2021 +0530

    corrected error log.

commit dc5b81ce0eb3795f0c46a7dddc109fe233d04dff
Author: Shubhashri Shirode <[email protected]>
Date:   Wed May 5 16:44:12 2021 +0530

    fix(empty-resource-name):Adde ed check for empty resource name.

Author: lmshubhashri

pkg/device/device.go

@@ -78,7 +78,7 @@ func (m *Manager) checkAndUpdateExistingDevice(lctx *lmctx.LMContext, resource s
 		return nil, err
 	}
 	if len(existingDevices) == 0 {
-		return nil, fmt.Errorf("cannot find devices with names: %s , %s", *device.DisplayName, util.GetFullDisplayName(device, resource, currentCluster))
+		return nil, fmt.Errorf("could not find devices with names: %s , %s", *device.DisplayName, util.GetFullDisplayName(device, resource, currentCluster))
 	}
 	for _, existingDevice := range existingDevices {
 		clusterName := util.GetPropertyValue(existingDevice, constants.K8sClusterNamePropertyKey)
@@ -130,7 +130,7 @@ func (m *Manager) RenameAndUpdateDevice(lctx *lmctx.LMContext, resource string,
 		entityProperty := models.EntityProperty{Name: constants.K8sSystemCategoriesPropertyKey, Value: updatedCategories, Type: "system"}
 		err1 := m.updateDevicePropertyByName(lctx, updatedDevice.ID, &entityProperty, resource)
 		if err1 != nil {
-			log.Errorf("Failed to remove device %s from conflicts group. %v", *updatedDevice.DisplayName, err1)
+			log.Errorf("failed to remove device %s from conflicts group. %v", *updatedDevice.DisplayName, err1)
 			return err1
 		}
 	}
@@ -145,12 +145,12 @@ func (m *Manager) RenameAndUpdateDevice(lctx *lmctx.LMContext, resource string,
 			}
 			newDevice, err := m.UpdateAndReplace(lctx, resource, device, options...)
 			if err != nil {
-				log.Errorf("Failed to update the device %s : %v", *device.DisplayName, err)
+				log.Errorf("failed to update the device %s : %v", *device.DisplayName, err)
 				return err
 			}
 			err2 := m.moveDeviceToConflictGroup(lctx, newDevice, resource)
 			if err2 != nil {
-				log.Errorf("Failed to move device %s to conflicts group: %v", *newDevice.DisplayName, err2)
+				log.Errorf("failed to move device %s to conflicts group: %v", *newDevice.DisplayName, err2)
 				return err2
 			}
 
@@ -328,8 +328,9 @@ func (m *Manager) addConflictingDevice(lctx *lmctx.LMContext, device *models.Dev
 	log.Infof("Check and Update the existing device: %s", *device.DisplayName)
 	updatedevice, err := m.checkAndUpdateExistingDevice(lctx, resource, device)
 	if err != nil {
-		log.Errorf("failed to updated device: %v", err)
-		return nil, fmt.Errorf("failed to updated device")
+		err2 := fmt.Errorf("failed to update existing device: %w", err)
+		log.Error(err2.Error())
+		return nil, err2
 	}
 
 	if updatedevice == nil {
@@ -345,7 +346,7 @@ func (m *Manager) addConflictingDevice(lctx *lmctx.LMContext, device *models.Dev
 
 	if err != nil {
 		log.Errorf("add new device failed: %v", err)
-		return nil, fmt.Errorf("add new device failed")
+		return nil, err
 	}
 
 	m.DC.Set(util.GetFullDisplayName(renamedDevice, resource, currentCluster))
@@ -409,12 +410,20 @@ func (m *Manager) UpdateAndReplace(lctx *lmctx.LMContext, resource string, d *mo
 // UpdateAndReplaceByDisplayName implements types.DeviceManager.
 func (m *Manager) UpdateAndReplaceByDisplayName(lctx *lmctx.LMContext, resource, name, fullName string, filter types.UpdateFilter, labels map[string]string, options ...types.DeviceOption) (*models.Device, error) {
 	log := lmlog.Logger(lctx)
+	device := buildDevice(lctx, m.Config(), nil, options...)
+
+	if *device.Name == "" {
+		err := fmt.Errorf("empty name is invalid for resource %v", resource)
+		log.Warn(err.Error())
+		return nil, err
+	}
+
 	if !m.DC.Exists(fullName) {
 		log.Infof("Missing device %v; (full name = %v) adding it now", name, fullName)
 		return m.Add(lctx, resource, labels, options...)
 	}
 	if filter != nil && !filter() {
-		log.Debugf("filtered device update %s", name)
+		log.Debugf("Ignoring updates for device %s, %s", name, resource)
 		return nil, nil
 	}
 
@@ -432,12 +441,12 @@ func (m *Manager) UpdateAndReplaceByDisplayName(lctx *lmctx.LMContext, resource,
 	options = append(options, m.DisplayName(*existingDevice.DisplayName))
 
 	// Update the device.
-	device, err := m.UpdateAndReplace(lctx, resource, existingDevice, options...)
+	updatedDevice, err := m.UpdateAndReplace(lctx, resource, existingDevice, options...)
 	if err != nil {
 
 		return nil, err
 	}
-	m.DC.Set(util.GetFullDisplayName(device, resource, m.Config().ClusterName))
+	m.DC.Set(util.GetFullDisplayName(updatedDevice, resource, m.Config().ClusterName))
 	return device, nil
 }
 
@@ -495,7 +504,7 @@ func (m *Manager) updateDevicePropertyByName(lctx *lmctx.LMContext, deviceID int
 		return fmt.Errorf("failed to update device property '%v'. Error: %v", entityProperty.Name, err)
 	}
 	resp := restResponse.(*lm.UpdateDevicePropertyByNameOK)
-	log.Debugf("update property response payload : %#v", resp.Payload)
+	log.Debugf("Update property response payload : %#v", resp.Payload)
 
 	return nil
 }
@@ -593,7 +602,7 @@ func (m *Manager) DeleteByDisplayName(lctx *lmctx.LMContext, resource, name, ful
 		return err2
 	}
 	m.DC.Unset(name)
-	log.Infof("deleted device %q", name)
+	log.Infof("Deleted device %q", name)
 
 	return nil
 }
@@ -603,7 +612,7 @@ func (m *Manager) getExisitingDeviceByGivenProperties(lctx *lmctx.LMContext, nam
 	existingDevices, err := m.FindByDisplayNames(lctx, resource, name, fullName)
 
 	if err != nil {
-		log.Errorf("Error finding devices with names: %s, %s - %v", name, fullName, err)
+		log.Errorf("error finding devices with names: %s, %s - %v", name, fullName, err)
 		return nil, err
 	}
 

pkg/utilities/utilities.go

@@ -2,8 +2,11 @@ package utilities
 
 import (
 	"regexp"
+	"time"
 
 	"github.com/google/uuid"
+	"github.com/sirupsen/logrus"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // GetLabelByPrefix takes a list of labels returns the first label matching the specified prefix
@@ -23,3 +26,13 @@ func GetLabelByPrefix(prefix string, labels map[string]string) (string, string)
 func GetShortUUID() uint32 {
 	return uuid.New().ID()
 }
+
+//LogDeleteEventLatency logs latency of receiving delete event to argus.
+func LogDeleteEventLatency(deletionTimestamp *v1.Time, name string) {
+	if deletionTimestamp != nil {
+		latency := time.Since(deletionTimestamp.Time)
+		logrus.Infof("Delete event latency for %s is %v", name, latency)
+	} else {
+		logrus.Warnf("resource delete time was not present in event context for %s", name)
+	}
+}

pkg/watch/deployment/deployment.go

@@ -86,6 +86,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
 		lctx := lmlog.NewLMContextWith(logrus.WithFields(logrus.Fields{"device_id": resource + "-" + deployment.Name}))
 		log := lmlog.Logger(lctx)
 		log.Debugf("Handling delete deployment event: %s", deployment.Name)
+		util.LogDeleteEventLatency(deployment.DeletionTimestamp, w.getDesiredDisplayName(deployment))
 		// Delete the deployment.
 		if w.Config().DeleteDevices {
 			if err := w.DeleteByDisplayName(lctx, w.Resource(), w.getDesiredDisplayName(deployment),

pkg/watch/hpa/hpa.go

@@ -88,6 +88,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
 		lctx := lmlog.NewLMContextWith(log.WithFields(log.Fields{"device_id": resource + "-" + horizontalPodAutoscaler.Name}))
 		log := lmlog.Logger(lctx)
 		log.Debugf("Handling delete horizontalPodAutoscaler event: %s", horizontalPodAutoscaler.Name)
+		util.LogDeleteEventLatency(horizontalPodAutoscaler.DeletionTimestamp, w.getDesiredDisplayName(horizontalPodAutoscaler))
 
 		// Delete the horizontalPodAutoscaler.
 		if w.Config().DeleteDevices {

pkg/watch/node/node.go

@@ -113,7 +113,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
 		log := lmlog.Logger(lctx)
 
 		log.Debugf("Handling delete node event: %s", w.getDesiredDisplayName(node))
-
+		util.LogDeleteEventLatency(node.DeletionTimestamp, w.getDesiredDisplayName(node))
 		// nolint: dupl
 		if w.Config().DeleteDevices {
 			if err := w.DeleteByDisplayName(lctx, w.Resource(), w.getDesiredDisplayName(node),
@@ -149,7 +149,7 @@ func (w *Watcher) add(lctx *lmctx.LMContext, node *v1.Node) {
 
 func (w *Watcher) nodeUpdateFilter(old, new *v1.Node) types.UpdateFilter {
 	return func() bool {
-		return getInternalAddress(old.Status.Addresses) != getInternalAddress(new.Status.Addresses)
+		return getInternalAddress(old.Status.Addresses).Address != getInternalAddress(new.Status.Addresses).Address
 	}
 }
 

pkg/watch/pod/pod.go

@@ -114,6 +114,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
 		log := lmlog.Logger(lctx)
 
 		log.Debugf("Handling delete pod event: %s", w.getDesiredDisplayName(pod))
+		util.LogDeleteEventLatency(pod.DeletionTimestamp, w.getDesiredDisplayName(pod))
 
 		// Delete the pod.
 		// nolint: dupl

pkg/watch/service/service.go

@@ -101,6 +101,7 @@ func (w *Watcher) DeleteFunc() func(obj interface{}) {
 		service := obj.(*v1.Service)
 		lctx := lmlog.NewLMContextWith(logrus.WithFields(logrus.Fields{"device_id": resource + "-" + service.Name}))
 		log := lmlog.Logger(lctx)
+		util.LogDeleteEventLatency(service.DeletionTimestamp, w.getDesiredDisplayName(service))
 		// Delete the service.
 		// nolint: dupl
 		if w.Config().DeleteDevices {