Implement logs retriever pagination using new Elasticsearch Java client

.gitignore

@@ -53,3 +53,6 @@ private/
 agent.jar
 local.pid
 
+.env
+
+

pom.xml

@@ -25,7 +25,7 @@
         <opentelemetry.version>1.11.0</opentelemetry.version>
         <opentelemetry-alpha.version>1.11.0-alpha</opentelemetry-alpha.version>
         <useBeta>true</useBeta>
-        <elasticstack.version>7.16.3</elasticstack.version>
+        <elasticstack.version>8.0.0</elasticstack.version>
     </properties>
     <name>OpenTelemetry Plugin</name>
     <description>Publish Jenkins metrics to an OpenTelemetry endpoint, including distributed traces of job executions and health metrics of the controller.</description>
@@ -61,16 +61,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <!--
-                conflict between io.opentelemetry:opentelemetry-sdk-extension-aws and io.jenkins.configuration-as-code:test-harness
-                -->
-                <groupId>com.fasterxml.jackson</groupId>
-                <artifactId>jackson-bom</artifactId>
-                <version>2.13.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <!-- okhttp:4.9.3 -> okio:2.8.0 versus okhttp:4.9.3 -> okio:2.8.0 - kotlin-stdlib-->
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -229,6 +219,10 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jackson2-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
@@ -341,16 +335,11 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
             <version>${elasticstack.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>net.sf.jopt-simple</groupId>
-                    <artifactId>jopt-simple</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-testing</artifactId>
@@ -443,12 +432,6 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
-                <!--
-                <exclusion>
-                    <groupId>org.jenkins-ci.plugins</groupId>
-                    <artifactId>jackson2-api</artifactId>
-                </exclusion>
-                -->
                 <exclusion>
                     <groupId>com.fasterxml.jackson.datatype</groupId>
                     <artifactId>jackson-datatype-json-org</artifactId>

src/main/java/co/elastic/clients/json/jackson/JsonProviderUtils.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright The Original Author or Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package co.elastic.clients.json.jackson;
+
+import jakarta.json.spi.JsonProvider;
+
+/**
+ * Workaround
+ * <code><pre>
+ * java.lang.ClassNotFoundException: org.glassfish.json.JsonProviderImpl
+ * 	at jenkins.util.AntClassLoader.findClassInComponents(AntClassLoader.java:1387)
+ * 	at jenkins.util.AntClassLoader.findClass(AntClassLoader.java:1342)
+ * 	at jenkins.util.AntClassLoader.loadClass(AntClassLoader.java:1089)
+ * 	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522)
+ * 	at java.base/java.lang.Class.forName0(Native Method)
+ * 	at java.base/java.lang.Class.forName(Class.java:315)
+ * 	at jakarta.json.spi.JsonProvider.provider(JsonProvider.java:72)
+ * Caused: jakarta.json.JsonException: Provider org.glassfish.json.JsonProviderImpl not found
+ * 	at jakarta.json.spi.JsonProvider.provider(JsonProvider.java:75)
+ * 	at co.elastic.clients.json.jackson.JsonValueParser.<init>(JsonValueParser.java:39)
+ * 	at co.elastic.clients.json.jackson.JacksonJsonpParser.getValue(JacksonJsonpParser.java:233)
+ * 	at co.elastic.clients.json.JsonData.from(JsonData.java:96)
+ * 	at co.elastic.clients.json.JsonpDeserializer$2.deserialize(JsonpDeserializer.java:112)
+ * 	at co.elastic.clients.elasticsearch._types.ErrorCause.lambda$setupErrorCauseDeserializer$0(ErrorCause.java:391)
+ * 	at co.elastic.clients.json.ObjectDeserializer.parseUnknownField(ObjectDeserializer.java:205)
+ * 	at co.elastic.clients.json.ObjectDeserializer.deserialize(ObjectDeserializer.java:174)
+ * 	at co.elastic.clients.json.ObjectDeserializer.deserialize(ObjectDeserializer.java:137)
+ * 	at co.elastic.clients.json.ObjectBuilderDeserializer.deserialize(ObjectBuilderDeserializer.java:85)
+ * 	at co.elastic.clients.json.DelegatingDeserializer$SameType.deserialize(DelegatingDeserializer.java:48)
+ * 	at co.elastic.clients.json.JsonpDeserializerBase$ArrayDeserializer.deserialize(JsonpDeserializerBase.java:320)
+ * 	at co.elastic.clients.json.JsonpDeserializerBase$ArrayDeserializer.deserialize(JsonpDeserializerBase.java:285)
+ * 	at co.elastic.clients.json.JsonpDeserializer.deserialize(JsonpDeserializer.java:75)
+ * 	at co.elastic.clients.json.ObjectDeserializer$FieldObjectDeserializer.deserialize(ObjectDeserializer.java:72)
+ * 	at co.elastic.clients.json.ObjectDeserializer.deserialize(ObjectDeserializer.java:176)
+ * 	at co.elastic.clients.json.ObjectDeserializer.deserialize(ObjectDeserializer.java:137)
+ * 	at co.elastic.clients.json.JsonpDeserializer.deserialize(JsonpDeserializer.java:75)
+ * 	at co.elastic.clients.json.ObjectBuilderDeserializer.deserialize(ObjectBuilderDeserializer.java:79)
+ * 	at co.elastic.clients.json.DelegatingDeserializer$SameType.deserialize(DelegatingDeserializer.java:43)
+ * 	at co.elastic.clients.json.ObjectDeserializer$FieldObjectDeserializer.deserialize(ObjectDeserializer.java:72)
+ * 	at co.elastic.clients.json.ObjectDeserializer.deserialize(ObjectDeserializer.java:176)
+ * 	at co.elastic.clients.json.ObjectDeserializer.deserialize(ObjectDeserializer.java:137)
+ * 	at co.elastic.clients.json.JsonpDeserializer.deserialize(JsonpDeserializer.java:75)
+ * 	at co.elastic.clients.json.ObjectBuilderDeserializer.deserialize(ObjectBuilderDeserializer.java:79)
+ * 	at co.elastic.clients.json.DelegatingDeserializer$SameType.deserialize(DelegatingDeserializer.java:43)
+ * 	at co.elastic.clients.transport.rest_client.RestClientTransport.getHighLevelResponse(RestClientTransport.java:276)
+ * 	at co.elastic.clients.transport.rest_client.RestClientTransport.performRequest(RestClientTransport.java:144)
+ * 	at co.elastic.clients.elasticsearch.ElasticsearchClient.search(ElasticsearchClient.java:1487)
+ * 	at io.jenkins.plugins.opentelemetry.backend.elastic.ElasticsearchLogStorageScrollingRetriever.overallLog(ElasticsearchLogStorageScrollingRetriever.java:113)
+ * 	at io.jenkins.plugins.opentelemetry.job.log.OtelLogStorage.overallLog(OtelLogStorage.java:98)
+ * 	at org.jenkinsci.plugins.workflow.job.WorkflowRun.getLogText(WorkflowRun.java:1057)
+ * 	at hudson.model.Run.writeLogTo(Run.java:1554)
+ * 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ * 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+ * 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ * 	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
+ * </pre></code>
+ */
+public class JsonProviderUtils {
+    public static JsonProvider provider(ClassLoader classLoader) {
+        return new org.eclipse.parsson.JsonProviderImpl();
+    }
+}

src/main/java/co/elastic/clients/json/jackson/JsonValueParser.java

@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.json.jackson;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonParsingException;
+
+import java.io.IOException;
+
+/**
+ * Fork of  co.elastic.clients.json.jackson.JsonValueParser to work around a classloader issue using
+ * co.elastic.clients.json.jackson.JsonProviderUtils
+ * ---
+ * Reads a Jsonp value/object/array from a Jackson parser. The parser's current token should be the start of the
+ * object (e.g. START_OBJECT, VALUE_NUMBER, etc).
+ */
+class JsonValueParser {
+    private final JsonProvider provider = JsonProviderUtils.provider(JsonValueParser.class.getClassLoader());
+
+    public JsonObject parseObject(JsonParser parser) throws IOException {
+
+        JsonObjectBuilder ob = provider.createObjectBuilder();
+
+        JsonToken token;
+        while((token = parser.nextToken()) != JsonToken.END_OBJECT) {
+            if (token != JsonToken.FIELD_NAME) {
+                throw new JsonParsingException("Expected a property name", new JacksonJsonpLocation(parser));
+            }
+            String name = parser.getCurrentName();
+            parser.nextToken();
+            ob.add(name, parseValue(parser));
+        }
+        return ob.build();
+    }
+
+    public JsonArray parseArray(JsonParser parser) throws IOException {
+        JsonArrayBuilder ab = provider.createArrayBuilder();
+
+        while(parser.nextToken() != JsonToken.END_ARRAY) {
+            ab.add(parseValue(parser));
+        }
+        return ab.build();
+    }
+
+    public JsonValue parseValue(JsonParser parser) throws IOException {
+        switch (parser.currentToken()) {
+            case START_OBJECT:
+                return parseObject(parser);
+
+            case START_ARRAY:
+                return parseArray(parser);
+
+            case VALUE_TRUE:
+                return JsonValue.TRUE;
+
+            case VALUE_FALSE:
+                return JsonValue.FALSE;
+
+            case VALUE_NULL:
+                return JsonValue.NULL;
+
+            case VALUE_STRING:
+                return provider.createValue(parser.getText());
+
+            case VALUE_NUMBER_FLOAT:
+            case VALUE_NUMBER_INT:
+                switch(parser.getNumberType()) {
+                    case INT:
+                        return provider.createValue(parser.getIntValue());
+                    case LONG:
+                        return provider.createValue(parser.getLongValue());
+                    case FLOAT:
+                    case DOUBLE:
+                        return provider.createValue(parser.getDoubleValue());
+                    case BIG_DECIMAL:
+                        return provider.createValue(parser.getDecimalValue());
+                    case BIG_INTEGER:
+                        return provider.createValue(parser.getBigIntegerValue());
+                }
+
+            default:
+                throw new JsonParsingException("Unexpected token '" + parser.currentToken() + "'", new JacksonJsonpLocation(parser));
+
+        }
+    }
+}