You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/08/02 00:41:25 UTC
[skywalking-java] branch byte-buddy created (now 3d2d9b6ad)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch byte-buddy
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
at 3d2d9b6ad * Upgrade byte-buddy to 1.12.13, and adopt byte-buddy APIs changes.
This branch includes the following new commits:
new 3d2d9b6ad * Upgrade byte-buddy to 1.12.13, and adopt byte-buddy APIs changes.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-java] 01/01: * Upgrade byte-buddy to 1.12.13, and adopt byte-buddy APIs changes.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch byte-buddy
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 3d2d9b6ad43ccef8b966c3ebccba2e5712008fed
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Aug 2 08:41:18 2022 +0800
* Upgrade byte-buddy to 1.12.13, and adopt byte-buddy APIs changes.
---
CHANGES.md | 1 +
.../main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java | 4 +++-
dist-material/LICENSE | 2 +-
pom.xml | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
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<AbstractClassEnhancePluginDefine> 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 @@
<lombok.version>1.18.20</lombok.version>
<!-- core lib dependency -->
- <bytebuddy.version>1.11.18</bytebuddy.version>
+ <bytebuddy.version>1.12.13</bytebuddy.version>
<grpc.version>1.44.0</grpc.version>
<gson.version>2.8.6</gson.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>