From 19f0689aa1eb58bbd9afbe8c6bfd93cc9c921c0e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 15 Aug 2025 02:39:02 -0700 Subject: [PATCH] Revert to shadow 8.3.9 (#2107) --- .../contrib/jmxscraper/JmxScraperContainer.java | 6 +++--- .../io/opentelemetry/contrib/jmxscraper/JmxScraper.java | 2 +- settings.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java index 8d06c0d7..d1148fc8 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java @@ -237,8 +237,8 @@ public class JmxScraperContainer extends GenericContainer { } else { Path script = generateShellScript(cmd, config); - this.withCopyFileToContainer(MountableFile.forHostPath(script, 500), "/scraper.sh"); - this.withCommand("/scraper.sh"); + this.withCopyFileToContainer(MountableFile.forHostPath(script), "/scraper.sh"); + this.withCommand("bash", "/scraper.sh"); } logger().info("Starting scraper with command: " + String.join(" ", this.getCommandParts())); @@ -263,7 +263,7 @@ public class JmxScraperContainer extends GenericContainer { logger().info("Scraper executed with /scraper.sh shell script"); for (int i = 0; i < lines.size(); i++) { - logger().info("/scrapper.sh:{} {}", i, lines.get(i)); + logger().info("/scraper.sh:{} {}", i, lines.get(i)); } return script; } diff --git a/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java b/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java index 8bf9f46c..85c47ba0 100644 --- a/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java +++ b/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java @@ -95,7 +95,7 @@ public class JmxScraper { jmxScraper.start(); } } catch (ConfigurationException e) { - logger.log(Level.SEVERE, "invalid configuration ", e); + logger.log(Level.SEVERE, "invalid configuration: " + e.getMessage(), e); System.exit(1); } catch (InvalidArgumentException e) { logger.log(Level.SEVERE, e.getMessage(), e); diff --git a/settings.gradle.kts b/settings.gradle.kts index 00f27fdc..82364bf2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - id("com.gradleup.shadow") version "9.0.1" + id("com.gradleup.shadow") version "8.3.9" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("com.gradle.develocity") version "4.1" }