diff --git a/CHANGES.md b/CHANGES.md index e9a2b9afb..479672343 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Release Notes. * Add plugin to support hutool-http 5.x. * Add plugin to support Tomcat 10.x. * Save http status code regardless of it's status. +* Upgrade byte-buddy to 1.12.13, and adopt byte-buddy APIs changes. #### Documentation diff --git a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java index 57a11e9f3..38b6e1b8f 100644 --- a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java +++ b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java @@ -19,6 +19,7 @@ package org.apache.skywalking.apm.agent; import java.lang.instrument.Instrumentation; +import java.security.ProtectionDomain; import java.util.Collections; import java.util.List; import java.util.Map; @@ -153,7 +154,8 @@ public class SkyWalkingAgent { public DynamicType.Builder transform(final DynamicType.Builder builder, final TypeDescription typeDescription, final ClassLoader classLoader, - final JavaModule module) { + final JavaModule javaModule, + final ProtectionDomain protectionDomain) { LoadedLibraryCollector.registerURLClassLoader(classLoader); List pluginDefines = pluginFinder.find(typeDescription); if (pluginDefines.size() > 0) { diff --git a/dist-material/LICENSE b/dist-material/LICENSE index d4c3372eb..8eb4b6b11 100755 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -215,7 +215,7 @@ Apache 2.0 licenses The following components are provided under the Apache License. See project link for details. The text of each license is the standard Apache 2.0 license. - raphw (byte-buddy) 1.11.18: http://bytebuddy.net/ , Apache 2.0 + raphw (byte-buddy) 1.12.13: http://bytebuddy.net/ , Apache 2.0 Google: grpc-java 1.44.0: https://github.com/grpc/grpc-java, Apache 2.0 Google: gson 2.8.6: https://github.com/google/gson , Apache 2.0 Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0 diff --git a/pom.xml b/pom.xml index 27d80100a..87d384cf8 100755 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 1.18.20 - 1.11.18 + 1.12.13 1.44.0 2.8.6 1.6.2