diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 575d7fa1f..2de013cd3 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -37,7 +37,7 @@ 9.4.2.v20170220 1.14.0 20.0 - 1.9.2 + 1.9.16 3.3.6 2.6.0 2.0.7.Final diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java index 90753a5e1..00aa7f6d8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java @@ -90,8 +90,8 @@ public class BootstrapInstrumentBoost { } /** - * This strategy is no longer available after Java 11. - * Inject the classes into bootstrap class loader. + * Inject the classes into bootstrap class loader by using Unsafe Strategy. + * ByteBuddy adapts the sun.misc.Unsafe and jdk.internal.misc.Unsafe automatically. */ ClassInjector.UsingUnsafe.ofBootLoader().injectRaw(classesTypeMap); agentBuilder = agentBuilder.enableUnsafeBootstrapInjection(); diff --git a/docs/en/setup/service-agent/java-agent/README.md b/docs/en/setup/service-agent/java-agent/README.md index 3b5838b34..9aaf01fbf 100644 --- a/docs/en/setup/service-agent/java-agent/README.md +++ b/docs/en/setup/service-agent/java-agent/README.md @@ -1,5 +1,5 @@ # Setup java agent -1. Agent is available for JDK 1.6 - 11. +1. Agent is available for JDK 1.6 - 12. 1. Find `agent` folder in SkyWalking release package 1. Set `agent.service_name` in `config/agent.config`. Could be any String in English. 1. Set `collector.backend_service` in `config/agent.config`. Default point to `127.0.0.1:11800`, only works for local backend. @@ -20,7 +20,10 @@ The agent release dist is included in Apache [official release](http://skywalkin apm-feign-default-http-9.x.jar apm-httpClient-4.x-plugin.jar ..... - +--- logs + +-- optional-plugins + apm-gson-2.x-plugin.jar + ..... + +-- logs skywalking-agent.jar ```