Fixes for #222

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## May 08 2025 - v5.6.2.1
+- mqmetric - Fixes for #222 and ibm-messaging/mq-metric-samples#395
+
 ## Feb 28 2025 - v5.6.2 
 - Update for MQ 9.4.2
 - ibmmq - Add function to map PCF attribute values to strings

mqmetric/discover.go

@@ -1070,7 +1070,9 @@ func createSubscriptions() error {
 					// Don't have a qmgr-level subscription to this topic. Should
 					// only do this subscription once at startup
 					mqtd, err = subscribe(ty.ObjectTopic, &ci.si.replyQObj)
-					ty.subHobj[QMgrMapKey] = mqtd
+					if err == nil {
+						ty.subHobj[QMgrMapKey] = mqtd
+					}
 				}
 			}
 

mqmetric/mqif.go

@@ -211,16 +211,14 @@ func initConnectionKey(key string, qMgrName string, replyQ string, replyQ2 strin
 				ibmmq.MQIA_COMMAND_LEVEL,
 				ibmmq.MQIA_PERFORMANCE_EVENT,
 				ibmmq.MQIA_MAX_HANDLES,
-				ibmmq.MQIA_PLATFORM,
-				ibmmq.MQCA_VERSION}
+				ibmmq.MQIA_PLATFORM}
 
 			v, err = ci.si.qMgrObject.Inq(selectors)
 			if err == nil {
 				ci.si.resolvedQMgrName = v[ibmmq.MQCA_Q_MGR_NAME].(string)
 				ci.si.platform = v[ibmmq.MQIA_PLATFORM].(int32)
 				ci.si.commandLevel = v[ibmmq.MQIA_COMMAND_LEVEL].(int32)
 				ci.si.maxHandles = v[ibmmq.MQIA_MAX_HANDLES].(int32)
-				ci.si.version = v[ibmmq.MQCA_VERSION].(string)
 
 				if ci.si.platform == ibmmq.MQPL_ZOS {
 					ci.usePublications = false
@@ -243,6 +241,9 @@ func initConnectionKey(key string, qMgrName string, replyQ string, replyQ2 strin
 						ci.usePublications = false
 					}
 				}
+			} else {
+				errorString = "Cannot inquire on queue manager object"
+				mqreturn = err.(*ibmmq.MQReturn)
 			}
 		} else {
 			errorString = "Cannot open queue manager object"
@@ -315,7 +316,10 @@ func initConnectionKey(key string, qMgrName string, replyQ string, replyQ2 strin
 
 	if err != nil {
 		if mqreturn == nil {
-			mqreturn = &ibmmq.MQReturn{MQCC: ibmmq.MQCC_WARNING, MQRC: ibmmq.MQRC_ENVIRONMENT_ERROR}
+			mqreturn = &ibmmq.MQReturn{MQCC: ibmmq.MQCC_FAILED, MQRC: ibmmq.MQRC_ENVIRONMENT_ERROR}
+		}
+		if errorString == "" {
+			errorString = err.Error()
 		}
 		traceExitErr("initConnectionKey", 1, mqreturn)
 		return MQMetricError{Err: errorString, MQReturn: mqreturn}
@@ -498,7 +502,7 @@ func subscribeWithOptions(topic string, pubQObj *ibmmq.MQObject, managed bool, d
 
 		e2 := fmt.Errorf("Error subscribing to topic '%s': %v %s", topic, err, extraInfo)
 		traceExitErr("subscribeWithOptions", 1, e2)
-		return mqtd, e2
+		return nil, e2
 	}
 
 	mqtd.hObj = hObj