Skip to content

Report dd-java-agent itself as a Maven dependency in SCA telemetry #10975

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

Open
jandro996 wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −1
Open

Report dd-java-agent itself as a Maven dependency in SCA telemetry #10975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions dd-java-agent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,18 @@ def generateAgentJarIndex = tasks.register('generateAgentJarIndex', JavaExec) {
}
sourceSets.main.resources.srcDir(generateAgentJarIndex)

def generatePomProperties = tasks.register('generatePomProperties') {
Copy link
Copy Markdown
Member

@smola smola Mar 26, 2026

Choose a reason for hiding this comment

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

I wonder if there isn't some built-in Gradle option to generate this.
But in the absence of it (cc @bric3?), looks good to me.

Copy link
Copy Markdown
Contributor

@PerfectSlayer PerfectSlayer Mar 26, 2026

Choose a reason for hiding this comment

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

I added @bric3 as reviewer about the task definition (input / output / cache / ordering / etc...)

def outputDir = project.layout.buildDirectory.dir("generated/maven-metadata")
inputs.property("version", project.provider { project.version.toString() })
outputs.dir(outputDir)
doLast {
def pomPropsFile = outputDir.get().file("META-INF/maven/com.datadoghq/dd-java-agent/pom.properties").asFile
pomPropsFile.parentFile.mkdirs()
pomPropsFile.text = "groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=${project.version}\n"
}
}
sourceSets.main.resources.srcDir(generatePomProperties)

subprojects { Project subProj ->
// Don't need javadoc task run for internal projects.
subProj.tasks.withType(Javadoc).configureEach { enabled = false }
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest {

and: 'received tracer dependencies'
// Not exhaustive list of tracer dependencies.
Set<String> missingDependencyNames = ['com.github.jnr:jnr-ffi', 'net.bytebuddy:byte-buddy-agent',].toSet()
Set<String> missingDependencyNames = ['com.datadoghq:dd-java-agent', 'com.github.jnr:jnr-ffi', 'net.bytebuddy:byte-buddy-agent',].toSet()
missingDependencyNames.removeAll(dependencyNames) || true
missingDependencyNames.isEmpty()

Expand Down
20 changes: 20 additions & 0 deletions ...metry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,26 @@ class DependencyResolverSpecification extends DepSpecification {
)
}

void 'jar with dd-java-agent pom.properties resolves to com.datadoghq:dd-java-agent'() {
given: 'a jar containing META-INF/maven/com.datadoghq/dd-java-agent/pom.properties'
File file = new File(testDir, 'dd-java-agent.jar')
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))
ZipEntry e = new ZipEntry('META-INF/maven/com.datadoghq/dd-java-agent/pom.properties')
out.putNextEntry(e)
out.write('groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=1.0.0\n'.getBytes('UTF-8'))
out.closeEntry()
out.close()

when:
List<Dependency> deps = DependencyResolver.resolve(file.toURI())

then:
deps.size() == 1
deps[0].name == 'com.datadoghq:dd-java-agent'
deps[0].version == '1.0.0'
deps[0].hash == null
}

void 'jar without manifest and no version in filename gets resolved'() {
// If no manifest info and no suitable file name - calculate sha1 hash
knownJarCheck(
Expand Down
Loading