Eliminating some more forbidden APIs

Author: eyalkoren

modules/ingest-otel/src/test/java/org/elasticsearch/ingest/otel/OTelSemConvWebCrawler.java

@@ -9,6 +9,8 @@
 
 package org.elasticsearch.ingest.otel;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
@@ -44,6 +46,8 @@ class OTelSemConvWebCrawler {
 
     private static final String GITHUB_TOKEN = System.getenv("GITHUB_TOKEN");
 
+    private static final Logger logger = LogManager.getLogger(OTelSemConvWebCrawler.class);
+
     /**
      * Relies on GitHub API to crawl the OpenTelemetry semantic conventions repo.
      * This method blocks until all resource attributes are collected, which may take a while.
@@ -142,15 +146,15 @@ private static Stream<String> findAllYamlFiles(HttpClient client) {
                                             }
                                         }
                                     } else if (response.statusCode() == 403) {
-                                        System.err.println(
+                                        logger.error(
                                             "GitHub API rate limit exceeded. "
                                                 + "Please provide a GitHub token via GITHUB_TOKEN environment variable"
                                         );
                                     } else {
-                                        System.err.println("GitHub API request failed: HTTP " + response.statusCode());
+                                        logErrorHttpStatusCode(response);
                                     }
                                 } catch (IOException e) {
-                                    System.err.println("Error processing response: " + e.getMessage());
+                                    logger.error("Error processing response: {}", e.getMessage());
                                 }
                                 return null;
                             });
@@ -204,6 +208,10 @@ public boolean tryAdvance(Consumer<? super String> action) {
         });
     }
 
+    private static void logErrorHttpStatusCode(HttpResponse<InputStream> response) {
+        logger.error("GitHub API request failed: HTTP {}", response.statusCode());
+    }
+
     private static CompletableFuture<Set<String>> extractResourceAttributesFromFile(String fileDownloadUrl, HttpClient httpClient) {
         return downloadAndParseYaml(fileDownloadUrl, httpClient).thenApply(yamlData -> {
             Set<String> resourceAttributes = new HashSet<>();
@@ -261,21 +269,22 @@ private static HttpRequest createRequest(String currentUrl) {
     private static CompletableFuture<Map<String, Object>> downloadAndParseYaml(String rawFileUrl, HttpClient client) {
         HttpRequest request = HttpRequest.newBuilder(URI.create(rawFileUrl)).build();
         CompletableFuture<HttpResponse<InputStream>> responseFuture = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream());
-        return responseFuture.thenApply(response -> {
-            try (
-                InputStream inputStream = response.body();
-                XContentParser parser = XContentFactory.xContent(XContentType.YAML)
-                    .createParser(XContentParserConfiguration.EMPTY, inputStream)
-            ) {
-                return parser.map();
-            } catch (IOException e) {
-                System.err.println("Error parsing YAML file: " + e.getMessage());
-                return Map.of();
-            } finally {
-                if (response.statusCode() != 200) {
-                    System.err.println("GitHub API request failed: HTTP " + response.statusCode());
-                }
+        return responseFuture.thenApply(OTelSemConvWebCrawler::apply);
+    }
+
+    private static Map<String, Object> apply(HttpResponse<InputStream> response) {
+        try (
+            InputStream inputStream = response.body();
+            XContentParser parser = XContentFactory.xContent(XContentType.YAML).createParser(XContentParserConfiguration.EMPTY, inputStream)
+        ) {
+            return parser.map();
+        } catch (IOException e) {
+            logger.error("Error parsing YAML file: {}", e.getMessage());
+            return Map.of();
+        } finally {
+            if (response.statusCode() != 200) {
+                logErrorHttpStatusCode(response);
             }
-        });
+        }
     }
 }

modules/ingest-otel/src/test/java/org/elasticsearch/ingest/otel/ResourceAttributesTests.java

@@ -11,11 +11,13 @@
 
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.test.ESTestCase;
+import org.junit.Ignore;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+//@Ignore
 public class ResourceAttributesTests extends ESTestCase {
 
     @SuppressForbidden(reason = "Used specifically for the output. Only meant to be run manually, not through CI.")
@@ -53,7 +55,9 @@ public void testAttributesSetUpToDate() {
         assertTrue("ECS-to-OTel resource attributes set is not up to date.", upToDate);
     }
 
-    @SuppressForbidden(reason = "Output is used for updating the resource attributes set, not running in the normal PR CI build pipeline")
+    @SuppressForbidden(
+        reason = "Output is used for updating the resource attributes set. Running nightly and only prints when not up to date."
+    )
     private static void printComparisonResults(Set<String> latestEcsOTelResourceAttributes) {
         // find and print the diff
         Set<String> addedAttributes = new HashSet<>(latestEcsOTelResourceAttributes);

server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java

@@ -683,7 +683,7 @@ private static LinearizabilityChecker.Event readEvent(StreamInput input) throws
     @SuppressForbidden(reason = "system err is ok for a command line tool")
     public static void main(String[] args) throws Exception {
         if (args.length < 3) {
-            System.err.println("usage: <file> <primaryTerm> <seqNo>");
+            logger.error("usage: <file> <primaryTerm> <seqNo>");
         } else {
             runLinearizabilityChecker(new FileInputStream(args[0]), Long.parseLong(args[1]), Long.parseLong(args[2]));
         }

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/mvdedupe/MultivalueDedupeTests.java

@@ -465,7 +465,7 @@ private void assertLookup(
             for (int i = start; i < end; i++) {
                 actualValues.add(valueLookup.apply(lookup.getInt(i) - 1));
             }
-            // System.err.println(actualValues + " " +
+            // logger.error(actualValues + " " +
             // v.stream().filter(contained::contains).collect(Collectors.toCollection(TreeSet::new)));
             assertThat(actualValues, equalTo(v.stream().filter(contained::contains).collect(Collectors.toCollection(TreeSet::new))));
         }