Skip to content

Commit 5fff446

Browse files
dougqhdougqh
authored
Merge branch 'master' into dougqh/native-loader-listener
2 parents 3e9234d + 640a4bd commit 5fff446

209 files changed

Lines changed: 2759 additions & 1643 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/create-release-branch.yaml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Create Release Branch and Pin System-Tests
33
on:
44
push:
55
tags:
6-
- 'v[0-9]+.[0-9]+.0' # Trigger on minor release tags (e.g. v1.54.0)
6+
- 'v[0-9]+.[0-9]+.0' # Trigger on minor release tags (e.g. v1.54.0)
77
workflow_dispatch:
88
inputs:
99
tag:
@@ -15,8 +15,7 @@ jobs:
1515
create-release-branch:
1616
runs-on: ubuntu-latest
1717
permissions:
18-
# contents: write # Allow pushing the empty release branch
19-
contents: read
18+
contents: write # Allow pushing the empty release branch
2019
id-token: write # Required for OIDC token federation
2120
steps:
2221
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
@@ -25,8 +24,14 @@ jobs:
2524
scope: DataDog/dd-trace-java
2625
policy: self.update-system-tests.create-pr
2726

28-
- name: Checkout dd-trace-java at tag
27+
- name: Checkout dd-trace-java master branch
2928
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
29+
with:
30+
ref: master
31+
32+
- name: Get head SHA of master branch
33+
id: get-head-sha
34+
run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
3035

3136
- name: Determine tag
3237
id: determine-tag
@@ -90,7 +95,7 @@ jobs:
9095
with:
9196
token: "${{ steps.octo-sts.outputs.token }}"
9297
branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
93-
head-sha: "${{ github.sha }}"
98+
head-sha: "${{ steps.get-head-sha.outputs.sha }}"
9499
create-branch: true
95100
command: push
96101
commits: "${{ steps.create-commit.outputs.commit }}"

‎.gitlab-ci.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ default:
132132
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
133133
stage: build
134134
variables:
135-
MAVEN_OPTS: "-Xms64M -Xmx512M"
135+
MAVEN_OPTS: "-Xms256M -Xmx1024M"
136136
GRADLE_WORKERS: 2
137-
GRADLE_MEM: 2560M
137+
GRADLE_MEM: 3G
138138
KUBERNETES_CPU_REQUEST: 8
139-
KUBERNETES_MEMORY_REQUEST: 8Gi
140-
KUBERNETES_MEMORY_LIMIT: 8Gi
139+
KUBERNETES_MEMORY_REQUEST: 10Gi
140+
KUBERNETES_MEMORY_LIMIT: 10Gi
141141
CACHE_TYPE: "lib" #default
142142
FF_USE_FASTZIP: "true"
143143
CACHE_COMPRESSION_LEVEL: "slowest"
@@ -289,8 +289,7 @@ build_tests:
289289
CACHE_TYPE: "latestdep"
290290
- GRADLE_TARGET: ":smokeTest"
291291
CACHE_TYPE: "smoke"
292-
MAVEN_OPTS: "-Xms64M -Xmx512M"
293-
292+
MAVEN_OPTS: "-Xms256M -Xmx1024M"
294293
script:
295294
- *gitlab_base_ref_params
296295
- ./gradlew --version

‎.gitlab/benchmarks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ check-big-regressions:
7171
needs:
7272
- job: benchmarks-startup
7373
artifacts: true
74-
- job: benchmarks-load
74+
- job: benchmarks-dacapo
7575
artifacts: true
7676
when: on_success
7777
tags: ["arch:amd64"]
@@ -86,7 +86,7 @@ check-big-regressions:
8686
script:
8787
- !reference [ .benchmarks, script ]
8888
- |
89-
for benchmarkType in startup load; do
89+
for benchmarkType in startup dacapo; do
9090
find "$ARTIFACTS_DIR/$benchmarkType" -name "benchmark-baseline.json" -o -name "benchmark-candidate.json" | while read file; do
9191
relpath="${file#$ARTIFACTS_DIR/$benchmarkType/}"
9292
prefix="${relpath%/benchmark-*}" # Remove the trailing /benchmark-(baseline|candidate).json

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
1+
wrapperVersion=3.3.4
2+
distributionType=only-script
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.9/apache-maven-3.8.9-bin.zip

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
id("datadog.dependency-locking")
77
id("datadog.tracer-version")
88
id("datadog.dump-hanged-test")
9+
id("config-inversion-linter")
910
id("datadog.ci-jobs")
1011

1112
id("com.diffplug.spotless") version "6.13.0"

‎buildSrc/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ dependencies {
6464
implementation("org.apache.maven", "maven-aether-provider", "3.3.9")
6565

6666
implementation("com.github.zafarkhaja:java-semver:0.10.2")
67+
implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
6768

6869
implementation("com.google.guava", "guava", "20.0")
6970
implementation(libs.asm)
@@ -86,8 +87,8 @@ testing {
8687
suites {
8788
val test by getting(JvmTestSuite::class) {
8889
dependencies {
89-
implementation(libs.spock.core)
9090
implementation(libs.groovy)
91+
implementation(libs.spock.core)
9192
}
9293
targets.configureEach {
9394
testTask.configure {

‎buildSrc/call-site-instrumentation-plugin/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ dependencies {
3535
implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
3636

3737
testImplementation(libs.bytebuddy)
38-
testImplementation(libs.spock.core)
39-
testImplementation("org.objenesis", "objenesis", "3.0.1")
4038
testImplementation(libs.groovy)
39+
testImplementation(libs.bundles.spock)
4140
testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
4241
testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
4342
}

‎buildSrc/src/main/kotlin/datadog.configure-tests.gradle.kts‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ import org.gradle.api.plugins.jvm.JvmTestSuite
77
import java.time.Duration
88
import java.time.temporal.ChronoUnit
99

10-
val isTestingInstrumentation = providers.provider {
11-
project.findProperty("testingInstrumentation") as? Boolean ?: false
12-
}
13-
1410
// Need concrete implementation of BuildService in Kotlin
1511
abstract class ForkedTestLimit : BuildService<BuildServiceParameters.None>
1612
// Forked tests will fail with OOM if the memory is set too high. Gitlab allows at least a limit of 3.
@@ -43,25 +39,6 @@ tasks.withType<Test>().configureEach {
4339
!rootProject.providers.gradleProperty("rerun.tests.${project.name}").isPresent
4440
}
4541

46-
// Avoid executing classes used to test testing frameworks instrumentation
47-
if (isTestingInstrumentation.get()) {
48-
exclude("**/TestAssumption*", "**/TestSuiteSetUpAssumption*")
49-
exclude("**/TestDisableTestTrace*")
50-
exclude("**/TestError*")
51-
exclude("**/TestFactory*")
52-
exclude("**/TestFailed*")
53-
exclude("**/TestFailedWithSuccessPercentage*")
54-
exclude("**/TestInheritance*", "**/BaseTestInheritance*")
55-
exclude("**/TestParameterized*")
56-
exclude("**/TestRepeated*")
57-
exclude("**/TestSkipped*")
58-
exclude("**/TestSkippedClass*")
59-
exclude("**/TestSucceed*")
60-
exclude("**/TestTemplate*")
61-
exclude("**/TestUnskippable*")
62-
exclude("**/TestWithSetup*")
63-
}
64-
6542
// Split up tests that want to run forked in their own separate JVM for generated tasks
6643
if (name.startsWith("forkedTest") || name.endsWith("ForkedTest")) {
6744
setExcludes(emptyList())

0 commit comments

Comments
 (0)