Add expiry to command requests

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## XXX XX 2025 - v5.6.5 
+- mqmetric - Make command requests (and replies) expire after a while
+
 ## Jun 16 2025 - v5.6.4 
 - Update for MQ 9.4.3
 - mqmetric - Add MQTT metrics

ibmmq/mqiPCFstr.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 )
 
-// This file was created from the source tree on 2025-06-10 08:23:17
+// This file was created from the source tree on 2025-07-30 19:38:32
 
 // This module converts a PCF integer type (from the MQIA* ranges) into
 // the prefix that can then be used to convert its value into a string

ibmmqotel/mqiotel.go

@@ -97,7 +97,7 @@ func init() {
 	os.Setenv("AMQ_OTEL_INSTRUMENTED", "true")
 }
 
-// Go's locks are not concurrently accessible. So we need to add locks. This might not be required for
+// Go's maps are not concurrently accessible. So we need to add locks. This might not be required for
 // all operations, but better to be safe. These are trivial functions, but we might want to add tracing/debug
 // occasionally. So it's better to wrap the real calls.
 func lockMapOptions() {
@@ -143,7 +143,6 @@ func Setup() {
 			GetTraceAfter:  otelGetTraceAfter,
 		}
 		mq.SetOtelFuncs(f)
-
 	}
 
 	logTrace("OTelEnabled: %v", otelEnabled)

mqmetric/discover.go

@@ -885,6 +885,8 @@ func inquireObjectsWithFilter(objectPatternsList string, objectType int32, filte
 		putmqmd.MsgType = ibmmq.MQMT_REQUEST
 		putmqmd.Report = ibmmq.MQRO_PASS_DISCARD_AND_EXPIRY
 
+		putmqmd.Expiry = int32(ci.waitInterval) * EXPIRY_MULTIPLIER
+
 		cfh := ibmmq.NewMQCFH()
 		cfh.Version = ibmmq.MQCFH_VERSION_3
 		cfh.Type = ibmmq.MQCFT_COMMAND_XR

mqmetric/globals.go

@@ -117,6 +117,12 @@ const DUMMY_STRING = "-" // To provide a non-empty value for certain fields
 const DEFAULT_CONNECTION_KEY = "@defaultConnection"
 const DUMMY_PCFATTR = -1 // For metrics that don't have an explicit PCF attribute
 
+// Command messages are put with an expiry so they don't hang around too long. And any remaining
+// responses are also set to expire because of an MQRO setting. We use the WaitInterval as the basis.
+// First multiply by 10 (to get from seconds to the tenths used in MQMD.Expiry), then give more time
+// than the actual waitInterval to allow traval in both directions + processing + a slop factor
+const EXPIRY_MULTIPLIER = 10 * 5
+
 // This are used externally so we need to maintain them as public exports until
 // there's a major version change. At which point we will move them to fields of
 // the objectStatus structure, retrievable by a getXXX() call instead of as public

mqmetric/metrics.txt

@@ -374,4 +374,4 @@ Class: bufferpool/pageset
   ATTR_PS_TOTAL                   : pages_total
   ATTR_PS_UNUSED                  : pages_unused
 
-This page was automatically generated from the source tree on 2025-06-10 08:22:57
+This page was automatically generated from the source tree on 2025-07-30 19:38:07

mqmetric/status.go

@@ -222,6 +222,8 @@ func statusSetCommandHeaders() (*ibmmq.MQMD, *ibmmq.MQPMO, *ibmmq.MQCFH, []byte)
 	putmqmd.MsgType = ibmmq.MQMT_REQUEST
 	putmqmd.Report = ibmmq.MQRO_PASS_DISCARD_AND_EXPIRY
 
+	putmqmd.Expiry = int32(ci.waitInterval) * EXPIRY_MULTIPLIER
+
 	buf := make([]byte, 0)
 
 	traceExit("statusSetCommandHeaders", 0)