Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ dependencies {
implementation("org.apache.maven", "maven-aether-provider", "3.3.9")

implementation("com.github.zafarkhaja:java-semver:0.10.2")
implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
implementation(libs.javaparser.symbol.solver)

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed: use value from catalog (missed usage).


implementation("com.google.guava", "guava", "20.0")
implementation(libs.asm)
implementation(libs.asm.tree)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package datadog.trace.plugin.csi;

import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.resolution.TypeSolver;
import datadog.trace.plugin.csi.HasErrors.HasErrorsException;
import datadog.trace.plugin.csi.util.MethodType;
import java.lang.reflect.Executable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import static datadog.trace.plugin.csi.util.CallSiteUtils.classNameToType;
import static datadog.trace.plugin.csi.util.CallSiteUtils.repeat;

import com.github.javaparser.resolution.TypeSolver;
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.resolution.model.SymbolReference;
import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory;
import datadog.trace.plugin.csi.HasErrors.Failure;
import datadog.trace.plugin.csi.TypeResolver;
Expand Down Expand Up @@ -147,7 +147,13 @@ public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveType(final St
final Class<?> clazz = resolveType(type);
return SymbolReference.solved(ReflectionFactory.typeDeclarationFor(clazz, getRoot()));
} catch (final Throwable e) {
return SymbolReference.unsolved(ResolvedReferenceTypeDeclaration.class);
return SymbolReference.unsolved();

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SymbolReference.unsolved(ResolvedReferenceTypeDeclaration.class) declared as Deprecated and internally already calling unsolved().

}
}

@Override
public SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeInModule(
String qualifiedModuleName, String simpleTypeName) {
return tryToSolveType(simpleTypeName);

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implemented new method introduced in latest version of parser. Ignored module name since the main logic is using reflection and is not using module name.

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileCla
com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.24.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.6=codenarc
com.github.javaparser:javaparser-core:3.28.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.10.4=latestDepTestRuntimeClasspath,testRuntimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.0=compileClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0=compileClasspath
com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.0=compileClasspath
com.fasterxml:classmate:1.3.4=compileClasspath
com.github.javaparser:javaparser-core:3.24.4=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.6=codenarc
com.github.javaparser:javaparser-core:3.28.2=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jffi:1.3.15=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.10.4=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/springboot-java-17/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath
com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath
com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath
com.github.javaparser:javaparser-core:3.24.4=testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.6=codenarc
com.github.javaparser:javaparser-core:3.28.2=testRuntimeClasspath
com.github.jnr:jffi:1.3.15=testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath
com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cafe_crypto = "0.1.0"
# Common utils
commons = "3.2"
guava = "[16.0,20.0]" # Last version to support Java 7
javaparser = "3.24.4"
javaparser = "3.28.2"
Comment thread
AlexeyKuznetsov-DD marked this conversation as resolved.
jctools = "4.0.6"
lz4 = "1.11.0"

Expand Down