Some linter-suggested changes

Correct index for SHORT/LONG status resposes

Author: ibmmqmet

ibmmq/mqiPCF.go

@@ -321,8 +321,9 @@ func ReadPCFEmbeddedHeader(buf []byte) (*MQEPH, int) {
 	binary.Read(p, endian, &eph.CodedCharSetId)
 	offset += 4
 
-	s := string(buf[offset : offset+8])
-	s = trimToNull(s)
+	// We don't actually use this next field
+	// s := string(buf[offset : offset+8])
+	// s = trimToNull(s)
 	offset += 8
 	p.Next(8)
 

ibmmq/mqistr.go

@@ -1465,6 +1465,8 @@ func MQItoString(class string, value int) string {
 			s = "MQCMDL_LEVEL_935"
 		case 940:
 			s = "MQCMDL_LEVEL_940"
+		case 941:
+			s = "MQCMDL_LEVEL_941"
 		default:
 			s = ""
 		}

mqmetric/channel.go

@@ -73,6 +73,16 @@ const (
 	SQUASH_CHL_STATUS_RUNNING    = 2
 )
 
+// If connected to a z/OS queue manager, the short/long index is
+// as setup here. Otherwise we need to swap 0/1 indices.
+func idxDefault(zos bool, val int) int {
+	if zos {
+		return val
+	} else {
+		return (1 - val)
+	}
+}
+
 /*
 Unlike the statistics produced via a topic, there is no discovery
 of the attributes available in object STATUS queries. There is also
@@ -88,6 +98,11 @@ func ChannelInitAttributes() {
 	os := &ci.objectStatus[OT_CHANNEL]
 	st := GetObjectStatus(GetConnectionKey(), OT_CHANNEL)
 
+	zos := false
+	if ci.si.platform == ibmmq.MQPL_ZOS {
+		zos = true
+	}
+
 	if os.init {
 		traceExit("ChannelInitAttributes", 1)
 		return
@@ -143,26 +158,32 @@ func ChannelInitAttributes() {
 	st.Attributes[attr].squash = true
 	os.init = true
 
+	// Some of the short/long status values are the opposite way round on the different platforms!
+	// Really a bug in the PCF code (internal reference 304982), but it's not likely to be fixed because of compatibility.
+	// In most cases, and always on ZOS, the SHORT is first followed by LONG. But the following
+	// attributes are reversed:
+	//   COMPRESSION_RATE, COMPRESSION_TIME, EXIT_TIME: Not reported here anyway
+	//   NETWORK_TIME, XMITQ_TIME, BATCH_SIZE: Reported here
 	attr = ATTR_CHL_NETTIME_SHORT
 	st.Attributes[attr] = newStatusAttribute(attr, "Network Time Short", ibmmq.MQIACH_NETWORK_TIME_INDICATOR)
-	st.Attributes[attr].index = 0
+	st.Attributes[attr].index = idxDefault(zos, 0)
 	attr = ATTR_CHL_NETTIME_LONG
 	st.Attributes[attr] = newStatusAttribute(attr, "Network Time Long", ibmmq.MQIACH_NETWORK_TIME_INDICATOR)
-	st.Attributes[attr].index = 1
+	st.Attributes[attr].index = idxDefault(zos, 1)
 
 	attr = ATTR_CHL_BATCHSZ_SHORT
 	st.Attributes[attr] = newStatusAttribute(attr, "Batch Size Average Short", ibmmq.MQIACH_BATCH_SIZE_INDICATOR)
-	st.Attributes[attr].index = 0
+	st.Attributes[attr].index = idxDefault(zos, 0)
 	attr = ATTR_CHL_BATCHSZ_LONG
-	st.Attributes[attr] = newStatusAttribute(attr, "Batch Size Average Short", ibmmq.MQIACH_BATCH_SIZE_INDICATOR)
-	st.Attributes[attr].index = 1
+	st.Attributes[attr] = newStatusAttribute(attr, "Batch Size Average Long", ibmmq.MQIACH_BATCH_SIZE_INDICATOR)
+	st.Attributes[attr].index = idxDefault(zos, 1)
 
 	attr = ATTR_CHL_XQTIME_SHORT
 	st.Attributes[attr] = newStatusAttribute(attr, "XmitQ Time Average Short", ibmmq.MQIACH_XMITQ_TIME_INDICATOR)
-	st.Attributes[attr].index = 0
+	st.Attributes[attr].index = idxDefault(zos, 0)
 	attr = ATTR_CHL_XQTIME_LONG
-	st.Attributes[attr] = newStatusAttribute(attr, "XmitQ Time Average Short", ibmmq.MQIACH_XMITQ_TIME_INDICATOR)
-	st.Attributes[attr].index = 1
+	st.Attributes[attr] = newStatusAttribute(attr, "XmitQ Time Average Long", ibmmq.MQIACH_XMITQ_TIME_INDICATOR)
+	st.Attributes[attr].index = idxDefault(zos, 1)
 
 	attr = ATTR_CHL_SINCE_MSG
 	st.Attributes[attr] = newStatusAttribute(attr, "Time Since Msg", -1)

mqmetric/cluster.go

@@ -192,9 +192,10 @@ func parseClusterData(cfh *ibmmq.MQCFH, buf []byte) string {
 
 		logTrace("parseClusterData - looking at elem %+v", elem)
 		if !statusGetIntAttributes(GetObjectStatus(GetConnectionKey(), OT_CLUSTER), elem, key) {
+			// There's not actually any additional attributes we care about for now
 			switch elem.Parameter {
-			case ibmmq.MQCA_CLUSTER_NAME:
-				ClusterName = trimToNull(elem.String[0])
+			//case ibmmq.MQCA_CLUSTER_NAME:
+			// ClusterName = trimToNull(elem.String[0])
 			}
 		}
 	}

mqmetric/discover.go

@@ -277,7 +277,7 @@ func RediscoverAttributes(objectType int32, objectPatterns string) error {
 		infoMap = amqpInfoMap
 		fn = inquireAMQPChannelAttributes
 	default:
-		err = fmt.Errorf("Unsupported object type: ", objectType)
+		err = fmt.Errorf("Unsupported object type: %d", objectType)
 	}
 
 	if err == nil {
@@ -302,7 +302,7 @@ func discoverAndSubscribe(dc DiscoverConfig, redo bool) error {
 	ci := getConnection(GetConnectionKey())
 
 	// What metrics can the queue manager provide?
-	if err == nil && redo == false {
+	if err == nil && !redo {
 		err = discoverStats(dc)
 	}
 
@@ -759,7 +759,7 @@ func discoverQueues(monitoredQueuePatterns string) error {
 			// For older levels of MQ, because of the possible complexities of pattern matching, we don't
 			// actually fail the discovery process, but instead issue a warning and continue with
 			// other queues.
-			if strings.Contains(qName, "/") && ci.globalSlashWarning == false && GetCommandLevel() < ibmmq.MQCMDL_LEVEL_930 {
+			if strings.Contains(qName, "/") && ci.globalSlashWarning && GetCommandLevel() < ibmmq.MQCMDL_LEVEL_930 {
 				ci.localSlashWarning = true // First time through, issue the warning for all queues
 				logError("Warning: Cannot subscribe to queue containing '/': %s", qName)
 				continue

mqmetric/log.go

@@ -74,6 +74,7 @@ func logError(format string, v ...interface{}) {
 
 // Panic and Fatal are not going to be used for now but
 // are in here for completeness
+/*
 func logFatal(format string, v ...interface{}) {
 	if logger != nil && logger.Fatal != nil {
 		logger.Fatal(format, v...)
@@ -84,6 +85,7 @@ func logPanic(format string, v ...interface{}) {
 		logger.Panic(format, v...)
 	}
 }
+*/
 
 // Some interfaces to enable tracing. In its simplest form, tracing the
 // entry point just needs the function name. There are often several exit

mqmetric/metrics.txt

@@ -316,4 +316,4 @@ Class: bufferpool/pageset
   ATTR_PS_TOTAL                   : pages_total
   ATTR_PS_UNUSED                  : pages_unused
 
-This page was automatically generated from the source tree on 2024-06-11 06:33:21
+This page was automatically generated from the source tree on 2024-09-13 16:03:23

mqmetric/mqif.go

@@ -25,6 +25,7 @@ don't need to repeat common setups eg of MQMD or MQSD structures.
 */
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/ibm-messaging/mq-golang/v5/ibmmq"
@@ -212,13 +213,13 @@ func initConnectionKey(key string, qMgrName string, replyQ string, replyQ2 strin
 					evEnabled := v[ibmmq.MQIA_PERFORMANCE_EVENT].(int32)
 					if ci.useResetQStats && evEnabled == 0 {
 						errorString = "Requested use of RESET QSTATS but queue manager has PERFMEV(DISABLED)"
-						err = fmt.Errorf(errorString)
+						err = errors.New(errorString)
 					}
 				} else {
-					if cc.UsePublications == true {
+					if cc.UsePublications {
 						if ci.si.commandLevel < 900 && ci.si.platform != ibmmq.MQPL_APPLIANCE {
 							errorString = "Unsupported system: Queue manager must be at least V9.0 for full monitoring. Disable the usePublications attribute for limited capability."
-							err = fmt.Errorf(errorString)
+							err = errors.New(errorString)
 							mqreturn = &ibmmq.MQReturn{MQCC: ibmmq.MQCC_FAILED, MQRC: ibmmq.MQRC_ENVIRONMENT_ERROR}
 						} else {
 							ci.usePublications = cc.UsePublications
@@ -497,7 +498,7 @@ func (mqtd *MQTopicDescriptor) unsubscribe() {
 
 			subObj, err := ci.si.qMgr.Sub(mqsd, &ci.si.replyQObj)
 			if err == nil {
-				err = subObj.Close(ibmmq.MQCO_REMOVE_SUB)
+				subObj.Close(ibmmq.MQCO_REMOVE_SUB)
 			} else {
 				logDebug("Resub failed for %s with %v %+v", topic, err, subObj)
 			}

mqmetric/status.go

@@ -25,14 +25,14 @@ package mqmetric
 */
 
 import (
-	"fmt"
+	// "fmt"
 	"strings"
 	"time"
 
 	ibmmq "github.com/ibm-messaging/mq-golang/v5/ibmmq"
 )
 
-var statusDummy = fmt.Sprintf("dummy")
+// var statusDummy = fmt.Sprintf("dummy")
 var timeTravelWarningIssued = false
 
 /*

staticcheck.conf

@@ -0,0 +1,6 @@
+# Use the default set of options, but explicitly exclude some that I don't like.
+checks = [ "inherit", # Start with the default set
+           "-S1023",  # Redundant return statement (I like the explicitness)
+           "-ST1005", # Error strings should not be capitalized
+           "-S1005",  # Unnecessary assignment to blank identifier (in particular in calls to "range")
+         ]