Update for MQ 9.2.2

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## Mar 25 2021 - v5.2.0 
+Scope of mqmetric changes seem to justify new minor number
+* Update for MQ 9.2.2
+* Add DltMH calls to clarify samples
+* mqmetric - Restructure to allow multiple connections & reduce public interfaces
+* mqmetric - Deal with discovery of large numbers of queues (#133, #161)
+* ibmmq - Add PutDateTime as time.Time field in MQMD, MQDLH. Use of the string forms should be considered deprecated (inspired by #159)
+* Add a DEPRECATIONS file for when advance notice might be needed
+
 ## Dec 04 2020 - v5.1.3
 * Update for MQ 9.2.1
 

DEPRECATIONS.md

@@ -3,16 +3,19 @@ This file lists any deprecated function in the `mq-golang` repository.
 
 Current API version for the `ibmmq` and `mqmetric` packages is **v5**.
 
-Removal of function will only happen with a major version
-change.
+Removal of function will only happen with a major version change.
 
 **Note:** There is no date currently planned for a new major release.
 
 ## In next major version
 The following interfaces are planned to be removed:
+
 #### Package ibmmq
 * PutDate and PutTime fields in the MQMD and MQDLH structures
   * Replacement is the single PutDateTime time.Time type
+  * The replacement APIs is already available in the v5 stream.
+* InqMap - was a temporary route to replace original Inq function
+  * Replacement is the current Inq function
 
 #### Package mqmetric
 * Remove direct access to xxxStatus variables.

Dockerfile

@@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     curl \
     tar \
     bash \
-    go-dep \
     build-essential \
   && rm -rf /var/lib/apt/lists/*
 
@@ -59,7 +58,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
 # Location of the downloadable MQ client package \
 ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
     RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
-    VRMF=9.2.1.0
+    VRMF=9.2.2.0
 
 # Install the MQ client from the Redistributable package. This also contains the
 # header files we need to compile against. Setup the subset of the package

README.md

@@ -12,10 +12,15 @@ is not available before MQ V9. A limited set of metrics can be monitored for MQ
 
 ## Health Warning
 
-This package is provided as-is with no guarantees of support or updates. There are
-also no guarantees of compatibility with any future versions of the package; the API
+This package is provided as-is with no guarantees of support or updates. You cannot use
+IBM formal support channels (Cases/PMRs) for assistance with material in this repository.
+
+There are also no guarantees of compatibility with any future versions of the package; the API
 is subject to change based on any feedback. Versioned releases are made in this repository
-to assist with using stable APIs.
+to assist with using stable APIs. Future versions will follow semver guidance so that breaking changes
+will only be done with a new major version number on the module.
+
+See the [DEPRECATIONS](DEPRECATIONS.md) file for any planned changes to the API.
 
 ## MQI Description
 
@@ -233,4 +238,4 @@ in the CLA.
 
 ## Copyright
 
-© Copyright IBM Corporation 2016, 2020
+© Copyright IBM Corporation 2016, 2021

ibmmq/cmqc_aix.go

@@ -16,7 +16,7 @@ package ibmmq
 * for each value; those can be found in other header files such as
 * cmqc.h.
 ****************************************************************
-* Copyright (c) IBM Corporation 1993, 2020
+* Copyright (c) IBM Corporation 1993, 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/12/20 5:27 PM
-*   Build Level:   p921-L201112.1
+*   Generated on:  3/5/21 5:00 PM
+*   Build Level:   p922-L210305.1
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -343,13 +343,14 @@ const (
 	MQCACF_LAST_PUB_TIME           int32  = 3162
 	MQCACF_LAST_PUT_DATE           int32  = 3128
 	MQCACF_LAST_PUT_TIME           int32  = 3129
-	MQCACF_LAST_USED               int32  = 3210
+	MQCACF_LAST_USED               int32  = 3211
 	MQCACF_LOCAL_Q_NAMES           int32  = 3015
 	MQCACF_LOG_PATH                int32  = 3074
 	MQCACF_MEDIA_LOG_EXTENT_NAME   int32  = 3073
 	MQCACF_MODEL_Q_NAMES           int32  = 3016
 	MQCACF_MQCB_NAME               int32  = 3192
 	MQCACF_NAMELIST_NAMES          int32  = 3013
+	MQCACF_NHA_INSTANCE_NAME       int32  = 3211
 	MQCACF_NONE                    int32  = 3171
 	MQCACF_OBJECT_NAME             int32  = 3046
 	MQCACF_OBJECT_Q_MGR_NAME       int32  = 3023
@@ -1004,7 +1005,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 921
+	MQCMDL_CURRENT_LEVEL           int32  = 922
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1047,6 +1048,7 @@ const (
 	MQCMDL_LEVEL_915               int32  = 915
 	MQCMDL_LEVEL_920               int32  = 920
 	MQCMDL_LEVEL_921               int32  = 921
+	MQCMDL_LEVEL_922               int32  = 922
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -4204,6 +4206,7 @@ const (
 	MQRQ_OPEN_NOT_AUTHORIZED       int32  = 2
 	MQRQ_Q_MGR_QUIESCING           int32  = 6
 	MQRQ_Q_MGR_STOPPING            int32  = 5
+	MQRQ_REPLICA_ACTIVATED         int32  = 33
 	MQRQ_SSL_CIPHER_SPEC_ERROR     int32  = 14
 	MQRQ_SSL_CLIENT_AUTH_ERROR     int32  = 15
 	MQRQ_SSL_HANDSHAKE_ERROR       int32  = 13
@@ -4937,6 +4940,7 @@ const (
 	MQ_MSG_TOKEN_LENGTH            int32  = 16
 	MQ_NAMELIST_DESC_LENGTH        int32  = 64
 	MQ_NAMELIST_NAME_LENGTH        int32  = 48
+	MQ_NHA_INSTANCE_NAME_LENGTH    int32  = 48
 	MQ_OBJECT_INSTANCE_ID_LENGTH   int32  = 24
 	MQ_OBJECT_NAME_LENGTH          int32  = 48
 	MQ_OPERATOR_MESSAGE_LENGTH     int32  = 4

ibmmq/cmqc_darwin.go

@@ -14,7 +14,7 @@ package ibmmq
 * for each value; those can be found in other header files such as
 * cmqc.h.
 ****************************************************************
-* Copyright (c) IBM Corporation 1993, 2020
+* Copyright (c) IBM Corporation 1993, 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/12/20 5:27 PM
-*   Build Level:   p921-L201112.1
+*   Generated on:  3/5/21 5:00 PM
+*   Build Level:   p922-L210305.1
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -341,13 +341,14 @@ const (
 	MQCACF_LAST_PUB_TIME           int32  = 3162
 	MQCACF_LAST_PUT_DATE           int32  = 3128
 	MQCACF_LAST_PUT_TIME           int32  = 3129
-	MQCACF_LAST_USED               int32  = 3210
+	MQCACF_LAST_USED               int32  = 3211
 	MQCACF_LOCAL_Q_NAMES           int32  = 3015
 	MQCACF_LOG_PATH                int32  = 3074
 	MQCACF_MEDIA_LOG_EXTENT_NAME   int32  = 3073
 	MQCACF_MODEL_Q_NAMES           int32  = 3016
 	MQCACF_MQCB_NAME               int32  = 3192
 	MQCACF_NAMELIST_NAMES          int32  = 3013
+	MQCACF_NHA_INSTANCE_NAME       int32  = 3211
 	MQCACF_NONE                    int32  = 3171
 	MQCACF_OBJECT_NAME             int32  = 3046
 	MQCACF_OBJECT_Q_MGR_NAME       int32  = 3023
@@ -1002,7 +1003,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 921
+	MQCMDL_CURRENT_LEVEL           int32  = 922
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1045,6 +1046,7 @@ const (
 	MQCMDL_LEVEL_915               int32  = 915
 	MQCMDL_LEVEL_920               int32  = 920
 	MQCMDL_LEVEL_921               int32  = 921
+	MQCMDL_LEVEL_922               int32  = 922
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -4202,6 +4204,7 @@ const (
 	MQRQ_OPEN_NOT_AUTHORIZED       int32  = 2
 	MQRQ_Q_MGR_QUIESCING           int32  = 6
 	MQRQ_Q_MGR_STOPPING            int32  = 5
+	MQRQ_REPLICA_ACTIVATED         int32  = 33
 	MQRQ_SSL_CIPHER_SPEC_ERROR     int32  = 14
 	MQRQ_SSL_CLIENT_AUTH_ERROR     int32  = 15
 	MQRQ_SSL_HANDSHAKE_ERROR       int32  = 13
@@ -4935,6 +4938,7 @@ const (
 	MQ_MSG_TOKEN_LENGTH            int32  = 16
 	MQ_NAMELIST_DESC_LENGTH        int32  = 64
 	MQ_NAMELIST_NAME_LENGTH        int32  = 48
+	MQ_NHA_INSTANCE_NAME_LENGTH    int32  = 48
 	MQ_OBJECT_INSTANCE_ID_LENGTH   int32  = 24
 	MQ_OBJECT_NAME_LENGTH          int32  = 48
 	MQ_OPERATOR_MESSAGE_LENGTH     int32  = 4

ibmmq/cmqc_linux_amd64.go

@@ -14,7 +14,7 @@ package ibmmq
 * for each value; those can be found in other header files such as
 * cmqc.h.
 ****************************************************************
-* Copyright (c) IBM Corporation 1993, 2020
+* Copyright (c) IBM Corporation 1993, 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/12/20 5:27 PM
-*   Build Level:   p921-L201112.1
+*   Generated on:  3/5/21 5:00 PM
+*   Build Level:   p922-L210305.1
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -341,13 +341,14 @@ const (
 	MQCACF_LAST_PUB_TIME           int32  = 3162
 	MQCACF_LAST_PUT_DATE           int32  = 3128
 	MQCACF_LAST_PUT_TIME           int32  = 3129
-	MQCACF_LAST_USED               int32  = 3210
+	MQCACF_LAST_USED               int32  = 3211
 	MQCACF_LOCAL_Q_NAMES           int32  = 3015
 	MQCACF_LOG_PATH                int32  = 3074
 	MQCACF_MEDIA_LOG_EXTENT_NAME   int32  = 3073
 	MQCACF_MODEL_Q_NAMES           int32  = 3016
 	MQCACF_MQCB_NAME               int32  = 3192
 	MQCACF_NAMELIST_NAMES          int32  = 3013
+	MQCACF_NHA_INSTANCE_NAME       int32  = 3211
 	MQCACF_NONE                    int32  = 3171
 	MQCACF_OBJECT_NAME             int32  = 3046
 	MQCACF_OBJECT_Q_MGR_NAME       int32  = 3023
@@ -1002,7 +1003,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 921
+	MQCMDL_CURRENT_LEVEL           int32  = 922
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1045,6 +1046,7 @@ const (
 	MQCMDL_LEVEL_915               int32  = 915
 	MQCMDL_LEVEL_920               int32  = 920
 	MQCMDL_LEVEL_921               int32  = 921
+	MQCMDL_LEVEL_922               int32  = 922
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -4202,6 +4204,7 @@ const (
 	MQRQ_OPEN_NOT_AUTHORIZED       int32  = 2
 	MQRQ_Q_MGR_QUIESCING           int32  = 6
 	MQRQ_Q_MGR_STOPPING            int32  = 5
+	MQRQ_REPLICA_ACTIVATED         int32  = 33
 	MQRQ_SSL_CIPHER_SPEC_ERROR     int32  = 14
 	MQRQ_SSL_CLIENT_AUTH_ERROR     int32  = 15
 	MQRQ_SSL_HANDSHAKE_ERROR       int32  = 13
@@ -4935,6 +4938,7 @@ const (
 	MQ_MSG_TOKEN_LENGTH            int32  = 16
 	MQ_NAMELIST_DESC_LENGTH        int32  = 64
 	MQ_NAMELIST_NAME_LENGTH        int32  = 48
+	MQ_NHA_INSTANCE_NAME_LENGTH    int32  = 48
 	MQ_OBJECT_INSTANCE_ID_LENGTH   int32  = 24
 	MQ_OBJECT_NAME_LENGTH          int32  = 48
 	MQ_OPERATOR_MESSAGE_LENGTH     int32  = 4

ibmmq/cmqc_linux_ppc64le.go

@@ -14,7 +14,7 @@ package ibmmq
 * for each value; those can be found in other header files such as
 * cmqc.h.
 ****************************************************************
-* Copyright (c) IBM Corporation 1993, 2020
+* Copyright (c) IBM Corporation 1993, 2021
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  11/12/20 5:27 PM
-*   Build Level:   p921-L201112.1
+*   Generated on:  3/5/21 5:00 PM
+*   Build Level:   p922-L210305.1
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -341,13 +341,14 @@ const (
 	MQCACF_LAST_PUB_TIME           int32  = 3162
 	MQCACF_LAST_PUT_DATE           int32  = 3128
 	MQCACF_LAST_PUT_TIME           int32  = 3129
-	MQCACF_LAST_USED               int32  = 3210
+	MQCACF_LAST_USED               int32  = 3211
 	MQCACF_LOCAL_Q_NAMES           int32  = 3015
 	MQCACF_LOG_PATH                int32  = 3074
 	MQCACF_MEDIA_LOG_EXTENT_NAME   int32  = 3073
 	MQCACF_MODEL_Q_NAMES           int32  = 3016
 	MQCACF_MQCB_NAME               int32  = 3192
 	MQCACF_NAMELIST_NAMES          int32  = 3013
+	MQCACF_NHA_INSTANCE_NAME       int32  = 3211
 	MQCACF_NONE                    int32  = 3171
 	MQCACF_OBJECT_NAME             int32  = 3046
 	MQCACF_OBJECT_Q_MGR_NAME       int32  = 3023
@@ -1002,7 +1003,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 921
+	MQCMDL_CURRENT_LEVEL           int32  = 922
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1045,6 +1046,7 @@ const (
 	MQCMDL_LEVEL_915               int32  = 915
 	MQCMDL_LEVEL_920               int32  = 920
 	MQCMDL_LEVEL_921               int32  = 921
+	MQCMDL_LEVEL_922               int32  = 922
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
@@ -4202,6 +4204,7 @@ const (
 	MQRQ_OPEN_NOT_AUTHORIZED       int32  = 2
 	MQRQ_Q_MGR_QUIESCING           int32  = 6
 	MQRQ_Q_MGR_STOPPING            int32  = 5
+	MQRQ_REPLICA_ACTIVATED         int32  = 33
 	MQRQ_SSL_CIPHER_SPEC_ERROR     int32  = 14
 	MQRQ_SSL_CLIENT_AUTH_ERROR     int32  = 15
 	MQRQ_SSL_HANDSHAKE_ERROR       int32  = 13
@@ -4935,6 +4938,7 @@ const (
 	MQ_MSG_TOKEN_LENGTH            int32  = 16
 	MQ_NAMELIST_DESC_LENGTH        int32  = 64
 	MQ_NAMELIST_NAME_LENGTH        int32  = 48
+	MQ_NHA_INSTANCE_NAME_LENGTH    int32  = 48
 	MQ_OBJECT_INSTANCE_ID_LENGTH   int32  = 24
 	MQ_OBJECT_NAME_LENGTH          int32  = 48
 	MQ_OPERATOR_MESSAGE_LENGTH     int32  = 4