8000 Add capabilities tagging by daniel-mohedano · Pull Request #8499 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Add capabilities tagging #8499

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 44 commits into from
Mar 7, 2025
Merged

Add capabilities tagging #8499

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
8e9bb96
introduce seperate test events handlers in junit5 instrumentations
daniel-mohedano Feb 25, 2025
7ab85a0
clear junit5 handler map on close
daniel-mohedano Feb 25, 2025
b8c748f
introduce separate test events handlers in junit4 instrumentations
daniel-mohedano Feb 25, 2025
45735e6
junit4 instrumentation fixes
daniel-mohedano Feb 26, 2025
ee63fa7
fix muzzle checks for junit5 instrumentation
daniel-mohedano Feb 26, 2025
8ec555d
fix double close of default handler in junit5 instrumentation
daniel-mohedano Feb 26, 2025
04a8084
pr fixes
daniel-mohedano Feb 26, 2025
408a7d3
fix code quality violation
daniel-mohedano Feb 27, 2025
7d28e5a
use framework as component in junit4 and junit5 instrumentations
daniel-mohedano Feb 27, 2025
cfd4fda
update test fixtures with new component string
daniel-mohedano Feb 27, 2025
7877125
update smoke test fixtures with new component string
daniel-mohedano Feb 27, 2025
5a796b9
update selenium test fixtures and fix fixture generation
daniel-mohedano Feb 27, 2025
9a320be
fix codenarc issue
daniel-mohedano Feb 27, 2025
02c6bcc
Merge branch 'master' into daniel.mohedano/instrumentation-test-handl…
daniel-mohedano Feb 28, 2025
568f709
implements capabilities tagging logic
daniel-mohedano Feb 28, 2025
2b25ea8
update weaver instrumentation
daniel-mohedano Feb 28, 2025
ef2664d
update karate instrumentation
daniel-mohedano Feb 28, 2025
3538287
unify karate version in KarateUtils
daniel-mohedano Feb 28, 2025
a52cc21
update testng instrumentation
daniel-mohedano Feb 28, 2025
bc0d0b3
add testng ordering to capabilities
daniel-mohedano Feb 28, 2025
c9a0114
backport ComparableVersion from maven artifact to avoid packaging it
daniel-mohedano Feb 28, 2025
8129852
update junit5 instrumentations
daniel-mohedano Feb 28, 2025
103a089
update junit4 instrumentations
daniel-mohedano Feb 28, 2025
6685a5b
extend headless test session to ensure all capabilities are propagated
daniel-mohedano Feb 28, 2025
79df146
update scalatest instrumentation
daniel-mohedano Feb 28, 2025
063b82a
tag ignoring in span assertion and update smoke test fixtures
daniel-mohedano Mar 4, 2025
c0cf509
jacoco test coverage excludes
daniel-mohedano Mar 4, 2025
e12b7c8
Merge branch 'master' into daniel.mohedano/library-capabilities-tagging
daniel-mohedano Mar 4, 2025
6792874
fix code quality violations
daniel-mohedano Mar 4, 2025
2bee4c2
remove leftover maven dependency for karate
daniel-mohedano Mar 4, 2025
bc8ab0c
bugs and spotless fix
daniel-mohedano Mar 4, 2025
bf6d237
ignore tags with JsonPaths instead of custom implementation
daniel-mohedano Mar 4, 2025
b073736
clean up arePresent and areNotPresent in TagsAssert
daniel-mohedano Mar 4, 2025
0de9f87
add check for null framework versions
daniel-mohedano Mar 4, 2025
877fc63
remove capabilites propagation
daniel-mohedano Mar 4, 2025
8f6e0d7
remove unused test name for execution strategy
daniel-mohedano Mar 4, 2025
2e9d18c
PR changes
daniel-mohedano Mar 5, 2025
4238c3b
fix execution settings tests with sys config injection
daniel-mohedano Mar 5, 2025
0dcea22
fix TestImplTest
daniel-mohedano Mar 5, 2025
c31a7d7
Merge branch 'master' into daniel.mohedano/library-capabilities-tagging
daniel-mohedano Mar 5, 2025
f7aa755
fix master merge
daniel-mohedano Mar 5, 2025
28c2310
remove library capability utils
daniel-mohedano Mar 5, 2025
bd09eef
spotless !
daniel-mohedano Mar 5, 2025
02fa357
change empty map call
daniel-mohedano Mar 6, 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
10000
Diff view
Diff view
Prev Previous commit
Next Next commit
add check for null framework versions
  • Loading branch information
@daniel-mohedano
daniel-mohedano committed Mar 4, 2025
commit 0de9f87cdec1d780b0cf3f531d563ec57ad7329b
8 changes: 4 additions & 4 deletions ...nstrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ public static String getKarateVersion() {
return FileUtils.KARATE_VERSION;
}

public static boolean isSkippingSupported(String frameworkVersion) {
return karateV12.compareTo(new ComparableVersion(frameworkVersion)) <= 0;
public static boolean isSkippingSupported(String version) {
return version != null && karateV12.compareTo(new ComparableVersion(version)) <= 0;
}

public static boolean isSetupTagSupported(String frameworkVersion) {
return karateV13.compareTo(new ComparableVersion(frameworkVersion)) <= 0;
public static boolean isSetupTagSupported(String version) {
return version != null && karateV13.compareTo(new ComparableVersion(version)) <= 0;
}

public static List<LibraryCapability> availableCapabilities(String frameworkVersion) {
Expand Down
6 changes: 3 additions & 3 deletions ...nstrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,15 @@ public static TestSuiteDescriptor toSuiteDescriptor(ITestClass testClass) {
}

public static boolean isEFDSupported(String version) {
return testNGv75.compareTo(new ComparableVersion(version)) <= 0;
return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0;
}

public static boolean isExceptionSuppressionSupported(String version) {
return testNGv75.compareTo(new ComparableVersion(version)) <= 0;
return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0;
}

public static boolean isTestOrderingSupported(String version) {
return testNGv70.compareTo(new ComparableVersion(version)) <= 0;
return version != null && testNGv70.compareTo(new ComparableVersion(version)) <= 0;
}

public static List<LibraryCapability> availableCapabilities(String version) {
Expand Down
0