open-telemetry
/
opentelemetry-java-contrib
mirror of https://github.com/open-telemetry/opentelemetry-java-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert to shadow 8.3.9 (#2107)

This commit is contained in:
Trask Stalnaker 2025-08-15 02:39:02 -07:00 committed by GitHub
parent e4093f49f6
commit 19f0689aa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,8 +237,8 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
} else { } else {
Path script = generateShellScript(cmd, config); Path script = generateShellScript(cmd, config);
this.withCopyFileToContainer(MountableFile.forHostPath(script, 500), "/scraper.sh"); this.withCopyFileToContainer(MountableFile.forHostPath(script), "/scraper.sh");
this.withCommand("/scraper.sh"); this.withCommand("bash", "/scraper.sh");
} }
logger().info("Starting scraper with command: " + String.join(" ", this.getCommandParts())); logger().info("Starting scraper with command: " + String.join(" ", this.getCommandParts()));
@ -263,7 +263,7 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
logger().info("Scraper executed with /scraper.sh shell script"); logger().info("Scraper executed with /scraper.sh shell script");
for (int i = 0; i < lines.size(); i++) { 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; return script;
} }

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

@ -95,7 +95,7 @@ public class JmxScraper {
jmxScraper.start(); jmxScraper.start();
} }
} catch (ConfigurationException e) { } catch (ConfigurationException e) {
logger.log(Level.SEVERE, "invalid configuration ", e); logger.log(Level.SEVERE, "invalid configuration: " + e.getMessage(), e);
System.exit(1); System.exit(1);
} catch (InvalidArgumentException e) { } catch (InvalidArgumentException e) {
logger.log(Level.SEVERE, e.getMessage(), e); logger.log(Level.SEVERE, e.getMessage(), e);

2
settings.gradle.kts
View File

@ -1,6 +1,6 @@
pluginManagement { pluginManagement {
plugins { 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("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("com.gradle.develocity") version "4.1" id("com.gradle.develocity") version "4.1"
} }