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
14 changes: 7 additions & 7 deletions dd-java-agent/agent-installer/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java25CompileClasspat
com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java25CompileClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,main_java25CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:java-dogstatsd-client:2.10.5=compileClasspath
com.datadoghq:java-dogstatsd-client:2.13.1=compileClasspath
com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath
com.datadoghq:jmxfetch:0.52.0=compileClasspath
com.datadoghq:jmxfetch:0.52.1=compileClasspath
com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.6=codenarc
com.github.jnr:jffi:1.2.23=compileClasspath
com.github.jnr:jffi:1.3.15=testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath
com.github.jnr:jnr-constants:0.9.15=compileClasspath
com.github.jnr:jnr-enxio:0.25=compileClasspath
com.github.jnr:jnr-constants:0.9.17=compileClasspath
com.github.jnr:jnr-enxio:0.30=compileClasspath
com.github.jnr:jnr-enxio:0.32.20=testRuntimeClasspath
com.github.jnr:jnr-ffi:2.1.12=compileClasspath
com.github.jnr:jnr-ffi:2.1.16=compileClasspath
com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath
com.github.jnr:jnr-posix:3.0.53=compileClasspath
com.github.jnr:jnr-posix:3.0.61=compileClasspath
com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath
com.github.jnr:jnr-unixsocket:0.27=compileClasspath
com.github.jnr:jnr-unixsocket:0.36=compileClasspath
Comment thread
sarahchen6 marked this conversation as resolved.
com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath
com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-jmxfetch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
apply from: "$rootDir/gradle/java.gradle"

dependencies {
api('com.datadoghq:jmxfetch:0.52.0') {
api('com.datadoghq:jmxfetch:0.52.1') {
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
exclude group: 'com.beust', module: 'jcommander'
Expand Down
14 changes: 7 additions & 7 deletions dd-java-agent/agent-jmxfetch/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:java-dogstatsd-client:2.10.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:jmxfetch:0.52.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:java-dogstatsd-client:2.13.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:jmxfetch:0.52.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.6=codenarc
com.github.jnr:jffi:1.2.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.9.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-enxio:0.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-ffi:2.1.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-posix:3.0.53=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-unixsocket:0.27=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.9.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-enxio:0.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-ffi:2.1.16=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-posix:3.0.61=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-unixsocket:0.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-x86asm:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs
com.github.spotbugs:spotbugs:4.9.8=spotbugs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTest
com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:java-dogstatsd-client:2.10.5=latestDepTestCompileClasspath,testCompileClasspath
com.datadoghq:java-dogstatsd-client:2.13.1=latestDepTestCompileClasspath,testCompileClasspath
com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.datadoghq:jmxfetch:0.52.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:jmxfetch:0.52.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.javaparser:javaparser-core:3.25.6=codenarc
com.github.jnr:jffi:1.2.23=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-a64asm:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.10.4=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-constants:0.9.15=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-enxio:0.25=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-constants:0.9.17=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-enxio:0.30=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-enxio:0.32.20=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-ffi:2.1.12=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-ffi:2.1.16=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-posix:3.0.53=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-posix:3.0.61=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-unixsocket:0.27=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-unixsocket:0.36=latestDepTestCompileClasspath,testCompileClasspath
com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,testRuntimeClasspath
com.github.jnr:jnr-x86asm:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package datadog.trace.agent

import datadog.environment.JavaVirtualMachine
import datadog.trace.agent.test.IntegrationTestUtils
import jvmbootstraptest.AgentLoadedChecker
import jvmbootstraptest.JmxStartedChecker
import spock.lang.IgnoreIf
import spock.lang.Specification
import spock.lang.Timeout

Expand Down Expand Up @@ -75,9 +73,6 @@ class JMXFetchTest extends Specification {
returnCode == 0
}

@IgnoreIf(reason = "JDK 27 TODO: address failing test", value = {
JavaVirtualMachine.isJavaVersion(27)
})
def "test jmxfetch config"() {
setup:
def configSettings = names.collect {
Expand Down
Loading