Skip to content
Draft
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
7 changes: 7 additions & 0 deletions internal-api/internal-api-9/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ listOf(JavaCompile::class.java, GroovyCompile::class.java).forEach { compileTask

extra["minimumBranchCoverage"] = 0.8
extra["minimumInstructionCoverage"] = 0.8
// Remaining uncovered code is JVM-specific fallbacks (ProcessHandle failures, IBM J9 frame mapping)
// that cannot be reached on the test JVMs.
extra["excludedClassesCoverage"] = listOf(
"datadog.trace.util.JDK9ExecutableSupplier",
"datadog.trace.util.JDK9PidSupplier",
"datadog.trace.util.stacktrace.JDK9StackWalker",
)

dependencies {
api(project(":internal-api"))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package datadog.trace.util;

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.junit.jupiter.api.Test;

class JDK9ExecutableSupplierTest {

@Test
void returnsCurrentProcessExecutable() {
String expected = ProcessHandle.current().info().command().orElse(null);

assertEquals(expected, new JDK9ExecutableSupplier().get());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package datadog.trace.util;

import static datadog.trace.util.JDK9ModuleAccess.addModuleReads;
import static datadog.trace.util.JDK9ModuleAccess.canRead;
import static datadog.trace.util.JDK9ModuleAccess.exportModuleToUnnamedModule;
import static datadog.trace.util.JDK9ModuleAccess.getUnnamedModule;
import static java.util.Collections.singleton;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.lang.instrument.Instrumentation;
import java.net.URL;
import java.net.URLClassLoader;
import net.bytebuddy.agent.ByteBuddyAgent;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

class JDK9ModuleAccessTest {

private static Instrumentation inst;

@BeforeAll
static void installAgent() {
inst = ByteBuddyAgent.install();
}

@Test
void getUnnamedModuleReturnsClassLoaderUnnamedModule() {
ClassLoader cl = newClassLoader();

assertSame(cl.getUnnamedModule(), getUnnamedModule(cl));
}

@Test
void canReadReflectsModuleReadability() {
Module unnamed = newClassLoader().getUnnamedModule();
Module javaBase = Object.class.getModule();

// unnamed modules read every module, java.base reads no unnamed module
assertTrue(canRead(unnamed, javaBase));
assertFalse(canRead(javaBase, unnamed));
}

@Test
void addModuleReadsMakesModuleReadable() {
Module javaSql = java.sql.Driver.class.getModule();
Module unnamed = newClassLoader().getUnnamedModule();
assertFalse(javaSql.canRead(unnamed));

addModuleReads(inst, javaSql, singleton(unnamed));

assertTrue(javaSql.canRead(unnamed));
}

@Test
void exportModuleToUnnamedModuleExportsPackages() {
ClassLoader cl = newClassLoader();
Module javaBase = Object.class.getModule();
assertFalse(javaBase.isExported("jdk.internal.misc", cl.getUnnamedModule()));

exportModuleToUnnamedModule(inst, "java.base", new String[] {"jdk.internal.misc"}, cl);

assertTrue(javaBase.isExported("jdk.internal.misc", cl.getUnnamedModule()));
}

@Test
void exportModuleToUnnamedModuleIgnoresUnknownModule() {
ClassLoader cl = newClassLoader();

assertDoesNotThrow(
() -> exportModuleToUnnamedModule(inst, "does.not.exist", new String[] {"some.pkg"}, cl));
}

/** A fresh class loader, so module changes don't leak to other tests. */
private static ClassLoader newClassLoader() {
return new URLClassLoader(new URL[0], null);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package datadog.trace.util;

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.junit.jupiter.api.Test;

class JDK9PidSupplierTest {

@Test
void returnsCurrentProcessPid() {
assertEquals(Long.toString(ProcessHandle.current().pid()), new JDK9PidSupplier().get());
}
}
Loading