Skip to content

Commit 65f3749

Browse files
sezen-datadogsezen-datadog
authored
Merge branch 'master' into sezen.leblay/upgrade-libddwaf-java-15.0.0
2 parents d95ef4e + df6adb3 commit 65f3749

95 files changed

Lines changed: 215 additions & 118 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎benchmark/README.MD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ This directory contains different types of benchmarks.
44

55
## Running Benchmarks via Docker
66

7-
Docker allows the execution of benchmarks without needing to install and configure your development environment. For example, package installation and installation of sirun is performed automatically.
7+
Docker allows the execution of benchmarks without needing to install and configure your development environment. For example, package installation and installation of sirun are performed automatically.
88

9-
In order to run benchmarks using Docker, issue the following command from the benchmark folder of the project:
9+
In order to run benchmarks using Docker, issue the following command from the `benchmark/` folder of this project:
1010

1111
```sh
1212
./run.sh
1313
```
1414

15-
Once it finishes, the reports will be available in the reports folder.
15+
If you run into storage errors (e.g. running out of disk space), try removing all unused Docker containers, networks, and images with `docker system prune -af` before running the script again. Once finished, the reports will be available in the `benchmark/reports/` folder. Note that the script can take ~40 minutes to run.
1616

1717
### Running specific benchmarks
1818

19-
If you want to run only a specific category of benchmarks you can do it via arguments:
19+
If you want to run only a specific category of benchmarks, you can do so via arguments:
2020

2121
1. Run startup benchmarks
2222
```sh

‎build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ buildscript {
1313
}
1414

1515
plugins {
16-
id "datadog.gradle-debug"
17-
id "datadog.dependency-locking"
16+
id 'datadog.gradle-debug'
17+
id 'datadog.dependency-locking'
1818

19-
id "com.diffplug.spotless" version "6.13.0"
19+
id 'com.diffplug.spotless' version '6.13.0'
2020
id 'com.github.spotbugs' version '5.0.14'
21-
id "de.thetaphi.forbiddenapis" version "3.8"
21+
id 'de.thetaphi.forbiddenapis' version '3.8'
2222

2323
id 'pl.allegro.tech.build.axion-release' version '1.14.4'
2424
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
2525

26-
id "com.gradleup.shadow" version "8.3.6" apply false
27-
id "me.champeau.jmh" version "0.7.0" apply false
26+
id 'com.gradleup.shadow' version '8.3.6' apply false
27+
id 'me.champeau.jmh' version '0.7.0' apply false
2828
id 'org.gradle.playframework' version '0.13' apply false
2929
id 'info.solidsoft.pitest' version '1.9.11' apply false
3030
}

‎buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class CallSiteInstrumentationPluginTest extends Specification {
1010
plugins {
1111
id 'java'
1212
id 'call-site-instrumentation'
13-
id("com.diffplug.spotless") version "6.13.0"
13+
id 'com.diffplug.spotless' version '6.13.0'
1414
}
1515
1616
sourceCompatibility = JavaVersion.VERSION_1_8

‎dd-java-agent/agent-bootstrap/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The shadowJar of this project will be injected into the JVM's bootstrap classloader
22
plugins {
3-
id "com.gradleup.shadow"
3+
id 'com.gradleup.shadow'
44
id 'me.champeau.jmh'
55
}
66

‎dd-java-agent/agent-debugger/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradleup.shadow"
2+
id 'com.gradleup.shadow'
33
}
44

55
apply from: "$rootDir/gradle/java.gradle"

‎dd-java-agent/agent-debugger/debugger-test-scala/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "scala"
2+
id 'scala'
33
}
44

55
apply from: "$rootDir/gradle/java.gradle"

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.datadog.debugger.probe;
22

33
import static datadog.trace.api.DDTags.*;
4-
import static datadog.trace.api.DDTags.DD_CODE_ORIGIN_TYPE;
54
import static java.util.Arrays.asList;
65
import static java.util.Collections.singletonList;
76

‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/StatsdMetricForwarderTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.datadog.debugger.agent;
22

3-
import static org.junit.jupiter.api.Assertions.*;
43
import static org.mockito.ArgumentMatchers.eq;
54
import static org.mockito.Mockito.mock;
65
import static org.mockito.Mockito.times;

‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTestAdvice.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.datadog.debugger.origin;
22

3-
import static datadog.trace.bootstrap.debugger.DebuggerContext.*;
3+
import static datadog.trace.bootstrap.debugger.DebuggerContext.captureCodeOrigin;
44
import static datadog.trace.bootstrap.debugger.DebuggerContext.marker;
55

66
import java.lang.reflect.Method;

‎dd-java-agent/agent-jmxfetch/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
66
import static java.nio.file.StandardOpenOption.CREATE
77

88
plugins {
9-
id "com.gradleup.shadow"
9+
id 'com.gradleup.shadow'
1010
}
1111
apply from: "$rootDir/gradle/java.gradle"
1212

0 commit comments

Comments
 (0)