Skip to content

Revert "Update config line to account for large binary files" #8731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2025
Merged

Revert "Update config line to account for large binary files" #8731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
184af96
Revert "Adjust way to get changed files (#8709)"
sarahchen6 Apr 24, 2025
14f6579
Patch AbstractSparkListenerTest
sarahchen6 Apr 25, 2025
621a4a1
Force byte-buddy version for mule4
sarahchen6 Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .circleci/config.continue.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ commands:
if [[ "$BRANCH" != "master" ]] && [[ "$BRANCH" != "release/*" ]]; then
# We know that we have checked out the PR merge branch, so the HEAD commit is a merge
# As a backup, if anything goes wrong with the diff, the build will fail
# Get list of changed files directly using git diff-tree to avoid issues with large binary files
CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r HEAD)
CHANGED_FILES=$(git show HEAD | grep -e "^Merge:" | cut -d ' ' -f 2- | sed 's/ /.../' | xargs git diff --name-only)
# Count the number of matches, and ignore if the grep doesn't match anything
MATCH_COUNT=$(echo "$CHANGED_FILES" | grep -c -E "<< pipeline.parameters.global_pattern >>|<< parameters.pattern >>") || true
if [[ "$MATCH_COUNT" -eq "0" ]]; then
Expand Down
5 changes: 3 additions & 2 deletions dd-java-agent/instrumentation/mule-4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ configurations.all {
// avoid bringing in logback based on java 11
force libs.logback.classic
force libs.logback.core

// force specific version of byte-buddy for all configurations
force 'net.bytebuddy:byte-buddy:1.14.18'
}
}

Expand Down Expand Up @@ -146,7 +149,6 @@ dependencies {
testImplementation project(':dd-java-agent:instrumentation:caffeine')
testImplementation project(':dd-java-agent:instrumentation:quartz-2')


testImplementation group: 'org.mule.runtime', name: 'mule-module-launcher', version: muleVersion
testImplementation group: 'org.mule.runtime', name: 'mule-core', version: muleVersion
//testImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: muleVersion
Expand Down Expand Up @@ -175,7 +177,6 @@ dependencies {
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-service', version: '4.8.+'
latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-javaee', version: '4.8.+'


//TODO: 4.9.0 is not yet out but it looks like using 4.+ instead of above 4.8.+ brings in 4.9.0-SNAPSHOT artifacts.
/*
When testing with them, the mule container does not bootstrap because of:
Expand Down
15 changes: 13 additions & 2 deletions .../testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was missed in CI due to the change that this PR is trying to revert. See here for its failures on master.

Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,20 @@ abstract class AbstractSparkListenerTest extends AgentTestRunner {
conf.set("spark.openlineage.rootParentJobName", "dag-push-to-s3-spark")
def listener = getTestDatadogSparkListener(conf)

expect:
when:
listener.onApplicationStart(applicationStartEvent(1000L))
assert listener.openLineageSparkConf.get("spark.openlineage.run.tags").contains("13959090542865903119")
listener.onApplicationEnd(new SparkListenerApplicationEnd(2000L))

then:
assertTraces(1) {
trace(1) {
span {
operationName "spark.application"
spanType "spark"
assert span.context.traceId.toString() == "13959090542865903119"
}
}
}
}

def "test lastJobFailed is not set when job is cancelled"() {
Expand Down