Skip to content

Commit bf021ed

Browse files
ibmmqmetibmmqmet
authored
Merge pull request #184 from ibm-messaging/924
Updates for MQ 9.2.4
2 parents f4870e6 + 55acd35 commit bf021ed

16 files changed

+378
-74
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22
Newest updates are at the top of this file.
33

4+
## Nov 19 2021 - v5.2.3
5+
* Update for MQ 9.2.4
6+
* ibmmq - Support for MQBNO (application balancing) structure
7+
* mqmetric - Ensure DESCR fields are valid UTF8
8+
* mqmetric - Deal with discovery of large numbers of queues on z/OS (ibm-messaging/mq-metric-samples#75)
9+
* samples - Add alternative Dockerfile based on Red Hat UBI images
10+
411
## Aug 04 2021 - v5.2.2
512
* mqmetric - Add 'uncommitted messages' to queue status response
613
* mqmetric - Add qmgr_status metric so that Prometheus collector can report it even when qmgr is unavailable

‎DEPRECATIONS.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
This file lists any deprecated function in the `mq-golang` repository.
33

44
Current API version for the `ibmmq` and `mqmetric` packages is **v5**.
5-
6-
Removal of function will only happen with a major version change.
5+
Removal of function will only happen on a major version change.
76

87
**Note:** There is no date currently planned for a new major release.
98

@@ -12,7 +11,7 @@ The following interfaces are planned to be removed:
1211

1312
#### Package ibmmq
1413
* PutDate and PutTime fields in the MQMD and MQDLH structures
15-
* Replacement is the single PutDateTime time.Time type
14+
* Replacement is the single `PutDateTime` `time.Time` type
1615
* The replacement APIs is already available in the v5 stream.
1716
* InqMap - was a temporary route to replace original Inq function
1817
* Replacement is the current Inq function
@@ -21,7 +20,8 @@ The following interfaces are planned to be removed:
2120
* Remove direct access to xxxStatus variables.
2221
* Use GetObjectStatus() instead
2322

24-
The replacement APIs are already available in the v5 stream.
23+
The recommended APIs are already available in the v5 stream to help
24+
with future migration.
2525

2626
## Previous deprecations
2727
None so far.

‎ibmmq/cmqc_aix.go‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ package ibmmq
3232
****************************************************************
3333
*
3434
* <BEGIN_BUILDINFO>
35-
* Generated on: 7/8/21 3:14 PM
36-
* Build Level: p923-L210708
35+
* Generated on: 11/4/21 3:44 PM
36+
* Build Level: p924-L211104
3737
* Build Type: Production
3838
* <END_BUILDINFO>
3939
*/
@@ -201,8 +201,9 @@ const (
201201
MQBACF_FIRST int32 = 7001
202202
MQBACF_GENERIC_CONNECTION_ID int32 = 7007
203203
MQBACF_GROUP_ID int32 = 7012
204-
MQBACF_LAST_USED int32 = 7038
204+
MQBACF_LAST_USED int32 = 7039
205205
MQBACF_MESSAGE_DATA int32 = 7020
206+
MQBACF_MQBNO_STRUCT int32 = 7039
206207
MQBACF_MQBO_STRUCT int32 = 7021
207208
MQBACF_MQCBC_STRUCT int32 = 7023
208209
MQBACF_MQCBD_STRUCT int32 = 7024
@@ -247,6 +248,18 @@ const (
247248
MQBND_BIND_NOT_FIXED int32 = 1
248249
MQBND_BIND_ON_GROUP int32 = 2
249250
MQBND_BIND_ON_OPEN int32 = 0
251+
MQBNO_BALTYPE_RA_MANAGED int32 = 65536
252+
MQBNO_BALTYPE_REQREP int32 = 1
253+
MQBNO_BALTYPE_SIMPLE int32 = 0
254+
MQBNO_CURRENT_LENGTH int32 = 20
255+
MQBNO_CURRENT_VERSION int32 = 1
256+
MQBNO_LENGTH_1 int32 = 20
257+
MQBNO_OPTIONS_IGNORE_TRANS int32 = 1
258+
MQBNO_OPTIONS_NONE int32 = 0
259+
MQBNO_TIMEOUT_AS_DEFAULT int32 = -1
260+
MQBNO_TIMEOUT_IMMEDIATE int32 = 0
261+
MQBNO_TIMEOUT_NEVER int32 = -2
262+
MQBNO_VERSION_1 int32 = 1
250263
MQBO_CURRENT_LENGTH int32 = 12
251264
MQBO_CURRENT_VERSION int32 = 1
252265
MQBO_LENGTH_1 int32 = 12
@@ -1008,7 +1021,7 @@ const (
10081021
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
10091022
MQCMDI_SEC_TIMER_ZERO int32 = 14
10101023
MQCMDI_SEC_UPPERCASE int32 = 21
1011-
MQCMDL_CURRENT_LEVEL int32 = 923
1024+
MQCMDL_CURRENT_LEVEL int32 = 924
10121025
MQCMDL_LEVEL_1 int32 = 100
10131026
MQCMDL_LEVEL_101 int32 = 101
10141027
MQCMDL_LEVEL_110 int32 = 110
@@ -1053,6 +1066,7 @@ const (
10531066
MQCMDL_LEVEL_921 int32 = 921
10541067
MQCMDL_LEVEL_922 int32 = 922
10551068
MQCMDL_LEVEL_923 int32 = 923
1069+
MQCMDL_LEVEL_924 int32 = 924
10561070
MQCMD_ACCOUNTING_MQI int32 = 167
10571071
MQCMD_ACCOUNTING_Q int32 = 168
10581072
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1266,8 +1280,8 @@ const (
12661280
MQCNO_ALL_CONVS_SHARE int32 = 262144
12671281
MQCNO_CD_FOR_OUTPUT_ONLY int32 = 524288
12681282
MQCNO_CLIENT_BINDING int32 = 2048
1269-
MQCNO_CURRENT_LENGTH int32 = 256
1270-
MQCNO_CURRENT_VERSION int32 = 7
1283+
MQCNO_CURRENT_LENGTH int32 = 272
1284+
MQCNO_CURRENT_VERSION int32 = 8
12711285
MQCNO_FASTPATH_BINDING int32 = 1
12721286
MQCNO_GENERATE_CONN_TAG int32 = 2097152
12731287
MQCNO_HANDLE_SHARE_BLOCK int32 = 64
@@ -1281,6 +1295,7 @@ const (
12811295
MQCNO_LENGTH_5 int32 = 200
12821296
MQCNO_LENGTH_6 int32 = 224
12831297
MQCNO_LENGTH_7 int32 = 256
1298+
MQCNO_LENGTH_8 int32 = 272
12841299
MQCNO_LOCAL_BINDING int32 = 1024
12851300
MQCNO_NONE int32 = 0
12861301
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1302,6 +1317,7 @@ const (
13021317
MQCNO_VERSION_5 int32 = 5
13031318
MQCNO_VERSION_6 int32 = 6
13041319
MQCNO_VERSION_7 int32 = 7
1320+
MQCNO_VERSION_8 int32 = 8
13051321
MQCODL_AS_INPUT int32 = -1
13061322
MQCOMPRESS_ANY int32 = 268435455
13071323
MQCOMPRESS_NONE int32 = 0
@@ -1719,6 +1735,9 @@ const (
17191735
MQIACF_AUX_ERROR_DATA_INT_2 int32 = 1071
17201736
MQIACF_BACKOUT_COUNT int32 = 1241
17211737
MQIACF_BALANCED int32 = 1433
1738+
MQIACF_BALANCING_OPTIONS int32 = 1440
1739+
MQIACF_BALANCING_TIMEOUT int32 = 1441
1740+
MQIACF_BALANCING_TYPE int32 = 1439
17221741
MQIACF_BALSTATE int32 = 1434
17231742
MQIACF_BRIDGE_TYPE int32 = 1073
17241743
MQIACF_BROKER_COUNT int32 = 1088
@@ -1811,7 +1830,7 @@ const (
18111830
MQIACF_INVALID_DEST_COUNT int32 = 1371
18121831
MQIACF_ITEM_COUNT int32 = 1378
18131832
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1814-
MQIACF_LAST_USED int32 = 1438
1833+
MQIACF_LAST_USED int32 = 1444
18151834
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
18161835
MQIACF_LISTENER_ATTRS int32 = 1222
18171836
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -1994,8 +2013,12 @@ const (
19942013
MQIACF_SYSP_RESLEVEL_AUDIT int32 = 1195
19952014
MQIACF_SYSP_ROUTING_CODE int32 = 1196
19962015
MQIACF_SYSP_SMF_ACCOUNTING int32 = 1197
2016+
MQIACF_SYSP_SMF_ACCT_TIME_MINS int32 = 1443
2017+
MQIACF_SYSP_SMF_ACCT_TIME_SECS int32 = 1444
19972018
MQIACF_SYSP_SMF_INTERVAL int32 = 1199
19982019
MQIACF_SYSP_SMF_STATS int32 = 1198
2020+
MQIACF_SYSP_SMF_STAT_TIME_MINS int32 = 1199
2021+
MQIACF_SYSP_SMF_STAT_TIME_SECS int32 = 1442
19992022
MQIACF_SYSP_TIMESTAMP int32 = 1213
20002023
MQIACF_SYSP_TOTAL_LOGS int32 = 1220
20012024
MQIACF_SYSP_TRACE_CLASS int32 = 1200
@@ -2074,6 +2097,7 @@ const (
20742097
MQIACH_ALLOC_RETRY int32 = 1570
20752098
MQIACH_ALLOC_SLOW_TIMER int32 = 1572
20762099
MQIACH_AMQP_KEEP_ALIVE int32 = 1644
2100+
MQIACH_AUTH_INFO_TYPES int32 = 1622
20772101
MQIACH_AVAILABLE_CIPHERSPECS int32 = 1636
20782102
MQIACH_BACKLOG int32 = 1602
20792103
MQIACH_BATCHES int32 = 1537
@@ -2639,6 +2663,8 @@ const (
26392663
MQIMGRCOV_NO int32 = 0
26402664
MQIMGRCOV_YES int32 = 1
26412665
MQIMMREASON_APPLNAME_CHANGED int32 = 4
2666+
MQIMMREASON_AWAITS_REPLY int32 = 6
2667+
MQIMMREASON_IN_TRANSACTION int32 = 5
26422668
MQIMMREASON_MOVING int32 = 3
26432669
MQIMMREASON_NONE int32 = 0
26442670
MQIMMREASON_NOT_CLIENT int32 = 1
@@ -3569,6 +3595,7 @@ const (
35693595
MQRC_BAG_WRONG_TYPE int32 = 2326
35703596
MQRC_BINARY_DATA_LENGTH_ERROR int32 = 6111
35713597
MQRC_BMHO_ERROR int32 = 2489
3598+
MQRC_BNO_ERROR int32 = 2602
35723599
MQRC_BO_ERROR int32 = 2134
35733600
MQRC_BRIDGE_STARTED int32 = 2125
35743601
MQRC_BRIDGE_STOPPED int32 = 2126
@@ -3865,6 +3892,7 @@ const (
38653892
MQRC_OPTION_ENVIRONMENT_ERROR int32 = 2274
38663893
MQRC_OPTION_NOT_VALID_FOR_TYPE int32 = 2045
38673894
MQRC_ORIGINAL_LENGTH_ERROR int32 = 2252
3895+
MQRC_OUTBOUND_SNI_NOT_VALID int32 = 2603
38683896
MQRC_OUTCOME_MIXED int32 = 2123
38693897
MQRC_OUTCOME_PENDING int32 = 2124
38703898
MQRC_OUT_SELECTOR_ERROR int32 = 2310

‎ibmmq/cmqc_darwin.go‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ package ibmmq
3030
****************************************************************
3131
*
3232
* <BEGIN_BUILDINFO>
33-
* Generated on: 7/8/21 3:14 PM
34-
* Build Level: p923-L210708
33+
* Generated on: 11/4/21 3:44 PM
34+
* Build Level: p924-L211104
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -199,8 +199,9 @@ const (
199199
MQBACF_FIRST int32 = 7001
200200
MQBACF_GENERIC_CONNECTION_ID int32 = 7007
201201
MQBACF_GROUP_ID int32 = 7012
202-
MQBACF_LAST_USED int32 = 7038
202+
MQBACF_LAST_USED int32 = 7039
203203
MQBACF_MESSAGE_DATA int32 = 7020
204+
MQBACF_MQBNO_STRUCT int32 = 7039
204205
MQBACF_MQBO_STRUCT int32 = 7021
205206
MQBACF_MQCBC_STRUCT int32 = 7023
206207
MQBACF_MQCBD_STRUCT int32 = 7024
@@ -245,6 +246,18 @@ const (
245246
MQBND_BIND_NOT_FIXED int32 = 1
246247
MQBND_BIND_ON_GROUP int32 = 2
247248
MQBND_BIND_ON_OPEN int32 = 0
249+
MQBNO_BALTYPE_RA_MANAGED int32 = 65536
250+
MQBNO_BALTYPE_REQREP int32 = 1
251+
MQBNO_BALTYPE_SIMPLE int32 = 0
252+
MQBNO_CURRENT_LENGTH int32 = 20
253+
MQBNO_CURRENT_VERSION int32 = 1
254+
MQBNO_LENGTH_1 int32 = 20
255+
MQBNO_OPTIONS_IGNORE_TRANS int32 = 1
256+
MQBNO_OPTIONS_NONE int32 = 0
257+
MQBNO_TIMEOUT_AS_DEFAULT int32 = -1
258+
MQBNO_TIMEOUT_IMMEDIATE int32 = 0
259+
MQBNO_TIMEOUT_NEVER int32 = -2
260+
MQBNO_VERSION_1 int32 = 1
248261
MQBO_CURRENT_LENGTH int32 = 12
249262
MQBO_CURRENT_VERSION int32 = 1
250263
MQBO_LENGTH_1 int32 = 12
@@ -1006,7 +1019,7 @@ const (
10061019
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
10071020
MQCMDI_SEC_TIMER_ZERO int32 = 14
10081021
MQCMDI_SEC_UPPERCASE int32 = 21
1009-
MQCMDL_CURRENT_LEVEL int32 = 923
1022+
MQCMDL_CURRENT_LEVEL int32 = 924
10101023
MQCMDL_LEVEL_1 int32 = 100
10111024
MQCMDL_LEVEL_101 int32 = 101
10121025
MQCMDL_LEVEL_110 int32 = 110
@@ -1051,6 +1064,7 @@ const (
10511064
MQCMDL_LEVEL_921 int32 = 921
10521065
MQCMDL_LEVEL_922 int32 = 922
10531066
MQCMDL_LEVEL_923 int32 = 923
1067+
MQCMDL_LEVEL_924 int32 = 924
10541068
MQCMD_ACCOUNTING_MQI int32 = 167
10551069
MQCMD_ACCOUNTING_Q int32 = 168
10561070
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1264,8 +1278,8 @@ const (
12641278
MQCNO_ALL_CONVS_SHARE int32 = 262144
12651279
MQCNO_CD_FOR_OUTPUT_ONLY int32 = 524288
12661280
MQCNO_CLIENT_BINDING int32 = 2048
1267-
MQCNO_CURRENT_LENGTH int32 = 256
1268-
MQCNO_CURRENT_VERSION int32 = 7
1281+
MQCNO_CURRENT_LENGTH int32 = 272
1282+
MQCNO_CURRENT_VERSION int32 = 8
12691283
MQCNO_FASTPATH_BINDING int32 = 1
12701284
MQCNO_GENERATE_CONN_TAG int32 = 2097152
12711285
MQCNO_HANDLE_SHARE_BLOCK int32 = 64
@@ -1279,6 +1293,7 @@ const (
12791293
MQCNO_LENGTH_5 int32 = 200
12801294
MQCNO_LENGTH_6 int32 = 224
12811295
MQCNO_LENGTH_7 int32 = 256
1296+
MQCNO_LENGTH_8 int32 = 272
12821297
MQCNO_LOCAL_BINDING int32 = 1024
12831298
MQCNO_NONE int32 = 0
12841299
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1300,6 +1315,7 @@ const (
13001315
MQCNO_VERSION_5 int32 = 5
13011316
MQCNO_VERSION_6 int32 = 6
13021317
MQCNO_VERSION_7 int32 = 7
1318+
MQCNO_VERSION_8 int32 = 8
13031319
MQCODL_AS_INPUT int32 = -1
13041320
MQCOMPRESS_ANY int32 = 268435455
13051321
MQCOMPRESS_NONE int32 = 0
@@ -1717,6 +1733,9 @@ const (
17171733
MQIACF_AUX_ERROR_DATA_INT_2 int32 = 1071
17181734
MQIACF_BACKOUT_COUNT int32 = 1241
17191735
MQIACF_BALANCED int32 = 1433
1736+
MQIACF_BALANCING_OPTIONS int32 = 1440
1737+
MQIACF_BALANCING_TIMEOUT int32 = 1441
1738+
MQIACF_BALANCING_TYPE int32 = 1439
17201739
MQIACF_BALSTATE int32 = 1434
17211740
MQIACF_BRIDGE_TYPE int32 = 1073
17221741
MQIACF_BROKER_COUNT int32 = 1088
@@ -1809,7 +1828,7 @@ const (
18091828
MQIACF_INVALID_DEST_COUNT int32 = 1371
18101829
MQIACF_ITEM_COUNT int32 = 1378
18111830
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1812-
MQIACF_LAST_USED int32 = 1438
1831+
MQIACF_LAST_USED int32 = 1444
18131832
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
18141833
MQIACF_LISTENER_ATTRS int32 = 1222
18151834
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -1992,8 +2011,12 @@ const (
19922011
MQIACF_SYSP_RESLEVEL_AUDIT int32 = 1195
19932012
MQIACF_SYSP_ROUTING_CODE int32 = 1196
19942013
MQIACF_SYSP_SMF_ACCOUNTING int32 = 1197
2014+
MQIACF_SYSP_SMF_ACCT_TIME_MINS int32 = 1443
2015+
MQIACF_SYSP_SMF_ACCT_TIME_SECS int32 = 1444
19952016
MQIACF_SYSP_SMF_INTERVAL int32 = 1199
19962017
MQIACF_SYSP_SMF_STATS int32 = 1198
2018+
MQIACF_SYSP_SMF_STAT_TIME_MINS int32 = 1199
2019+
MQIACF_SYSP_SMF_STAT_TIME_SECS int32 = 1442
19972020
MQIACF_SYSP_TIMESTAMP int32 = 1213
19982021
MQIACF_SYSP_TOTAL_LOGS int32 = 1220
19992022
MQIACF_SYSP_TRACE_CLASS int32 = 1200
@@ -2072,6 +2095,7 @@ const (
20722095
MQIACH_ALLOC_RETRY int32 = 1570
20732096
MQIACH_ALLOC_SLOW_TIMER int32 = 1572
20742097
MQIACH_AMQP_KEEP_ALIVE int32 = 1644
2098+
MQIACH_AUTH_INFO_TYPES int32 = 1622
20752099
MQIACH_AVAILABLE_CIPHERSPECS int32 = 1636
20762100
MQIACH_BACKLOG int32 = 1602
20772101
MQIACH_BATCHES int32 = 1537
@@ -2637,6 +2661,8 @@ const (
26372661
MQIMGRCOV_NO int32 = 0
26382662
MQIMGRCOV_YES int32 = 1
26392663
MQIMMREASON_APPLNAME_CHANGED int32 = 4
2664+
MQIMMREASON_AWAITS_REPLY int32 = 6
2665+
MQIMMREASON_IN_TRANSACTION int32 = 5
26402666
MQIMMREASON_MOVING int32 = 3
26412667
MQIMMREASON_NONE int32 = 0
26422668
MQIMMREASON_NOT_CLIENT int32 = 1
@@ -3567,6 +3593,7 @@ const (
35673593
MQRC_BAG_WRONG_TYPE int32 = 2326
35683594
MQRC_BINARY_DATA_LENGTH_ERROR int32 = 6111
35693595
MQRC_BMHO_ERROR int32 = 2489
3596+
MQRC_BNO_ERROR int32 = 2602
35703597
MQRC_BO_ERROR int32 = 2134
35713598
MQRC_BRIDGE_STARTED int32 = 2125
35723599
MQRC_BRIDGE_STOPPED int32 = 2126
@@ -3863,6 +3890,7 @@ const (
38633890
MQRC_OPTION_ENVIRONMENT_ERROR int32 = 2274
38643891
MQRC_OPTION_NOT_VALID_FOR_TYPE int32 = 2045
38653892
MQRC_ORIGINAL_LENGTH_ERROR int32 = 2252
3893+
MQRC_OUTBOUND_SNI_NOT_VALID int32 = 2603
38663894
MQRC_OUTCOME_MIXED int32 = 2123
38673895
MQRC_OUTCOME_PENDING int32 = 2124
38683896
MQRC_OUT_SELECTOR_ERROR int32 = 2310

0 commit comments

Comments
 (0)