Skip to content

fix ClassCircularityError #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lujiajing1126 wants to merge 2 commits into from
Closed

fix ClassCircularityError #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d16ca58
fix ClassCircularityError
lujiajing1126 Sep 23, 2024
96b50f7
revert style
lujiajing1126 Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Release Notes.

* Upgrade nats plugin to support 2.16.5
* Add agent self-observability.

* Update ByteBuddy to 1.15.1 and resolve the ClassCircularityError.

All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1)

Expand Down
19 changes: 19 additions & 0 deletions apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,25 @@
public class SkyWalkingAgent {
private static ILog LOGGER = LogManager.getLogger(SkyWalkingAgent.class);

static {
circularityErrorWorkaround();
}

/**
* <a href="https://github.com/DataDog/dd-trace-java/pull/4865">Follow the idea from dd-trace-java</a> to resolve
* the ClassCircularityError introduced in ByteBuddy >= 1.12.11.
*
* @see <a href="https://github.com/apache/skywalking/discussions/12572">Occational ClassCircularityError</a>
*/
private static void circularityErrorWorkaround() {
// these classes have been involved in intermittent ClassCircularityErrors during startup
// they don't need context storage, so it's safe to load them before installing the agent
try {
Class.forName("java.util.concurrent.ThreadLocalRandom");
} catch (Throwable ignore) {
}
}

/**
* Main entrance. Use byte-buddy transform to enhance all classes, which define in plugins.
*/
Expand Down
2 changes: 1 addition & 1 deletion dist-material/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.9: http://bytebuddy.net/ , Apache 2.0
raphw (byte-buddy) 1.15.1: http://bytebuddy.net/ , Apache 2.0
Google: grpc-java 1.53.0: https://github.com/grpc/grpc-java, Apache 2.0
Google: gson 2.8.9: https://github.com/google/gson , Apache 2.0
Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<lombok.version>1.18.30</lombok.version>

<!-- core lib dependency -->
<bytebuddy.version>1.14.9</bytebuddy.version>
<bytebuddy.version>1.15.1</bytebuddy.version>
<grpc.version>1.53.0</grpc.version>
<netty.version>4.1.100.Final</netty.version>
<gson.version>2.8.9</gson.version>
Expand Down