Skip to content

Commit 325ae25

Browse files
piochelepiotrpiochelepiotr
authored
Merge branch 'master' into piotr.wolski/track-schema-registry-usage
2 parents 026f824 + 5adec51 commit 325ae25

651 files changed

Lines changed: 2031 additions & 1584 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/README.md‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ _Action:_ Check the pull request did not introduce unexpected label.
3636

3737
_Recovery:_ Update the pull request or add a comment to trigger the action again.
3838

39+
### create-release-branch [🔗](create-release-branch.yaml)
40+
41+
_Trigger:_ When a git tag matching the pattern "vM.N.0" is pushed (e.g. for a minor release).
42+
43+
_Action:_ Create a release branch that corresponds to the pushed tag (e.g. "release/vM.N.x").
44+
45+
_Recovery:_ Manually create the branch from the "vM.N.0" git tag.
46+
3947
### draft-release-notes-on-tag [🔗](draft-release-notes-on-tag.yaml)
4048

4149
_Trigger:_ When creating a tag, or manually (providing a tag)
@@ -61,6 +69,15 @@ _Recovery:_ Manually [close the related milestone and create a new one](https://
6169

6270
_Notes:_ This action will not apply to release candidate versions using `-RC` tags.
6371

72+
### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
73+
74+
_Trigger:_ Every month or manually.
75+
76+
_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
77+
Close them if no following update within a week.
78+
79+
_Recovery:_ Manually trigger the action again.
80+
6481
### update-docker-build-image [🔗](update-docker-build-image.yaml)
6582

6683
_Trigger:_ Quarterly released, loosely [a day after the new image tag is created](https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml).
@@ -93,16 +110,6 @@ _Action:_
93110

94111
_Recovery:_ Check at the milestone for the related issues and update them manually.
95112

96-
97-
### prune-old-pull-requests [🔗](prune-old-pull-requests.yaml)
98-
99-
_Trigger:_ Every month or manually.
100-
101-
_Action:_ Mark as stale and comment on pull requests with no update during the last quarter.
102-
Close them if no following update within a week.
103-
104-
_Recovery:_ Manually trigger the action again.
105-
106113
## Code Quality and Security
107114

108115
### analyze-changes [🔗](analyze-changes.yaml)
@@ -122,14 +129,6 @@ _Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a
122129

123130
_Action:_ Notify the PR author through comments that about the Git Submodule update.
124131

125-
### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
126-
127-
_Trigger:_ Every week or manually.
128-
129-
_Action:_ Create a PR updating the Grade dependencies and their locking files.
130-
131-
_Recovery:_ Manually trigger the action again.
132-
133132
### run-system-tests [🔗](run-system-tests.yaml)
134133

135134
_Trigger:_ When pushing commits to `master` or manually.
@@ -138,6 +137,14 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
138137

139138
_Recovery:_ Manually trigger the action on the desired branch.
140139

140+
### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
141+
142+
_Trigger:_ Every week or manually.
143+
144+
_Action:_ Create a PR updating the Grade dependencies and their locking files.
145+
146+
_Recovery:_ Manually trigger the action again.
147+
141148
### update-jmxfetch-submodule [🔗](update-jmxfetch-submodule.yaml)
142149

143150
_Trigger:_ Monthly or manually

‎.gitlab-ci.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties
2929
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3030
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
31-
BUILDER_IMAGE_VERSION_PREFIX: "v25.10-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
31+
BUILDER_IMAGE_VERSION_PREFIX: "v25.11-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3232
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
3333
DEFAULT_TEST_JVMS: /^(8|11|17|21|25)$/ # the latest "stable" version is LTS v25
3434
PROFILE_TESTS:
@@ -982,13 +982,14 @@ create_key:
982982
paths:
983983
- pubkeys
984984

985-
validate_supported_configurations_local_file:
986-
extends: .validate_supported_configurations_local_file
985+
validate_supported_configurations_v2_local_file:
986+
extends: .validate_supported_configurations_v2_local_file
987987
variables:
988988
LOCAL_JSON_PATH: "metadata/supported-configurations.json"
989+
BACKFILLED: "false"
989990

990-
update_central_configurations_version_range:
991-
extends: .update_central_configurations_version_range
991+
update_central_configurations_version_range_v2:
992+
extends: .update_central_configurations_version_range_v2
992993
variables:
993994
LOCAL_REPO_NAME: "dd-trace-java"
994995
LOCAL_JSON_PATH: "metadata/supported-configurations.json"

‎.gitlab/one-pipeline.locked.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/53cec1ca53804e5abff804aefdd5cffbcaa5cb546c7e6fcf4c35df6796e06bf1/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/ef1b27c2b0cdbbfb25d185344cdb7aa6bb4feb905cb2a77fa1a5a5340b570004/one-pipeline.yml

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/CallSiteInstrumentationPlugin.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,16 +228,14 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project>{
228228

229229
private fun getProgramClasspath(project: Project): List<File> {
230230
val classpath = ArrayList<File>()
231-
// 1. Compilation outputs
231+
// 1. Compilation outputs - exclude latestDep and forked test variants
232232
project.tasks.withType(AbstractCompile::class.java)
233+
.filter { task -> !task.name.contains("LatestDep", ignoreCase = true) && !task.name.contains("Forked", ignoreCase = true) }
233234
.map { it.destinationDirectory.asFile.get() }
234235
.forEach(classpath::add)
235-
// 2. Compile time dependencies
236+
// 2. Compile time dependencies - exclude latestDep and forked test variants
236237
project.tasks.withType(AbstractCompile::class.java)
237-
.flatMap { it.classpath }
238-
.forEach(classpath::add)
239-
// 3. Test time dependencies
240-
project.tasks.withType(Test::class.java)
238+
.filter { task -> !task.name.contains("LatestDep", ignoreCase = true) && !task.name.contains("Forked", ignoreCase = true) }
241239
.flatMap { it.classpath }
242240
.forEach(classpath::add)
243241
return classpath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
12-
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1414
com.datadoghq:java-dogstatsd-client:4.4.3=jmhRuntimeClasspath,testRuntimeClasspath
1515
com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12-
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1414
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
1515
com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12-
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1414
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
1515
com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12-
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1414
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
1515
com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
12-
com.datadoghq:dd-instrument-java:0.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1313
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1414
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
1515
com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath

‎dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/parsers/HotspotCrashLogParser.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ public CrashLog parse(String uuid, String crashLog) {
120120
String pid = null;
121121
List<StackFrame> frames = new ArrayList<>();
122122
String datetime = null;
123-
StringBuilder message = new StringBuilder();
124123
boolean incomplete = false;
125124

126125
String[] lines = NEWLINE_SPLITTER.split(crashLog);
@@ -130,7 +129,6 @@ public CrashLog parse(String uuid, String crashLog) {
130129
case NEW:
131130
if (line.startsWith(
132131
"# A fatal error has been detected by the Java Runtime Environment:")) {
133-
message.append("\n\n");
134132
state = State.MESSAGE; // jump directly to MESSAGE state
135133
}
136134
break;
@@ -151,8 +149,6 @@ public CrashLog parse(String uuid, String crashLog) {
151149
int endIdx = line.indexOf(',', pidIdx);
152150
pid = line.substring(pidIdx + 4, endIdx);
153151
}
154-
} else {
155-
message.append(line.substring(2)).append('\n');
156152
}
157153
}
158154
break;
@@ -174,7 +170,6 @@ public CrashLog parse(String uuid, String crashLog) {
174170
case THREAD:
175171
// Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
176172
if (line.startsWith("Native frames: ")) {
177-
message.append('\n').append(line).append('\n');
178173
state = State.STACKTRACE;
179174
}
180175
break;
@@ -183,7 +178,6 @@ public CrashLog parse(String uuid, String crashLog) {
183178
state = State.DONE;
184179
} else {
185180
// Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
186-
message.append(line).append('\n');
187181
frames.add(parseLine(line));
188182
}
189183
break;
@@ -200,10 +194,10 @@ public CrashLog parse(String uuid, String crashLog) {
200194
// incomplete crash log
201195
incomplete = true;
202196
}
197+
String message = "Process terminated by signal " + (signal != null ? signal : "UNKNOWN");
203198

204199
ErrorData error =
205-
new ErrorData(
206-
signal, message.toString(), new StackTrace(frames.toArray(new StackFrame[0])));
200+
new ErrorData(signal, message, new StackTrace(frames.toArray(new StackFrame[0])));
207201
// We can not really extract the full metadata and os info from the crash log
208202
// This code assumes the parser is run on the same machine as the crash happened
209203
Metadata metadata = new Metadata("dd-trace-java", VersionInfo.VERSION, "java", null);

0 commit comments

Comments
 (0)