Skip to content

Commit 19f0689

Browse files
authored
Revert to shadow 8.3.9 (#2107)
1 parent e4093f4 commit 19f0689

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ public void start() {
237237
} else {
238238
Path script = generateShellScript(cmd, config);
239239

240-
this.withCopyFileToContainer(MountableFile.forHostPath(script, 500), "/scraper.sh");
241-
this.withCommand("/scraper.sh");
240+
this.withCopyFileToContainer(MountableFile.forHostPath(script), "/scraper.sh");
241+
this.withCommand("bash", "/scraper.sh");
242242
}
243243

244244
logger().info("Starting scraper with command: " + String.join(" ", this.getCommandParts()));
@@ -263,7 +263,7 @@ private Path generateShellScript(List<String> cmd, Map<String, String> config) {
263263

264264
logger().info("Scraper executed with /scraper.sh shell script");
265265
for (int i = 0; i < lines.size(); i++) {
266-
logger().info("/scrapper.sh:{} {}", i, lines.get(i));
266+
logger().info("/scraper.sh:{} {}", i, lines.get(i));
267267
}
268268
return script;
269269
}

jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void main(String[] args) {
9595
jmxScraper.start();
9696
}
9797
} catch (ConfigurationException e) {
98-
logger.log(Level.SEVERE, "invalid configuration ", e);
98+
logger.log(Level.SEVERE, "invalid configuration: " + e.getMessage(), e);
9999
System.exit(1);
100100
} catch (InvalidArgumentException e) {
101101
logger.log(Level.SEVERE, e.getMessage(), e);

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginManagement {
22
plugins {
3-
id("com.gradleup.shadow") version "9.0.1"
3+
id("com.gradleup.shadow") version "8.3.9"
44
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
55
id("com.gradle.develocity") version "4.1"
66
}

0 commit comments

Comments
 (0)