From b88bd78c11d1e68423cd8c3f277d96b52416375b Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 8 Aug 2024 17:18:55 +0100 Subject: [PATCH 01/21] Split off 9.4.86 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 87f5db593..a81564cd4 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.85-0-SNAPSHOT + 9.4.87-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 97dce5969..3880d1dcf 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.85-0-SNAPSHOT + 9.4.87-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index e01d9b1e9..97fee5d40 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.85-0-SNAPSHOT + 9.4.87-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 92e2e1f3c..4b8ab84b6 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.85-0-SNAPSHOT + 9.4.87-0-SNAPSHOT From ef37c9c45ea9cacc05560a4d1b5398ba7dc7bb35 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 8 Aug 2024 17:19:54 +0100 Subject: [PATCH 02/21] Split off 9.2.112 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 1cdf16140..c693f9d94 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.111-0-SNAPSHOT + 9.2.113-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 85ec71575..2184e72e2 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.111-0-SNAPSHOT + 9.2.113-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4f08187cb..cc201c23c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.111-0-SNAPSHOT + 9.2.113-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index a582edddd..699ee9565 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.111-0-SNAPSHOT + 9.2.113-0-SNAPSHOT From 49dbc2f579ea613b31f894538c16cda3d2e4b91e Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 15 Aug 2024 16:43:54 +0100 Subject: [PATCH 03/21] Split off 9.4.88 Signed-off-by: Jake Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index a81564cd4..eabc0c8c6 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.87-0-SNAPSHOT + 9.4.89-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 3880d1dcf..1d3baaace 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.87-0-SNAPSHOT + 9.4.89-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 97fee5d40..e29819da9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.87-0-SNAPSHOT + 9.4.89-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 4b8ab84b6..5f83527e2 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.87-0-SNAPSHOT + 9.4.89-0-SNAPSHOT From 1668b8801b529f067916dd7ff5cf3884b7b38bae Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 15 Aug 2024 16:44:42 +0100 Subject: [PATCH 04/21] Split off 9.2.114 Signed-off-by: Jake Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index c693f9d94..aa34db3ae 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.113-0-SNAPSHOT + 9.2.115-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 2184e72e2..a635c8a73 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.113-0-SNAPSHOT + 9.2.115-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index cc201c23c..2a2c9b64c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.113-0-SNAPSHOT + 9.2.115-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 699ee9565..853f05d00 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.113-0-SNAPSHOT + 9.2.115-0-SNAPSHOT From 0174cf6bef347a42473f0b25a2d689cab79520a1 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 23 Aug 2024 15:18:49 +0100 Subject: [PATCH 05/21] Split off 9.4.90 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index eabc0c8c6..f56141f6f 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.89-0-SNAPSHOT + 9.4.91-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 1d3baaace..368db9255 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.89-0-SNAPSHOT + 9.4.91-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index e29819da9..adcd7e796 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.89-0-SNAPSHOT + 9.4.91-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 5f83527e2..ca3e4aefc 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.89-0-SNAPSHOT + 9.4.91-0-SNAPSHOT From e656768381b53829cb4291ad7903b0cd8187fedd Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 23 Aug 2024 15:19:49 +0100 Subject: [PATCH 06/21] Split off 9.2.116 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index aa34db3ae..c977a38ef 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.115-0-SNAPSHOT + 9.2.117-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index a635c8a73..496e5d269 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.115-0-SNAPSHOT + 9.2.117-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2a2c9b64c..d7d9ce726 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.115-0-SNAPSHOT + 9.2.117-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 853f05d00..77304602a 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.115-0-SNAPSHOT + 9.2.117-0-SNAPSHOT From da64ffbcab88ebeb763e081b4be46f109ab2306f Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 30 Aug 2024 14:04:33 +0100 Subject: [PATCH 07/21] Split off 9.4.92 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index f56141f6f..440ee4ec2 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.91-0-SNAPSHOT + 9.4.93-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 368db9255..86138c266 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.91-0-SNAPSHOT + 9.4.93-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index adcd7e796..46e8e392b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.91-0-SNAPSHOT + 9.4.93-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index ca3e4aefc..9aa5294ce 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.91-0-SNAPSHOT + 9.4.93-0-SNAPSHOT From c02cb90da77486b4975d4cfc45cf964157f5043f Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 30 Aug 2024 14:05:24 +0100 Subject: [PATCH 08/21] Split off 9.2.118 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index c977a38ef..c3d8ab106 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.117-0-SNAPSHOT + 9.2.119-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 496e5d269..3717c6670 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.117-0-SNAPSHOT + 9.2.119-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index d7d9ce726..5f87037cc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.117-0-SNAPSHOT + 9.2.119-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 77304602a..0b13789fb 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.117-0-SNAPSHOT + 9.2.119-0-SNAPSHOT From 0a3d4610da3482f6ce414a589d63c92476778872 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 5 Sep 2024 17:28:19 +0100 Subject: [PATCH 09/21] Split off 9.6.46 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 17a17c6dc..bd6dddc76 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.6.45-0-SNAPSHOT + 9.6.47-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 82e76a329..12f5d313b 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.6.45-0-SNAPSHOT + 9.6.47-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index ef91762a7..76111f10a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.6.45-0-SNAPSHOT + 9.6.47-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 32a54035f..5dd029cf3 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.6.45-0-SNAPSHOT + 9.6.47-0-SNAPSHOT From 66e66c47271cb4ae39624de80ee5657857c1501e Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 5 Sep 2024 17:39:50 +0100 Subject: [PATCH 10/21] Split off 9.8.20 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 982397d2d..c60a1ee48 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.8.19-0-SNAPSHOT + 9.8.21-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 1d6905124..efdfd04d6 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.8.19-0-SNAPSHOT + 9.8.21-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 129e10444..bdcf71bfb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.8.19-0-SNAPSHOT + 9.8.21-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 90f6a0602..0354a8bd0 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.8.19-0-SNAPSHOT + 9.8.21-0-SNAPSHOT From f125b36b5ebe42b5f7c9280b4d0a683202993b0b Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 5 Sep 2024 17:40:43 +0100 Subject: [PATCH 11/21] Split off 9.4.94 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 440ee4ec2..c64eef0c0 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.93-0-SNAPSHOT + 9.4.95-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 86138c266..fcf7e3921 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.93-0-SNAPSHOT + 9.4.95-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 46e8e392b..880efc2de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.93-0-SNAPSHOT + 9.4.95-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 9aa5294ce..23d8354cb 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.93-0-SNAPSHOT + 9.4.95-0-SNAPSHOT From 8bb7f5154a97e6aeb06ca896894638c51e3210af Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 5 Sep 2024 17:41:38 +0100 Subject: [PATCH 12/21] Split off 9.2.120 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index c3d8ab106..b98273a4d 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.119-0-SNAPSHOT + 9.2.121-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 3717c6670..3436cd6b2 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.119-0-SNAPSHOT + 9.2.121-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5f87037cc..b34d2ea9d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.119-0-SNAPSHOT + 9.2.121-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 0b13789fb..bba2309c0 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.119-0-SNAPSHOT + 9.2.121-0-SNAPSHOT From 7050cb345c07a52d89dd41f70de8b2e08e2ccb29 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Tue, 10 Sep 2024 10:31:35 -0400 Subject: [PATCH 13/21] HPCC4J-612 Ensure proper OTel SDK initialization (#745) Signed-off-by: Pastrana Co-authored-by: Pastrana --- .../hpccsystems/ws/client/utils/Utils.java | 75 +++++++++++++++++++ .../hpccsystems/ws/client/BaseRemoteTest.java | 9 ++- .../client/platform/test/PlatformTester.java | 16 ++-- 3 files changed, 91 insertions(+), 9 deletions(-) diff --git a/wsclient/src/main/java/org/hpccsystems/ws/client/utils/Utils.java b/wsclient/src/main/java/org/hpccsystems/ws/client/utils/Utils.java index 9db3f3145..96239616f 100644 --- a/wsclient/src/main/java/org/hpccsystems/ws/client/utils/Utils.java +++ b/wsclient/src/main/java/org/hpccsystems/ws/client/utils/Utils.java @@ -8,6 +8,7 @@ import java.io.OutputStream; import java.io.PrintStream; import java.io.StringWriter; +import java.lang.management.ManagementFactory; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; @@ -1261,4 +1262,78 @@ static public String getTraceParentHeader(Span span) return traceparent; } + + /** + * Checks if a specified VM argument is present. + * + * This method retrieves the list of VM arguments and searches for the specified argument name. + * If the argument is found, it returns true. If the argument is not found, it returns false. + * + * @param vmArgName the name of the VM argument to search for + * @return {@code true} if the specified VM argument is present, {@code false} otherwise + */ + static public boolean containsVMArgument(String vmArgName) + { + List argslist = ManagementFactory.getRuntimeMXBean().getInputArguments(); + for (String string : argslist) + { + if(string.matches("(?i)(" + vmArgName + "):.*")) + { + return true; + } + } + return false; + } + + /** + * Fetches the value of a specified VM argument. + * + * This method retrieves the list of VM arguments and searches for the specified argument name. + * If the argument is found, it returns the value associated with it. If the argument is not found, + * it returns an empty string. + * + * @param vmArgName the name of the VM argument to search for + * @return the value of the specified VM argument, or an empty string if the argument is not found + */ + static public String fetchVMArgument(String vmArgName) + { + List argslist = ManagementFactory.getRuntimeMXBean().getInputArguments(); + for (String string : argslist) + { + if(string.matches("(?i)(" + vmArgName + "):.*")) + { + String[] keyval = string.split(vmArgName+":"); + + return keyval[1]; + } + } + return ""; + } + + /** + * Checks if the OpenTelemetry Java agent is used by inspecting the VM arguments. + * + * This method fetches the VM argument specified by "-javaagent" and checks if it contains + * the term "opentelemetry". If the argument is found and contains "opentelemetry", it returns true. + * Otherwise, it returns false. + * + * @return {@code true} if the OpenTelemetry Java agent is detected, {@code false} otherwise. + */ + static public boolean isOtelJavaagentUsed() + { + String javaAgentPath = fetchVMArgument("-javaagent"); + if (!javaAgentPath.isEmpty()) + { + System.out.println("javaagent VM argument detected: " + javaAgentPath); + + File jaFile = new File(javaAgentPath); + + if (jaFile.getName().contains("opentelemetry") || jaFile.getName().contains("otel")) + { + System.out.println("Otel javaagent argument detected: " + javaAgentPath); + return true; + } + } + return false; + } } diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/BaseRemoteTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/BaseRemoteTest.java index 077fba31e..9718e7215 100644 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/BaseRemoteTest.java +++ b/wsclient/src/test/java/org/hpccsystems/ws/client/BaseRemoteTest.java @@ -33,6 +33,7 @@ HPCC SYSTEMS software Copyright (C) 2019 HPCC Systems®. import org.hpccsystems.ws.client.HPCCWsTopologyClient.TopologyGroupQueryKind; import org.hpccsystems.ws.client.platform.Platform; import org.hpccsystems.ws.client.utils.Connection; +import org.hpccsystems.ws.client.utils.Utils; import org.hpccsystems.ws.client.wrappers.gen.wstopology.TpGroupWrapper; import org.hpccsystems.ws.client.wrappers.wsworkunits.WorkunitWrapper; import org.junit.Assert; @@ -135,9 +136,13 @@ public static void initialize() throws Exception System.out.println(" otel.metrics.exporter: "+ System.getProperty("otel.metrics.exporter")); System.out.println(" OTEL_METRICS_EXPORTER Env var: " + System.getenv("OTEL_METRICS_EXPORTER")); - globalOTel = AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(); + if (!Utils.isOtelJavaagentUsed()) + { + globalOTel = AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(); + } } - else + + if (globalOTel == null) { globalOTel = GlobalOpenTelemetry.get(); } diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/platform/test/PlatformTester.java b/wsclient/src/test/java/org/hpccsystems/ws/client/platform/test/PlatformTester.java index 8596fb40b..d9d412152 100644 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/platform/test/PlatformTester.java +++ b/wsclient/src/test/java/org/hpccsystems/ws/client/platform/test/PlatformTester.java @@ -190,21 +190,23 @@ else if (currentParam.matches(WSSQLPORTPATTERN)) System.out.println("If missing dependancies arise, test will halt!"); System.out.println(" otel.traces.exporter sys property: "+System.getProperty("otel.traces.exporter")); System.out.println(" OTEL_TRACES_EXPORTER Env var: " + System.getenv("OTEL_TRACES_EXPORTER")); - System.out.println(" OTEL_TRACES_SAMPLER Env var: " + System.getenv("OTEL_TRACES_SAMPLER")); - System.out.println(" otel.traces.sampler sys property: "+System.getProperty("otel.traces.sampler")); + System.out.println(" OTEL_TRACES_SAMPLER Env var: " + System.getenv("OTEL_TRACES_SAMPLER")); + System.out.println(" otel.traces.sampler sys property: "+System.getProperty("otel.traces.sampler")); System.out.println(" otel.logs.exporter: "+ System.getProperty("otel.logs.exporter")); System.out.println(" OTEL_LOGS_EXPORTER Env var: " + System.getenv("OTEL_LOGS_EXPORTER")); System.out.println(" otel.metrics.exporter: "+ System.getProperty("otel.metrics.exporter")); System.out.println(" OTEL_METRICS_EXPORTER Env var: " + System.getenv("OTEL_METRICS_EXPORTER")); - globalOTel = AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(); + if (!Utils.isOtelJavaagentUsed()) + { + globalOTel = AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk(); + } } - else - { + + if (globalOTel == null) globalOTel = GlobalOpenTelemetry.get(); - } - Span rootSpan = globalOTel.getTracer("PlatformTester").spanBuilder("rootspan").startSpan(); + Span rootSpan = globalOTel.getTracer("PlatformTester").spanBuilder("PlatformTest").startSpan(); try (Scope scope = rootSpan.makeCurrent()) { Platform platform = Platform.get(prot, hpccServer, port, user, pass); From bd73e8521ce7bf38e6ac35b3b34e844354da5437 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Tue, 10 Sep 2024 10:43:09 -0400 Subject: [PATCH 14/21] HPCC4J-638 Jirabot Merge improve tag regex filtering (#746) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/JirabotMerge.yml | 63 +++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 1c37f0da8..1aab53288 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -47,6 +47,7 @@ jobs: PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }} PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }} PULL_URL: ${{ github.event.pull_request.html_url }} + PROJECT_CONFIG: ${{ vars.PROJECT_CONFIG}} COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH_NAME: ${{ github.ref_name }} @@ -95,9 +96,40 @@ jobs: major, minor, point = map(int, version) return f"{major}.{minor}.{point}" - def generateFixVersionList(jira, projectName, branchName): - cmd = "git tag --list 'hpcc4j_*-release' --sort=-v:refname | head -n 1" - latestVersion = getTagVersionForCmd(cmd) + def createReleaseTagPattern(projectConfig, major = None, minor = None, point = None): + releaseTagPrefix = projectConfig.get('tagPrefix') + releaseTagPostfix = projectConfig.get('tagPostfix') + + if releaseTagPrefix is None or releaseTagPostfix is None: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + releaseTagPattern = releaseTagPrefix + if major is not None: + releaseTagPattern += str(major) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if minor is not None: + releaseTagPattern += str(minor) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if point is not None: + releaseTagPattern += str(point) + '(-[0-9]+)?' + else: + releaseTagPattern += '[0-9]+(-[0-9]+)?' + + releaseTagPattern += releaseTagPostfix + '$' + + return releaseTagPattern + + def getLatestSemVer(projectConfig, major = None, minor = None, point = None): + cmd = "git tag --list --sort=-v:refname | grep -E '" + createReleaseTagPattern(projectConfig, major, minor, point) + "' | head -n 1" + return getTagVersionForCmd(cmd) + + def generateFixVersionList(jira, projectConfig, projectName, branchName): + latestVersion = getLatestSemVer(projectConfig) # If we are merging into master we assume it is going into the next minor release fixVersions = [] @@ -110,14 +142,12 @@ jobs: branchVersion = extractVersion(branchVersionMatch.group(1)) # Get latest release in branch - findLatestBranchVer = "git tag --list 'hpcc4j_" + str(branchVersion[0]) + "." + str(branchVersion[1]) + "*-release' --sort=-v:refname | head -n 1" - latestBranchVer = getTagVersionForCmd(findLatestBranchVer) + latestBranchVer = getLatestSemVer(projectConfig, branchVersion[0], branchVersion[1]) curMajor = branchVersion[0] latestMajor = latestVersion[0] while curMajor <= latestMajor: - cmd = "git tag --list 'hpcc4j_" + str(curMajor) + "*-release' --sort=-v:refname | head -n 1" - latestVersionInMajor = getTagVersionForCmd(cmd) + latestVersionInMajor = getLatestSemVer(projectConfig, curMajor) curMinor = 0 if curMajor == branchVersion[0]: @@ -126,7 +156,7 @@ jobs: latestMinor = latestVersionInMajor[1] while curMinor <= latestMinor: - latestPointInMinor = getTagVersionForCmd("git tag --list 'hpcc4j_" + str(curMajor) + "." + str(curMinor) + "*-release' --sort=-v:refname | head -n 1") + latestPointInMinor = getLatestSemVer(projectConfig, curMajor, curMinor) fixVersions.append(buildVersionString([latestPointInMinor[0], latestPointInMinor[1], latestPointInMinor[2] + 2])) curMinor += 2 curMajor += 1 @@ -214,7 +244,20 @@ jobs: github_token = os.environ['GITHUB_TOKEN'] branch_name = os.environ['BRANCH_NAME'] comments_url = os.environ['COMMENTS_URL'] - project_name = 'HPCC4J' + + projectConfig = json.loads(os.environ['PROJECT_CONFIG']) + if not isinstance(projectConfig, dict): + print('Error: PROJECT_CONFIG is not a valid JSON object, aborting.') + sys.exit(1) + + if 'tagPrefix' not in projectConfig or 'tagPostfix' not in projectConfig: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + project_name = projectConfig.get('projectName') + if project_name is None: + print('Error: PROJECT_CONFIG is missing required field: projectName') + sys.exit(1) result = '' issuem = re.search("(" + project_name + ")-[0-9]+", title, re.IGNORECASE) @@ -230,7 +273,7 @@ jobs: result = 'Jirabot Action Result:\n' - fixVersions = generateFixVersionList(jira, project_name, branch_name) + fixVersions = generateFixVersionList(jira, projectConfig, project_name, branch_name) result += resolveIssue(jira, project_name, issue, fixVersions) jira.issue_add_comment(issue_name, result) From b5f3618bd1244ee2e19b84083876857530961545 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 11 Sep 2024 09:41:32 -0400 Subject: [PATCH 15/21] HPCC4J-640 DFSClient fix upmerge issue (#748) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../org/hpccsystems/dfs/client/RowServiceInputStream.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java index 8345f06cc..105075d6f 100644 --- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java +++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java @@ -1272,14 +1272,6 @@ private void finishFetch() } } - if (readSpan != null) - { - Attributes attributes = Attributes.of( AttributeKey.longKey("server.index"), Long.valueOf(getFilePartCopy()), - AttributeKey.longKey("read.offset"), streamPos, - AttributeKey.longKey("read.size"), Long.valueOf(maxReadSizeKB*1000)); - readSpan.addEvent("RowServiceInputStream.readRequest", attributes); - } - // Create the read ahead request if (this.simulateFail) this.handle = -1; String readAheadRequest = (this.forceTokenUse) ? this.makeTokenRequest() : this.makeHandleRequest(); From 906ab195af4eb4a099b4b7edd325fdd5e69890f6 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 11 Sep 2024 16:22:07 -0400 Subject: [PATCH 16/21] HPCC4J-641 DFSClient test suite dataset fix (#749) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../java/org/hpccsystems/dfs/client/DFSReadWriteTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java index 9954b9dad..a5b4c83a1 100644 --- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java +++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java @@ -65,9 +65,9 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DFSReadWriteTest extends BaseRemoteTest { - // private static final String[] datasets = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; - private static final String[] datasets = { "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; - private static final int[] expectedCounts = { 1250, 100000, 100000, 100000, 100000, 100000}; + // Note: These datasets are generated by dfsclient/src/target/resources/generate-datasets.ecl + private static final String[] datasets = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; + private static final int[] expectedCounts = { 1250, 100000, 100000, 100000}; private static final Version newProtocolVersion = new Version(8,12,10); From d065ae6f488320d6c6ceb4ab4fcccf951df511a6 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 11 Sep 2024 16:23:20 -0400 Subject: [PATCH 17/21] HPCC4J-641 DFSClient test suite dataset fix (#750) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../java/org/hpccsystems/dfs/client/DFSReadWriteTest.java | 5 +++-- dfsclient/src/test/resources/generate-datasets.ecl | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java index 42912b843..4fd85ec15 100644 --- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java +++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java @@ -63,8 +63,9 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DFSReadWriteTest extends BaseRemoteTest { - private static final String[] datasets = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; - private static final int[] expectedCounts = { 1250, 10000, 10000, 10000, 10000, 10000}; + // Note: These datasets are generated by dfsclient/src/target/resources/generate-datasets.ecl + private static final String[] datasets = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; + private static final int[] expectedCounts = { 1250, 100000, 100000, 100000}; private static final Version newProtocolVersion = new Version(8,12,10); diff --git a/dfsclient/src/test/resources/generate-datasets.ecl b/dfsclient/src/test/resources/generate-datasets.ecl index 26ffa5ad8..9daadec07 100644 --- a/dfsclient/src/test/resources/generate-datasets.ecl +++ b/dfsclient/src/test/resources/generate-datasets.ecl @@ -2,7 +2,7 @@ IMPORT Std; unique_keys := 100000; // Should be less than number of records unique_values := 10212; // Should be less than number of records -totalrecs1 := 10000; +totalrecs1 := 100000; childRec := {STRING8 childField1, INTEGER8 childField2, REAL8 childField3}; From 57b6c9e9ff924f733b09c6ba93b8194194b15d11 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Thu, 12 Sep 2024 09:33:45 -0400 Subject: [PATCH 18/21] HPCC4J-638 Jirabot Merge improve tag regex filtering (#752) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/JirabotMerge.yml | 63 +++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 1c37f0da8..1aab53288 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -47,6 +47,7 @@ jobs: PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }} PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }} PULL_URL: ${{ github.event.pull_request.html_url }} + PROJECT_CONFIG: ${{ vars.PROJECT_CONFIG}} COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH_NAME: ${{ github.ref_name }} @@ -95,9 +96,40 @@ jobs: major, minor, point = map(int, version) return f"{major}.{minor}.{point}" - def generateFixVersionList(jira, projectName, branchName): - cmd = "git tag --list 'hpcc4j_*-release' --sort=-v:refname | head -n 1" - latestVersion = getTagVersionForCmd(cmd) + def createReleaseTagPattern(projectConfig, major = None, minor = None, point = None): + releaseTagPrefix = projectConfig.get('tagPrefix') + releaseTagPostfix = projectConfig.get('tagPostfix') + + if releaseTagPrefix is None or releaseTagPostfix is None: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + releaseTagPattern = releaseTagPrefix + if major is not None: + releaseTagPattern += str(major) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if minor is not None: + releaseTagPattern += str(minor) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if point is not None: + releaseTagPattern += str(point) + '(-[0-9]+)?' + else: + releaseTagPattern += '[0-9]+(-[0-9]+)?' + + releaseTagPattern += releaseTagPostfix + '$' + + return releaseTagPattern + + def getLatestSemVer(projectConfig, major = None, minor = None, point = None): + cmd = "git tag --list --sort=-v:refname | grep -E '" + createReleaseTagPattern(projectConfig, major, minor, point) + "' | head -n 1" + return getTagVersionForCmd(cmd) + + def generateFixVersionList(jira, projectConfig, projectName, branchName): + latestVersion = getLatestSemVer(projectConfig) # If we are merging into master we assume it is going into the next minor release fixVersions = [] @@ -110,14 +142,12 @@ jobs: branchVersion = extractVersion(branchVersionMatch.group(1)) # Get latest release in branch - findLatestBranchVer = "git tag --list 'hpcc4j_" + str(branchVersion[0]) + "." + str(branchVersion[1]) + "*-release' --sort=-v:refname | head -n 1" - latestBranchVer = getTagVersionForCmd(findLatestBranchVer) + latestBranchVer = getLatestSemVer(projectConfig, branchVersion[0], branchVersion[1]) curMajor = branchVersion[0] latestMajor = latestVersion[0] while curMajor <= latestMajor: - cmd = "git tag --list 'hpcc4j_" + str(curMajor) + "*-release' --sort=-v:refname | head -n 1" - latestVersionInMajor = getTagVersionForCmd(cmd) + latestVersionInMajor = getLatestSemVer(projectConfig, curMajor) curMinor = 0 if curMajor == branchVersion[0]: @@ -126,7 +156,7 @@ jobs: latestMinor = latestVersionInMajor[1] while curMinor <= latestMinor: - latestPointInMinor = getTagVersionForCmd("git tag --list 'hpcc4j_" + str(curMajor) + "." + str(curMinor) + "*-release' --sort=-v:refname | head -n 1") + latestPointInMinor = getLatestSemVer(projectConfig, curMajor, curMinor) fixVersions.append(buildVersionString([latestPointInMinor[0], latestPointInMinor[1], latestPointInMinor[2] + 2])) curMinor += 2 curMajor += 1 @@ -214,7 +244,20 @@ jobs: github_token = os.environ['GITHUB_TOKEN'] branch_name = os.environ['BRANCH_NAME'] comments_url = os.environ['COMMENTS_URL'] - project_name = 'HPCC4J' + + projectConfig = json.loads(os.environ['PROJECT_CONFIG']) + if not isinstance(projectConfig, dict): + print('Error: PROJECT_CONFIG is not a valid JSON object, aborting.') + sys.exit(1) + + if 'tagPrefix' not in projectConfig or 'tagPostfix' not in projectConfig: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + project_name = projectConfig.get('projectName') + if project_name is None: + print('Error: PROJECT_CONFIG is missing required field: projectName') + sys.exit(1) result = '' issuem = re.search("(" + project_name + ")-[0-9]+", title, re.IGNORECASE) @@ -230,7 +273,7 @@ jobs: result = 'Jirabot Action Result:\n' - fixVersions = generateFixVersionList(jira, project_name, branch_name) + fixVersions = generateFixVersionList(jira, projectConfig, project_name, branch_name) result += resolveIssue(jira, project_name, issue, fixVersions) jira.issue_add_comment(issue_name, result) From 16acec71e364a8f45ae0570c4bccdfdbe839daf5 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Thu, 12 Sep 2024 09:34:17 -0400 Subject: [PATCH 19/21] HPCC4J-638 Jirabot Merge improve tag regex filtering (#753) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/JirabotMerge.yml | 63 +++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 1c37f0da8..1aab53288 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -47,6 +47,7 @@ jobs: PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }} PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }} PULL_URL: ${{ github.event.pull_request.html_url }} + PROJECT_CONFIG: ${{ vars.PROJECT_CONFIG}} COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH_NAME: ${{ github.ref_name }} @@ -95,9 +96,40 @@ jobs: major, minor, point = map(int, version) return f"{major}.{minor}.{point}" - def generateFixVersionList(jira, projectName, branchName): - cmd = "git tag --list 'hpcc4j_*-release' --sort=-v:refname | head -n 1" - latestVersion = getTagVersionForCmd(cmd) + def createReleaseTagPattern(projectConfig, major = None, minor = None, point = None): + releaseTagPrefix = projectConfig.get('tagPrefix') + releaseTagPostfix = projectConfig.get('tagPostfix') + + if releaseTagPrefix is None or releaseTagPostfix is None: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + releaseTagPattern = releaseTagPrefix + if major is not None: + releaseTagPattern += str(major) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if minor is not None: + releaseTagPattern += str(minor) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if point is not None: + releaseTagPattern += str(point) + '(-[0-9]+)?' + else: + releaseTagPattern += '[0-9]+(-[0-9]+)?' + + releaseTagPattern += releaseTagPostfix + '$' + + return releaseTagPattern + + def getLatestSemVer(projectConfig, major = None, minor = None, point = None): + cmd = "git tag --list --sort=-v:refname | grep -E '" + createReleaseTagPattern(projectConfig, major, minor, point) + "' | head -n 1" + return getTagVersionForCmd(cmd) + + def generateFixVersionList(jira, projectConfig, projectName, branchName): + latestVersion = getLatestSemVer(projectConfig) # If we are merging into master we assume it is going into the next minor release fixVersions = [] @@ -110,14 +142,12 @@ jobs: branchVersion = extractVersion(branchVersionMatch.group(1)) # Get latest release in branch - findLatestBranchVer = "git tag --list 'hpcc4j_" + str(branchVersion[0]) + "." + str(branchVersion[1]) + "*-release' --sort=-v:refname | head -n 1" - latestBranchVer = getTagVersionForCmd(findLatestBranchVer) + latestBranchVer = getLatestSemVer(projectConfig, branchVersion[0], branchVersion[1]) curMajor = branchVersion[0] latestMajor = latestVersion[0] while curMajor <= latestMajor: - cmd = "git tag --list 'hpcc4j_" + str(curMajor) + "*-release' --sort=-v:refname | head -n 1" - latestVersionInMajor = getTagVersionForCmd(cmd) + latestVersionInMajor = getLatestSemVer(projectConfig, curMajor) curMinor = 0 if curMajor == branchVersion[0]: @@ -126,7 +156,7 @@ jobs: latestMinor = latestVersionInMajor[1] while curMinor <= latestMinor: - latestPointInMinor = getTagVersionForCmd("git tag --list 'hpcc4j_" + str(curMajor) + "." + str(curMinor) + "*-release' --sort=-v:refname | head -n 1") + latestPointInMinor = getLatestSemVer(projectConfig, curMajor, curMinor) fixVersions.append(buildVersionString([latestPointInMinor[0], latestPointInMinor[1], latestPointInMinor[2] + 2])) curMinor += 2 curMajor += 1 @@ -214,7 +244,20 @@ jobs: github_token = os.environ['GITHUB_TOKEN'] branch_name = os.environ['BRANCH_NAME'] comments_url = os.environ['COMMENTS_URL'] - project_name = 'HPCC4J' + + projectConfig = json.loads(os.environ['PROJECT_CONFIG']) + if not isinstance(projectConfig, dict): + print('Error: PROJECT_CONFIG is not a valid JSON object, aborting.') + sys.exit(1) + + if 'tagPrefix' not in projectConfig or 'tagPostfix' not in projectConfig: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + project_name = projectConfig.get('projectName') + if project_name is None: + print('Error: PROJECT_CONFIG is missing required field: projectName') + sys.exit(1) result = '' issuem = re.search("(" + project_name + ")-[0-9]+", title, re.IGNORECASE) @@ -230,7 +273,7 @@ jobs: result = 'Jirabot Action Result:\n' - fixVersions = generateFixVersionList(jira, project_name, branch_name) + fixVersions = generateFixVersionList(jira, projectConfig, project_name, branch_name) result += resolveIssue(jira, project_name, issue, fixVersions) jira.issue_add_comment(issue_name, result) From bf54a7cfc42e4e666365ddedd499f71363162215 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Thu, 12 Sep 2024 09:35:56 -0400 Subject: [PATCH 20/21] HPCC4J-638 Jirabot Merge improve tag regex filtering (#754) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/JirabotMerge.yml | 63 +++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 1c37f0da8..1aab53288 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -47,6 +47,7 @@ jobs: PULL_REQUEST_TITLE : ${{ github.event.pull_request.title }} PULL_REQUEST_AUTHOR_NAME : ${{ github.event.pull_request.user.login }} PULL_URL: ${{ github.event.pull_request.html_url }} + PROJECT_CONFIG: ${{ vars.PROJECT_CONFIG}} COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH_NAME: ${{ github.ref_name }} @@ -95,9 +96,40 @@ jobs: major, minor, point = map(int, version) return f"{major}.{minor}.{point}" - def generateFixVersionList(jira, projectName, branchName): - cmd = "git tag --list 'hpcc4j_*-release' --sort=-v:refname | head -n 1" - latestVersion = getTagVersionForCmd(cmd) + def createReleaseTagPattern(projectConfig, major = None, minor = None, point = None): + releaseTagPrefix = projectConfig.get('tagPrefix') + releaseTagPostfix = projectConfig.get('tagPostfix') + + if releaseTagPrefix is None or releaseTagPostfix is None: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + releaseTagPattern = releaseTagPrefix + if major is not None: + releaseTagPattern += str(major) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if minor is not None: + releaseTagPattern += str(minor) + '\.' + else: + releaseTagPattern += '[0-9]+\.' + + if point is not None: + releaseTagPattern += str(point) + '(-[0-9]+)?' + else: + releaseTagPattern += '[0-9]+(-[0-9]+)?' + + releaseTagPattern += releaseTagPostfix + '$' + + return releaseTagPattern + + def getLatestSemVer(projectConfig, major = None, minor = None, point = None): + cmd = "git tag --list --sort=-v:refname | grep -E '" + createReleaseTagPattern(projectConfig, major, minor, point) + "' | head -n 1" + return getTagVersionForCmd(cmd) + + def generateFixVersionList(jira, projectConfig, projectName, branchName): + latestVersion = getLatestSemVer(projectConfig) # If we are merging into master we assume it is going into the next minor release fixVersions = [] @@ -110,14 +142,12 @@ jobs: branchVersion = extractVersion(branchVersionMatch.group(1)) # Get latest release in branch - findLatestBranchVer = "git tag --list 'hpcc4j_" + str(branchVersion[0]) + "." + str(branchVersion[1]) + "*-release' --sort=-v:refname | head -n 1" - latestBranchVer = getTagVersionForCmd(findLatestBranchVer) + latestBranchVer = getLatestSemVer(projectConfig, branchVersion[0], branchVersion[1]) curMajor = branchVersion[0] latestMajor = latestVersion[0] while curMajor <= latestMajor: - cmd = "git tag --list 'hpcc4j_" + str(curMajor) + "*-release' --sort=-v:refname | head -n 1" - latestVersionInMajor = getTagVersionForCmd(cmd) + latestVersionInMajor = getLatestSemVer(projectConfig, curMajor) curMinor = 0 if curMajor == branchVersion[0]: @@ -126,7 +156,7 @@ jobs: latestMinor = latestVersionInMajor[1] while curMinor <= latestMinor: - latestPointInMinor = getTagVersionForCmd("git tag --list 'hpcc4j_" + str(curMajor) + "." + str(curMinor) + "*-release' --sort=-v:refname | head -n 1") + latestPointInMinor = getLatestSemVer(projectConfig, curMajor, curMinor) fixVersions.append(buildVersionString([latestPointInMinor[0], latestPointInMinor[1], latestPointInMinor[2] + 2])) curMinor += 2 curMajor += 1 @@ -214,7 +244,20 @@ jobs: github_token = os.environ['GITHUB_TOKEN'] branch_name = os.environ['BRANCH_NAME'] comments_url = os.environ['COMMENTS_URL'] - project_name = 'HPCC4J' + + projectConfig = json.loads(os.environ['PROJECT_CONFIG']) + if not isinstance(projectConfig, dict): + print('Error: PROJECT_CONFIG is not a valid JSON object, aborting.') + sys.exit(1) + + if 'tagPrefix' not in projectConfig or 'tagPostfix' not in projectConfig: + print('Error: PROJECT_CONFIG is missing required fields: tagPrefix and/or tagPostfix') + sys.exit(1) + + project_name = projectConfig.get('projectName') + if project_name is None: + print('Error: PROJECT_CONFIG is missing required field: projectName') + sys.exit(1) result = '' issuem = re.search("(" + project_name + ")-[0-9]+", title, re.IGNORECASE) @@ -230,7 +273,7 @@ jobs: result = 'Jirabot Action Result:\n' - fixVersions = generateFixVersionList(jira, project_name, branch_name) + fixVersions = generateFixVersionList(jira, projectConfig, project_name, branch_name) result += resolveIssue(jira, project_name, issue, fixVersions) jira.issue_add_comment(issue_name, result) From 46453d6e09b0e927834d1ff191542c37fb36b06a Mon Sep 17 00:00:00 2001 From: James McMullan Date: Thu, 12 Sep 2024 09:36:41 -0400 Subject: [PATCH 21/21] HPCC4J-635 Fixed javadoc comment (#755) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../java/org/hpccsystems/dfs/client/RowServiceInputStream.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java index 105075d6f..e2467b066 100644 --- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java +++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java @@ -696,7 +696,7 @@ public int getHandle() /** * The delay in milliseconds between read requests. Primarily used for testing. - * @param sleepTimeMS + * @param sleepTimeMS the sleep time in milliseconds */ public void setReadRequestDelay(int sleepTimeMS) {