* Pull in latest mq-golang package

* Update DEPRECATIONS file

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## Nov 12 2025 - v5.6.7
+* Pull in latest mq-golang package
+* Add DEPRECATIONS file
+
 ### Nov 03 2025 (v5.6.6)
 * Pull in fix for #440
 

DEPRECATIONS.md

@@ -1,11 +1,23 @@
 # Deprecration Notices
 
-## 2025-11-05
-* I expect that at the next full update of this repo (probably to coincide with the next MQ LTS release), 
-some of the lesser-used collectors will be removed: aws, influx, opentsdb being most likely.
+This file lists features that are being considered for removal or for a breaking configuration change in the
+`mq-metric-samples` repository.
+
+## Nov 2025
+
+Note that these deprecated features will prompt a major version change in this repository. That will mean it no
+longer has the same version number as the underlying `mq-golang` packages.
+
+The update of this repo where these take effect will probably coincide with the next MQ LTS release.
+
+* Some of the lesser-used collectors will be removed: aws, influx, opentsdb being most likely.
   * The growing use of OpenTelemetry means that format/protocol can be used in many scenarios where you might
     previously have needed a specific client.
 
-* I also expect to change the Prometheus collector's default value of the `overrideCType` attribute at the
-same time, to more accurately reflect the different between Counters and Gauges. That may mean reworking
-some of your dashboards.
+* The Prometheus collector's default value of the `overrideCType` attribute will change to `true`, to
+  more accurately reflect the difference between Counters and Gauges. That may mean reworking some of your dashboards.
+
+* The `useObjectStatus` configuration attribute will be removed and will effectively be permanently enabled because a
+  number of other capabilities essentially require it to be active. Instead, configuration of the monitored objects
+  (channels, topics etc) can be independently controlled if you wish to reduce the number of `DIS xxSTATUS` commands
+  issued.

TUNING.md

@@ -95,15 +95,16 @@ The `global.pollInterval` and `global.rediscoverInterval` options may help to fu
 
 The first of these controls how frequently the `DISPLAY xxSTATUS` commands are used, assuming the
 `global.useObjectStatus` is `true`. In some circumstances, you might not want all of the responses as regularly as the
-published metrics are handled.
+published metrics are handled. The queue and queue manager status is always collected during this phase regardless of
+the `global.useObjectStatus` setting.
 
 The second attribute controls how frequently the collector reassesses the list of objects to be monitored, and their
 more stable attributes. For example, the `DESCRIPTION` or `MAXDEPTH` settings on a queue. If you have a large number of
 queues that do not change frequently, then you might want to increase the rediscovery attribute. The default is 1 hour.
 The tradeoff here is that newly-defined queues may not have any metrics reported until this interval expires.
 
 The messages created by the queue manager ought to be non-persistent. There is no real value in preserving them across a
-restart. Check that the model queues, or explicitly-configured reply queues, have `DEFPSIST(NO)`.
+restart. Check that the configured reply queues, whether model or local queues, have `DEFPSIST(NO)`.
 
 ## Dividing the workload
 One further approach that you might like to consider, though I wouldn't usually recommend it, is to have two or more

amqsevtg/go.mod

@@ -5,7 +5,7 @@ go 1.23.0
 toolchain go1.24.1
 
 require (
-	github.com/ibm-messaging/mq-golang/v5 v5.6.6
+	github.com/ibm-messaging/mq-golang/v5 v5.6.7
 	go.opentelemetry.io/contrib/bridges/otelslog v0.8.0
 	go.opentelemetry.io/otel v1.33.0
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.9.0

amqsevtg/go.sum

@@ -15,8 +15,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI=
-github.com/ibm-messaging/mq-golang/v5 v5.6.6 h1:FoDXqyztZiBOkBR376QjTK/CAHYiYLYYgzALDa1jpNs=
-github.com/ibm-messaging/mq-golang/v5 v5.6.6/go.mod h1:xCV0vl1+ik3VyWZnwAj++2J89vSTzhXP1gXhG0X3IYE=
+github.com/ibm-messaging/mq-golang/v5 v5.6.7 h1:W3znJiUb9WlzgH8/RuD8SXKmRuJz8RXc3nTEDsCrN0E=
+github.com/ibm-messaging/mq-golang/v5 v5.6.7/go.mod h1:xCV0vl1+ik3VyWZnwAj++2J89vSTzhXP1gXhG0X3IYE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

cmd/mq_aws/exporter.go

@@ -122,8 +122,28 @@ func Collect() error {
 
 	pollError := err
 	if pollStatus {
-		if config.cf.CC.UseStatus {
-			err := mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
+
+		// Always collect the queue and qmgr status info regardless of the UseStatus flag, so that we keep
+		// the known attribute values for tagging.
+		if err == nil {
+			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
+			if err != nil {
+				log.Errorf("Error collecting queue status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue status")
+			}
+			err = mqmetric.CollectQueueManagerStatus()
+			if err != nil {
+				log.Errorf("Error collecting queue manager status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue manager status")
+			}
+		}
+
+		if config.cf.CC.UseStatus && err == nil {
+			err = mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
 			if err != nil {
 				log.Errorf("Error collecting channel status: %v", err)
 				pollError = err
@@ -147,14 +167,6 @@ func Collect() error {
 				log.Debugf("Collected all subscription status")
 			}
 
-			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
-			if err != nil {
-				log.Errorf("Error collecting queue status: %v", err)
-				pollError = err
-			} else {
-				log.Debugf("Collected all queue status")
-			}
-
 			err = mqmetric.CollectClusterStatus()
 			if err != nil {
 				log.Errorf("Error collecting cluster status: %v", err)
@@ -163,14 +175,6 @@ func Collect() error {
 				log.Debugf("Collected all cluster status")
 			}
 
-			err = mqmetric.CollectQueueManagerStatus()
-			if err != nil {
-				log.Errorf("Error collecting queue manager status: %v", err)
-				pollError = err
-			} else {
-				log.Debugf("Collected all queue manager status")
-			}
-
 			if mqmetric.GetPlatform() == ibmmq.MQPL_ZOS {
 				err = mqmetric.CollectUsageStatus()
 				if err != nil {

cmd/mq_coll/exporter.go

@@ -90,14 +90,28 @@ func Collect() error {
 	// status, then do that collection too
 	pollError := err
 	if pollStatus {
-		if config.cf.CC.UseStatus {
+
+		// Always collect the queue and qmgr status info regardless of the UseStatus flag, so that we keep
+		// the known attribute values for tagging.
+		if err == nil {
+			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
+			if err != nil {
+				log.Errorf("Error collecting queue status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue status")
+			}
 			err = mqmetric.CollectQueueManagerStatus()
 			if err != nil {
 				log.Errorf("Error collecting queue manager status: %v", err)
 				pollError = err
 			} else {
 				log.Debugf("Collected all queue manager status")
 			}
+		}
+
+		if config.cf.CC.UseStatus && err == nil {
+
 			err = mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
 			if err != nil {
 				log.Errorf("Error collecting channel status: %v", err)
@@ -127,14 +141,6 @@ func Collect() error {
 				log.Debugf("Collected all cluster status")
 			}
 
-			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
-			if err != nil {
-				log.Errorf("Error collecting queue status: %v", err)
-				pollError = err
-			} else {
-				log.Debugf("Collected all queue status")
-			}
-
 			if mqmetric.GetPlatform() == ibmmq.MQPL_ZOS {
 				err = mqmetric.CollectUsageStatus()
 				if err != nil {

cmd/mq_influx/exporter.go

@@ -101,7 +101,26 @@ func Collect(c client.Client) error {
 	pollError := err
 
 	if pollStatus {
-		if config.cf.CC.UseStatus {
+		// Always collect the queue and qmgr status info regardless of the UseStatus flag, so that we keep
+		// the known attribute values for tagging.
+		if err == nil {
+			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
+			if err != nil {
+				log.Errorf("Error collecting queue status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue status")
+			}
+			err = mqmetric.CollectQueueManagerStatus()
+			if err != nil {
+				log.Errorf("Error collecting queue manager status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue manager status")
+			}
+		}
+
+		if config.cf.CC.UseStatus && err == nil {
 			err = mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
 			if err != nil {
 				log.Errorf("Error collecting channel status: %v", err)
@@ -124,14 +143,6 @@ func Collect(c client.Client) error {
 				log.Debugf("Collected all subscription status")
 			}
 
-			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
-			if err != nil {
-				log.Errorf("Error collecting queue status: %v", err)
-				pollError = err
-			} else {
-				log.Debugf("Collected all queue status")
-			}
-
 			err = mqmetric.CollectClusterStatus()
 			if err != nil {
 				log.Errorf("Error collecting cluster status: %v", err)
@@ -170,13 +181,6 @@ func Collect(c client.Client) error {
 				}
 			}
 
-			err = mqmetric.CollectQueueManagerStatus()
-			if err != nil {
-				log.Errorf("Error collecting queue manager status: %v", err)
-				pollError = err
-			} else {
-				log.Debugf("Collected all queue manager status")
-			}
 			err = pollError
 		}
 

cmd/mq_json/exporter.go

@@ -110,14 +110,28 @@ func Collect() error {
 	pollError := err
 
 	if pollStatus {
-		if config.cf.CC.UseStatus {
-			err := mqmetric.CollectQueueManagerStatus()
+
+		// Always collect the queue and qmgr status info regardless of the UseStatus flag, so that we keep
+		// the known attribute values for tagging.
+		if err == nil {
+			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
+			if err != nil {
+				log.Errorf("Error collecting queue status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue status")
+			}
+			err = mqmetric.CollectQueueManagerStatus()
 			if err != nil {
 				log.Errorf("Error collecting queue manager status: %v", err)
 				pollError = err
 			} else {
 				log.Debugf("Collected all queue manager status")
 			}
+		}
+
+		if config.cf.CC.UseStatus && err == nil {
+
 			err = mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
 			if err != nil {
 				log.Errorf("Error collecting channel status: %v", err)
@@ -140,14 +154,6 @@ func Collect() error {
 				log.Debugf("Collected all subscription status")
 			}
 
-			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
-			if err != nil {
-				log.Errorf("Error collecting queue status: %v", err)
-				pollError = err
-			} else {
-				log.Debugf("Collected all queue status")
-			}
-
 			err = mqmetric.CollectClusterStatus()
 			if err != nil {
 				log.Errorf("Error collecting cluster status: %v", err)

cmd/mq_opentsdb/exporter.go

@@ -109,8 +109,27 @@ func Collect() error {
 
 	pollError := err
 	if pollStatus {
+		// Always collect the queue and qmgr status info regardless of the UseStatus flag, so that we keep
+		// the known attribute values for tagging.
+		if err == nil {
+			err = mqmetric.CollectQueueStatus(config.cf.MonitoredQueues)
+			if err != nil {
+				log.Errorf("Error collecting queue status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue status")
+			}
+			err = mqmetric.CollectQueueManagerStatus()
+			if err != nil {
+				log.Errorf("Error collecting queue manager status: %v", err)
+				pollError = err
+			} else {
+				log.Debugf("Collected all queue manager status")
+			}
+		}
+
 		if config.cf.CC.UseStatus {
-			err := mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
+			err = mqmetric.CollectChannelStatus(config.cf.MonitoredChannels)
 			if err != nil {
 				log.Errorf("Error collecting channel status: %v", err)
 				pollError = err