From 1697a8f830f4f2971c5e6523de2a7fd3298e8131 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 1 Jun 2021 15:40:55 -0700 Subject: [PATCH] Fix agent jar size (#1724) * Fix agent jar size * Bump version --- CHANGELOG.md | 3 +++ agent/agent-tooling/build.gradle | 2 +- .../dependency-locks/runtimeClasspath.lockfile | 17 +++++------------ .../dependency-locks/runtimeClasspath.lockfile | 17 +++++------------ gradle.properties | 2 +- 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb854e552a6..11546f3910d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # CHANGELOG +# Version 3.1.1-BETA.4 +* Reduce agent jar file size back to normal [#1716](https://github.com/microsoft/ApplicationInsights-Java/pull/1716). + # Version 3.1.1-BETA.3 * Fix memory leak caused by not removing Netty listeners [upstream #2705](https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2705) * Improve Azure Service Bus support [#1710](https://github.com/microsoft/ApplicationInsights-Java/pull/1710). diff --git a/agent/agent-tooling/build.gradle b/agent/agent-tooling/build.gradle index 0c597bdb1ad..c3e5dbb9299 100644 --- a/agent/agent-tooling/build.gradle +++ b/agent/agent-tooling/build.gradle @@ -50,7 +50,7 @@ dependencies { exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-otlp-metrics' exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-prometheus' exclude group: 'io.opentelemetry', module: 'opentelemetry-exporter-zipkin' - exclude group: 'io.grpc', module: 'grpc-netty' + exclude group: 'io.grpc', module: 'grpc-netty-shaded' } implementation group: 'io.opentelemetry.javaagent', name: 'opentelemetry-javaagent-extension-api', version: versions.opentelemetryInstrumentationAlpha implementation group: 'net.bytebuddy', name: 'byte-buddy', version: versions.bytebuddy diff --git a/agent/agent-tooling/gradle/dependency-locks/runtimeClasspath.lockfile b/agent/agent-tooling/gradle/dependency-locks/runtimeClasspath.lockfile index 86021c4a800..44cd39fb102 100644 --- a/agent/agent-tooling/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/agent/agent-tooling/gradle/dependency-locks/runtimeClasspath.lockfile @@ -6,12 +6,11 @@ ch.qos.logback.contrib:logback-json-core:0.1.5 ch.qos.logback:logback-classic:1.2.3 ch.qos.logback:logback-core:1.2.3 com.github.oshi:oshi-core:5.6.0 -com.google.android:annotations:4.1.1.4 -com.google.auto.service:auto-service-annotations:1.0-rc7 -com.google.auto.service:auto-service:1.0-rc7 -com.google.auto:auto-common:0.10 +com.google.auto.service:auto-service-annotations:1.0 +com.google.auto.service:auto-service:1.0 +com.google.auto:auto-common:1.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.code.gson:gson:2.8.6 +com.google.code.gson:gson:2.8.2 com.google.errorprone:error_prone_annotations:2.5.1 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:30.1.1-jre @@ -22,10 +21,6 @@ com.squareup.okio:okio:1.16.0 commons-codec:commons-codec:1.13 commons-io:commons-io:2.7 commons-logging:commons-logging:1.2 -io.grpc:grpc-api:1.35.1 -io.grpc:grpc-context:1.35.1 -io.grpc:grpc-core:1.35.1 -io.grpc:grpc-netty-shaded:1.35.1 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.2.0+ai.patch.1-alpha io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.2.0+ai.patch.1-alpha io.opentelemetry.javaagent:opentelemetry-javaagent-api:1.2.0+ai.patch.1-alpha @@ -46,8 +41,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.2.0-alpha io.opentelemetry:opentelemetry-sdk-trace:1.2.0 io.opentelemetry:opentelemetry-sdk:1.2.0 io.opentelemetry:opentelemetry-semconv:1.2.0-alpha -io.perfmark:perfmark-api:0.23.0 -io.prometheus:simpleclient:0.9.0 +io.prometheus:simpleclient:0.10.0 io.prometheus:simpleclient_common:0.9.0 io.prometheus:simpleclient_httpserver:0.9.0 net.bytebuddy:byte-buddy-agent:1.10.18 @@ -59,7 +53,6 @@ org.apache.commons:commons-text:1.9 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.13 org.checkerframework:checker-qual:3.12.0 -org.codehaus.mojo:animal-sniffer-annotations:1.19 org.jctools:jctools-core:3.3.0 org.jetbrains.kotlin:kotlin-bom:1.4.21 org.slf4j:jcl-over-slf4j:1.7.30 diff --git a/agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile b/agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile index 644c3679e72..4a6ae5e5c05 100644 --- a/agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile @@ -7,12 +7,11 @@ ch.qos.logback:logback-classic:1.2.3 ch.qos.logback:logback-core:1.2.3 com.azure:azure-core-tracing-opentelemetry:1.0.0-beta.8 com.github.oshi:oshi-core:5.6.0 -com.google.android:annotations:4.1.1.4 -com.google.auto.service:auto-service-annotations:1.0-rc7 -com.google.auto.service:auto-service:1.0-rc7 -com.google.auto:auto-common:0.10 +com.google.auto.service:auto-service-annotations:1.0 +com.google.auto.service:auto-service:1.0 +com.google.auto:auto-common:1.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.code.gson:gson:2.8.6 +com.google.code.gson:gson:2.8.2 com.google.errorprone:error_prone_annotations:2.5.1 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:30.1.1-jre @@ -23,10 +22,6 @@ com.squareup.okio:okio:1.16.0 commons-codec:commons-codec:1.13 commons-io:commons-io:2.7 commons-logging:commons-logging:1.2 -io.grpc:grpc-api:1.35.1 -io.grpc:grpc-context:1.35.1 -io.grpc:grpc-core:1.35.1 -io.grpc:grpc-netty-shaded:1.35.1 io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:1.2.0+ai.patch.1-alpha io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-caching:1.2.0+ai.patch.1-alpha io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.2.0+ai.patch.1-alpha @@ -128,8 +123,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.2.0-alpha io.opentelemetry:opentelemetry-sdk-trace:1.2.0 io.opentelemetry:opentelemetry-sdk:1.2.0 io.opentelemetry:opentelemetry-semconv:1.2.0-alpha -io.perfmark:perfmark-api:0.23.0 -io.prometheus:simpleclient:0.9.0 +io.prometheus:simpleclient:0.10.0 io.prometheus:simpleclient_common:0.9.0 io.prometheus:simpleclient_httpserver:0.9.0 net.bytebuddy:byte-buddy-agent:1.10.18 @@ -141,7 +135,6 @@ org.apache.commons:commons-text:1.9 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.13 org.checkerframework:checker-qual:3.12.0 -org.codehaus.mojo:animal-sniffer-annotations:1.19 org.jctools:jctools-core:3.3.0 org.jetbrains.kotlin:kotlin-bom:1.4.21 org.slf4j:jcl-over-slf4j:1.7.30 diff --git a/gradle.properties b/gradle.properties index 326b6bd3be3..26ef810cb8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ // Project properties -version=3.1.1-BETA.3 +version=3.1.1-BETA.4 group=com.microsoft.azure \ No newline at end of file