Skip to content

Commit 17e429f

Browse files
authored
Merge branch 'master' into zarir/ssr-aws-sdk
2 parents fccfcd9 + 8604e61 commit 17e429f

File tree

445 files changed

+1223
-1028
lines changed

Some content is hidden

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

445 files changed

+1223
-1028
lines changed

BUILDING.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,16 @@ Download and install JDK versions 8, 11, 17, 21 and 24, and GraalVM 17 for your
6969
```shell
7070
brew install --cask zulu@8 zulu@11 zulu@17 zulu@21 zulu graalvm/tap/graalvm-ce-java17
7171
```
72-
* Fix the GraalVM installation by [removing the quarantine flag](https://www.graalvm.org/latest/docs/getting-started/macos/):
72+
* Identify your local version of GraalVM:
73+
```
74+
ls /Library/Java/JavaVirtualMachines | grep graalvm
75+
```
76+
Example: `graalvm-ce-java17-22.3.1`
77+
* Use this version in the following command to fix the GraalVM installation by [removing the quarantine flag](https://www.graalvm.org/latest/docs/getting-started/macos/):
7378
```
7479
sudo xattr -r -d com.apple.quarantine /Library/Java/JavaVirtualMachines/graalvm-<current version of graalvm>
7580
```
81+
Example: `/Library/Java/JavaVirtualMachines/graalvm-ce-java17-22.3.1`
7682
* Add the required environment variables to your shell using the `export` command. You can permanently install the environment variables by appending the `export` commands into your shell configuration file `~/.zshrc` or `.bashrc` or other.
7783
```shell
7884
export JAVA_8_HOME=/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home

dd-java-agent/agent-bootstrap/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa
3939
commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4040
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
4141
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath
42-
io.sqreen:libsqreen:15.0.0=jmhRuntimeClasspath,testRuntimeClasspath
42+
io.sqreen:libsqreen:15.0.1=jmhRuntimeClasspath,testRuntimeClasspath
4343
javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
jaxen:jaxen:1.2.0=spotbugs
4545
jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath

dd-java-agent/agent-builder/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp
3939
commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
4040
de.thetaphi:forbiddenapis:3.8=compileClasspath
4141
info.picocli:picocli:4.6.3=testRuntimeClasspath
42-
io.sqreen:libsqreen:15.0.0=testRuntimeClasspath
42+
io.sqreen:libsqreen:15.0.1=testRuntimeClasspath
4343
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
4444
jaxen:jaxen:1.2.0=spotbugs
4545
jline:jline:2.14.6=testRuntimeClasspath

dd-java-agent/agent-ci-visibility/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesApiDependenciesMet
5454
de.thetaphi:forbiddenapis:3.8=compileClasspath,compileOnlyDependenciesMetadata
5555
info.picocli:picocli:4.6.3=testFixturesRuntimeClasspath,testRuntimeClasspath
5656
io.github.java-diff-utils:java-diff-utils:4.12=zinc
57-
io.sqreen:libsqreen:15.0.0=testFixturesRuntimeClasspath,testRuntimeClasspath
57+
io.sqreen:libsqreen:15.0.1=testFixturesRuntimeClasspath,testRuntimeClasspath
5858
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5959
jaxen:jaxen:1.2.0=spotbugs
6060
jline:jline:2.14.6=testFixturesRuntimeClasspath,testRuntimeClasspath

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void uploadPackFile(String gitRemoteUrl, String currentCommitHash, Path p
102102
RequestBody packFileBody = RequestBody.create(OCTET_STREAM, packFileContents);
103103

104104
String packFileName = packFile.getFileName().toString();
105-
String packFileNameWithoutRandomPrefix = packFileName.substring(packFileName.indexOf("-") + 1);
105+
String packFileNameWithoutRandomPrefix = packFileName.substring(packFileName.indexOf('-') + 1);
106106

107107
RequestBody requestBody =
108108
new MultipartBody.Builder()

dd-java-agent/agent-iast/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ io.grpc:grpc-protobuf-lite:1.42.2=jmhRuntimeClasspath,testCompileClasspath,testC
8181
io.grpc:grpc-protobuf:1.42.2=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
8282
io.grpc:protoc-gen-grpc-java:1.42.2=protobufToolsLocator_grpc
8383
io.perfmark:perfmark-api:0.23.0=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath
84-
io.sqreen:libsqreen:15.0.0=jmhRuntimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
84+
io.sqreen:libsqreen:15.0.1=jmhRuntimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
8585
javax.inject:javax.inject:1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor
8686
javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
8787
jaxen:jaxen:1.2.0=spotbugs

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private Ranged buildNext() {
4343
if (!checked) {
4444
checked = true;
4545
// Header evidence format is <headerName>: <headerValue>
46-
int separatorIndex = evidenceValue.indexOf(":");
46+
int separatorIndex = evidenceValue.indexOf(':');
4747
if (separatorIndex < 1) {
4848
return null; // Wrong evidence format: there is no separator or <headerName>
4949
}

dd-java-agent/agent-llmobs/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testFixturesApiDe
3939
commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4040
de.thetaphi:forbiddenapis:3.8=compileClasspath,compileOnlyDependenciesMetadata
4141
info.picocli:picocli:4.6.3=testFixturesRuntimeClasspath,testRuntimeClasspath
42-
io.sqreen:libsqreen:15.0.0=testFixturesRuntimeClasspath,testRuntimeClasspath
42+
io.sqreen:libsqreen:15.0.1=testFixturesRuntimeClasspath,testRuntimeClasspath
4343
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4444
jaxen:jaxen:1.2.0=spotbugs
4545
jline:jline:2.14.6=testFixturesRuntimeClasspath,testRuntimeClasspath

dd-java-agent/agent-tooling/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa
5151
commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath
5252
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
5353
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath
54-
io.sqreen:libsqreen:15.0.0=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath
54+
io.sqreen:libsqreen:15.0.1=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath
5555
jakarta.annotation:jakarta.annotation-api:1.3.5=jmhCompileClasspath,jmhRuntimeClasspath
5656
javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath
5757
jaxen:jaxen:1.2.0=spotbugs

dd-java-agent/appsec/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa
4444
commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
4545
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
4646
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
47-
io.sqreen:libsqreen:15.0.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
47+
io.sqreen:libsqreen:15.0.1=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
4848
jaxen:jaxen:1.2.0=spotbugs
4949
jline:jline:2.14.6=jmhRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
5050
junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)