Skip to content

Commit 0693cc1

Browse files
bric3bric3
committed
Merge remote-tracking branch 'origin/master' into bdu/convert-settings-and-build-to-kotlin
2 parents cb43afe + bf6c156 commit 0693cc1

82 files changed

Lines changed: 838 additions & 258 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.

‎.github/workflows/add-release-to-cloudfoundry.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: |
4444
echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
4545
- name: Commit and push changes
46-
uses: planetscale/ghcommit-action@7c35caed9937939812c7d4242ffab823e9b3b1fa # v0.2.16
46+
uses: planetscale/ghcommit-action@322be9669498a4be9ce66efc1169f8f43f6bd883 # v0.2.17
4747
with:
4848
commit_message: "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
4949
repo: ${{ github.repository }}

‎.github/workflows/analyze-changes.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
${{ runner.os }}-gradle-
4141
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
43+
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
4444
with:
4545
languages: 'java'
4646
build-mode: 'manual'
@@ -57,7 +57,7 @@ jobs:
5757
--build-cache --parallel --stacktrace --no-daemon --max-workers=4
5858
5959
- name: Perform CodeQL Analysis and upload results to GitHub Security tab
60-
uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
60+
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
6161

6262
trivy:
6363
name: Analyze changes with Trivy
@@ -122,7 +122,7 @@ jobs:
122122
TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
123123

124124
- name: Upload Trivy scan results to GitHub Security tab
125-
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
125+
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
126126
if: always()
127127
with:
128128
sarif_file: 'trivy-results.sarif'

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ workflow:
6060
- "11"
6161
- "17"
6262
- "21"
63+
- "25"
6364
- "stable"
6465
- "semeru11"
6566
- "oracle8"
@@ -601,11 +602,12 @@ agent_integration_tests:
601602
GRADLE_TARGET: "traceAgentTest"
602603
CACHE_TYPE: "base"
603604
services:
604-
- name: datadog/agent:7.34.0
605+
- name: registry.ddbuild.io/images/mirror/datadog/agent:7.40.1
605606
alias: local-agent
606607
variables:
607608
DD_APM_ENABLED: "true"
608609
DD_BIND_HOST: "0.0.0.0"
610+
DD_HOSTNAME: "local-agent"
609611
DD_API_KEY: "invalid_key_but_this_is_fine"
610612

611613
test_base:

‎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

‎components/environment/src/main/java/datadog/environment/EnvironmentVariables.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.environment;
22

3-
import javax.annotation.Nonnull;
43
import javax.annotation.Nullable;
54

65
/**
@@ -32,7 +31,7 @@ private EnvironmentVariables() {}
3231
* @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
3332
* the environment variable name is {@code null}.
3433
*/
35-
public static String getOrDefault(@Nonnull String name, String defaultValue) {
34+
public static String getOrDefault(String name, String defaultValue) {
3635
if (name == null) {
3736
return defaultValue;
3837
}

‎components/environment/src/main/java/datadog/environment/JvmOptions.java‎

Lines changed: 45 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -40,57 +40,11 @@ private String[] readProcFsCmdLine() {
4040
return null;
4141
}
4242

43-
private List<String> findVmOptions() {
44-
return findVmOptions(PROCFS_CMDLINE);
45-
}
46-
4743
@SuppressForbidden // Class.forName() as backup
48-
// Visible for testing
49-
List<String> findVmOptions(String[] procfsCmdline) {
44+
private List<String> findVmOptions() {
5045
// Try ProcFS on Linux
51-
// Be aware that when running a native image, the command line in /proc/self/cmdline is just the
52-
// executable
53-
if (procfsCmdline != null) {
54-
// Create list of VM options
55-
List<String> vmOptions = new ArrayList<>();
56-
// Start at 1 to skip "java" command itself
57-
int index = 1;
58-
// Look for first self-standing argument that is not prefixed with "-" or end of VM options
59-
// Skip "-jar" and the jar file
60-
// Simultaneously, collect all arguments in the VM options
61-
for (; index < procfsCmdline.length; index++) {
62-
String argument = procfsCmdline[index];
63-
if (argument.startsWith("@")) {
64-
vmOptions.addAll(getArgumentsFromFile(argument));
65-
} else {
66-
if ("-jar".equals(argument)) {
67-
// skip "-jar" and the jar file
68-
index++;
69-
continue;
70-
} else if ("-cp".equals(argument)) {
71-
// slurp '-cp' and the classpath
72-
vmOptions.add(argument);
73-
if (index + 1 < procfsCmdline.length) {
74-
argument = procfsCmdline[++index];
75-
}
76-
} else if (!argument.startsWith("-")) {
77-
// end of VM options
78-
break;
79-
}
80-
vmOptions.add(argument);
81-
}
82-
}
83-
// Insert JDK_JAVA_OPTIONS at the start if present and supported
84-
List<String> jdkJavaOptions = getJdkJavaOptions();
85-
if (!jdkJavaOptions.isEmpty()) {
86-
vmOptions.addAll(0, jdkJavaOptions);
87-
}
88-
// Insert JAVA_TOOL_OPTIONS at the start if present
89-
List<String> javaToolOptions = getJavaToolOptions();
90-
if (!javaToolOptions.isEmpty()) {
91-
vmOptions.addAll(0, javaToolOptions);
92-
}
93-
return vmOptions;
46+
if (PROCFS_CMDLINE != null) {
47+
return findVmOptionsFromProcFs(PROCFS_CMDLINE);
9448
}
9549

9650
// Try Oracle-based
@@ -137,6 +91,48 @@ List<String> findVmOptions(String[] procfsCmdline) {
13791
return emptyList();
13892
}
13993

94+
// Be aware that when running a native image, the command line in /proc/self/cmdline is just the
95+
// executable
96+
// Visible for testing
97+
List<String> findVmOptionsFromProcFs(String[] procfsCmdline) {
98+
// Create list of VM options
99+
List<String> vmOptions = new ArrayList<>();
100+
// Look for first self-standing argument that is not prefixed with "-" or end of VM options
101+
// while simultaneously, collect all arguments in the VM options
102+
// Starts from 1 as 0 is the java command itself (or native-image)
103+
for (int index = 1; index < procfsCmdline.length; index++) {
104+
String argument = procfsCmdline[index];
105+
// Inflate arg files
106+
if (argument.startsWith("@")) {
107+
vmOptions.addAll(getArgumentsFromFile(argument));
108+
}
109+
// Skip classpath argument (not part of VM options)
110+
else if ("-cp".equals(argument)) {
111+
index++;
112+
}
113+
// Check "-jar" or class name argument as the end of the VM options
114+
else if ("-jar".equals(argument) || !argument.startsWith("-")) {
115+
// End of VM options
116+
break;
117+
}
118+
// Otherwise add as VM option
119+
else {
120+
vmOptions.add(argument);
121+
}
122+
}
123+
// Insert JDK_JAVA_OPTIONS at the start if present and supported
124+
List<String> jdkJavaOptions = getJdkJavaOptions();
125+
if (!jdkJavaOptions.isEmpty()) {
126+
vmOptions.addAll(0, jdkJavaOptions);
127+
}
128+
// Insert JAVA_TOOL_OPTIONS at the start if present
129+
List<String> javaToolOptions = getJavaToolOptions();
130+
if (!javaToolOptions.isEmpty()) {
131+
vmOptions.addAll(0, javaToolOptions);
132+
}
133+
return vmOptions;
134+
}
135+
140136
private static List<String> getArgumentsFromFile(String argFile) {
141137
String filename = argFile.substring(1);
142138
Path path = Paths.get(filename);

‎components/environment/src/main/java/datadog/environment/SystemProperties.java‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.environment;
22

3-
import javax.annotation.Nonnull;
3+
import javax.annotation.Nullable;
44

55
/**
66
* Safely queries system properties against security manager.
@@ -18,7 +18,7 @@ private SystemProperties() {}
1818
* @return The system property value, {@code null} if missing, can't be retrieved, or the system
1919
* property name is {@code null}.
2020
*/
21-
public static String get(String property) {
21+
public static @Nullable String get(String property) {
2222
return getOrDefault(property, null);
2323
}
2424

@@ -31,7 +31,7 @@ public static String get(String property) {
3131
* @return The system property value, {@code defaultValue} if missing, can't be retrieved, or the
3232
* system property name is {@code null}.
3333
*/
34-
public static String getOrDefault(@Nonnull String property, String defaultValue) {
34+
public static String getOrDefault(String property, String defaultValue) {
3535
if (property == null) {
3636
return defaultValue;
3737
}
@@ -50,11 +50,32 @@ public static String getOrDefault(@Nonnull String property, String defaultValue)
5050
* @return {@code true} if the system property was successfully set, {@code} false otherwise.
5151
*/
5252
public static boolean set(String property, String value) {
53+
if (property == null || value == null) {
54+
return false;
55+
}
5356
try {
5457
System.setProperty(property, value);
5558
return true;
5659
} catch (SecurityException ignored) {
5760
return false;
5861
}
5962
}
63+
64+
/**
65+
* Clears a system property.
66+
*
67+
* @param property The system property name to clear.
68+
* @return The previous value of the system property, {@code null} if there was no prior property
69+
* and property can't be cleared.
70+
*/
71+
public static @Nullable String clear(String property) {
72+
if (property == null) {
73+
return null;
74+
}
75+
try {
76+
return System.clearProperty(property);
77+
} catch (SecurityException ignored) {
78+
return null;
79+
}
80+
}
6081
}

‎components/environment/src/main/java/datadog/environment/package-info.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@ParametersAreNonnullByDefault
2+
package datadog.environment;
3+
4+
import javax.annotation.ParametersAreNonnullByDefault;

‎components/environment/src/test/java/datadog/environment/JvmOptionsTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ private static Stream<Arguments> procFsCmdLine() {
135135
arguments(
136136
"Java from class and options",
137137
new String[]{"java", "-Xmx512m", "-Xms256m", "-cp", "app.jar", "Main"},
138-
asList("-Xmx512m", "-Xms256m", "-cp", "app.jar")
138+
asList("-Xmx512m", "-Xms256m")
139139
),
140140
arguments(
141141
"Java from class and options, mixed",
142142
new String[]{"java", "-Xms256m", "-cp", "app.jar", "-Xmx512m", "Main"},
143-
asList("-Xms256m", "-cp", "app.jar", "-Xmx512m")
143+
asList("-Xms256m", "-Xmx512m")
144144
),
145145
arguments(
146146
"Args from file",
@@ -167,10 +167,9 @@ private static Stream<Arguments> procFsCmdLine() {
167167

168168
@ParameterizedTest(name = "[{index}] {0}")
169169
@MethodSource("procFsCmdLine")
170-
void testFindVmOptionsWithProcFsCmdLine(
171-
String useCase, String[] procfsCmdline, List<String> expected) throws Exception {
170+
void testFindVmOptionsFromProcFs(String useCase, String[] procfsCmdline, List<String> expected) {
172171
JvmOptions vmOptions = new JvmOptions();
173-
List<String> found = vmOptions.findVmOptions(procfsCmdline);
172+
List<String> found = vmOptions.findVmOptionsFromProcFs(procfsCmdline);
174173
assertEquals(expected, found);
175174
}
176175

‎components/environment/src/test/java/datadog/environment/SystemPropertiesTest.java‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,29 @@ void testGetOrDefault() {
3838

3939
@Test
4040
void testSet() {
41-
String testProperty = "test.property";
42-
String testValue = "test-value";
43-
assumeTrue(SystemProperties.get(testProperty) == null);
44-
41+
String testProperty = "test.set.property";
42+
String testValue = "test.set.value";
43+
assertNull(SystemProperties.get(testProperty));
4544
assertTrue(SystemProperties.set(testProperty, testValue));
4645
assertEquals(testValue, SystemProperties.get(testProperty));
46+
// Null values
47+
assertDoesNotThrow(() -> SystemProperties.set(testProperty, null));
48+
assertFalse(SystemProperties.set(testProperty, null));
49+
assertDoesNotThrow(() -> SystemProperties.set(null, testValue));
50+
assertFalse(SystemProperties.set(null, testValue));
51+
}
52+
53+
@Test
54+
void testClear() {
55+
String testProperty = "test.clear.property";
56+
String testValue = "test.clear.value";
57+
assertNull(SystemProperties.get(testProperty));
58+
assertNull(SystemProperties.clear(testProperty));
59+
assumeTrue(SystemProperties.set(testProperty, testValue));
60+
assertEquals(testValue, SystemProperties.clear(testProperty));
61+
assertNull(SystemProperties.clear(testProperty));
62+
// Null values
63+
assertDoesNotThrow(() -> SystemProperties.clear(null));
64+
assertNull(SystemProperties.clear(null));
4765
}
4866
}

0 commit comments

Comments
 (0)