Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static boolean canSkipClassLoaderByName(final ClassLoader loader) {
case "org.drools.core.rule.PackageClassLoader":
case "org.drools.wiring.dynamic.PackageClassLoader":
case "org.drools.core.rule.JavaDialectRuntimeData$PackageClassLoader":
case "org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader":
return true;
}
if (CHECK_EXCLUDES) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ class ClassLoaderMatchersTest extends DDSpecification {
loaderName << [
"org.drools.core.rule.PackageClassLoader",
"org.drools.wiring.dynamic.PackageClassLoader",
"org.drools.core.rule.JavaDialectRuntimeData\$PackageClassLoader"
"org.drools.core.rule.JavaDialectRuntimeData\$PackageClassLoader",
"org.drools.wiring.dynamic.DynamicProjectClassLoader\$DefaultInternalTypesClassLoader"
]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ import datadog.trace.config.inversion.ConfigHelper
import example.Person
import org.kie.api.KieServices
import org.kie.api.builder.KieFileSystem
import org.kie.api.definition.type.FactType
import org.kie.api.runtime.KieContainer
import org.kie.api.runtime.KieSession

class DroolsClassLoaderExclusionTest extends InstrumentationSpecification {
private static final String INTERNAL_TYPES_CLASSLOADER_NAME =
"org.drools.wiring.dynamic.DynamicProjectClassLoader\$DefaultInternalTypesClassLoader"

static ConfigHelper.StrictnessPolicy strictness

@Override
Expand Down Expand Up @@ -37,8 +41,12 @@ class DroolsClassLoaderExclusionTest extends InstrumentationSpecification {
ks.newKieBuilder(kfs).buildAll()
KieContainer kc = ks.newKieContainer(ks.getRepository().getDefaultReleaseId())
KieSession ksession = kc.newKieSession()
FactType generatedFactType = ksession.getKieBase().getFactType("example", "GeneratedFact")
boolean hasInternalTypesClassLoader = getClass().classLoader.getResource(
INTERNAL_TYPES_CLASSLOADER_NAME.replace('.', '/') + ".class") != null

when:
Object generatedFact = generatedFactType.newInstance()
Person john = new Person("John", 20)
Person bob = new Person("Bob", 15)

Expand All @@ -50,6 +58,10 @@ class DroolsClassLoaderExclusionTest extends InstrumentationSpecification {
fired == 1
!bob.isAdult()
john.isAdult()
generatedFact.class.name == "example.GeneratedFact"
if (hasInternalTypesClassLoader) {
assert generatedFact.class.classLoader.class.name == INTERNAL_TYPES_CLASSLOADER_NAME
}

and:
// assert we do not transform the generated rule class (RuleInstrumentation would but the classloader should be ignored)
Expand All @@ -59,4 +71,3 @@ class DroolsClassLoaderExclusionTest extends InstrumentationSpecification {
ksession?.dispose()
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package test;

import static net.bytebuddy.matcher.ElementMatchers.isConstructor;

import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import net.bytebuddy.matcher.ElementMatcher;

@AutoService(InstrumenterModule.class)
public class InternalTypesClassLoaderInstrumentation extends InstrumenterModule.Tracing
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {

private static final String INTERNAL_TYPES_CLASSLOADER_NAME =
"org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader";

public InternalTypesClassLoaderInstrumentation() {
super("drools-test");
}

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return new ElementMatcher.Junction.ForNonNullValues<ClassLoader>() {
@Override
protected boolean doMatch(ClassLoader loader) {
return INTERNAL_TYPES_CLASSLOADER_NAME.equals(loader.getClass().getName());
}
};
}

@Override
public String instrumentedType() {
return "example.GeneratedFact";
}

@Override
public void methodAdvice(MethodTransformer transformer) {
transformer.applyAdvice(isConstructor(), "test.ConstructorAdvice");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ package example

import example.Person

declare GeneratedFact
value : String
end

rule "Mark person as adult"
when
$p : Person(age >= 18, adult == false)
Expand Down