diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 01b70cd040..ed109c1c69 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") compileOnly("io.opentelemetry:opentelemetry-extension-trace-propagators") - implementation("com.github.oshi:oshi-core:7.6.1") { + implementation("com.github.oshi:oshi-core:7.7.0") { exclude("org.slf4j", "slf4j-api") } diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index a4df97e34d..6b1d277c8c 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -21,8 +21,8 @@ com.fasterxml.jackson.core:jackson-core:2.22.3=runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.22.3=runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.3=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath -com.github.oshi:oshi-common:7.6.1=runtimeClasspath -com.github.oshi:oshi-core:7.6.1=runtimeClasspath +com.github.oshi:oshi-common:7.7.0=runtimeClasspath +com.github.oshi:oshi-core:7.7.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath com.microsoft.azure:msal4j:1.23.1=runtimeClasspath diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 563c7e9a88..2fb9de7dc9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-gradle-plugin` `kotlin-dsl` // When updating, update below in dependencies too - id("com.diffplug.spotless") version "8.10.2" + id("com.diffplug.spotless") version "8.10.3" } spotless { @@ -30,8 +30,8 @@ dependencies { implementation(gradleApi()) // When updating, update above in plugins too - implementation("com.diffplug.spotless:spotless-plugin-gradle:8.10.2") - implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.11") + implementation("com.diffplug.spotless:spotless-plugin-gradle:8.10.3") + implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.12") implementation("com.gradleup.shadow:shadow-gradle-plugin:9.6.1") implementation("org.owasp:dependency-check-gradle:13.0.0") diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index e9975a7c95..71402f2947 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -382,12 +382,12 @@ > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**74** **Group:** `com.github.oshi` **Name:** `oshi-common` **Version:** `7.6.1` +**74** **Group:** `com.github.oshi` **Name:** `oshi-common` **Version:** `7.7.0` > - **Manifest Project URL**: [https://github.com/oshi/oshi/oshi-common](https://github.com/oshi/oshi/oshi-common) > - **Manifest License**: [https://opensource.org/licenses/MIT](MIT License) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**75** **Group:** `com.github.oshi` **Name:** `oshi-core` **Version:** `7.6.1` +**75** **Group:** `com.github.oshi` **Name:** `oshi-core` **Version:** `7.7.0` > - **Manifest Project URL**: [https://github.com/oshi/oshi/oshi-core](https://github.com/oshi/oshi/oshi-core) > - **Manifest License**: [https://opensource.org/licenses/MIT](MIT License) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) diff --git a/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java b/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java index 8b7b5a952a..93f76e2cdc 100644 --- a/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java +++ b/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java @@ -21,10 +21,11 @@ public class TestController { private static final File AGENT_JAR = getAgentJarFile(); private static final long ONE_MEGABYTE = 1024 * 1024; - // current jar size 37872243 version 3.4.18 - // there was a 4mb bump from 3.6.1 to 3.6.2 due to bytebuddy 1.15.5 becoming a multi-release jar - // which effectively doubled the size of the bytebuddy jar from 4mb to 8mb - private static final long CURRENT_AGENT_JAR_SIZE = 43798057; + // size of the unsigned agent jar built by CI (released jars are ~3mb larger due to code signing) + // measured on 3.7.10-SNAPSHOT (otel instrumentation 2.31.1, oshi 7.7.0) + // growth since the previous baseline (43798057, set in 3.6.2) is mostly from upstream otel + // instrumentation and protobuf, which upstream started bundling in 2.28 + private static final long CURRENT_AGENT_JAR_SIZE = 44848880; @GetMapping("/") public String root() { diff --git a/smoke-tests/framework/build.gradle.kts b/smoke-tests/framework/build.gradle.kts index 8ad3a139a4..892733f796 100644 --- a/smoke-tests/framework/build.gradle.kts +++ b/smoke-tests/framework/build.gradle.kts @@ -11,7 +11,7 @@ tasks { dependencies { implementation("com.google.guava:guava") implementation("org.junit.jupiter:junit-jupiter") - implementation("org.apache.commons:commons-lang3:3.20.0") + implementation("org.apache.commons:commons-lang3:3.21.0") implementation("com.google.code.gson:gson") implementation("org.apache.httpcomponents:httpclient:4.5.14") @@ -19,7 +19,7 @@ dependencies { implementation("org.eclipse.jetty:jetty-servlet:10.0.26") implementation("org.mock-server:mockserver-netty:5.15.0:shaded") - implementation("io.opentelemetry.proto:opentelemetry-proto:1.11.0-alpha") + implementation("io.opentelemetry.proto:opentelemetry-proto:1.11.1-alpha") // this is exposed in SmokeTestExtension API api("org.testcontainers:testcontainers:2.0.5")