Skip to content

Commit c918d4d

Browse files
PerfectSlayerPerfectSlayer
committed
feat(karate): Migrate to JSON component
1 parent 21b7279 commit c918d4d

File tree

8 files changed

+28
-27
lines changed

8 files changed

+28
-27
lines changed

‎dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.intuit.karate.core.Scenario;
77
import com.intuit.karate.core.ScenarioRuntime;
88
import com.intuit.karate.core.Tag;
9+
import datadog.json.JsonMapper;
910
import datadog.trace.api.civisibility.config.TestIdentifier;
1011
import datadog.trace.api.civisibility.events.TestDescriptor;
1112
import datadog.trace.api.civisibility.events.TestSuiteDescriptor;
@@ -76,7 +77,7 @@ public static List<String> getCategories(List<Tag> tags) {
7677
}
7778

7879
public static String getParameters(Scenario scenario) {
79-
return scenario.getExampleData() != null ? Strings.toJson(scenario.getExampleData()) : null;
80+
return scenario.getExampleData() != null ? JsonMapper.toJson(scenario.getExampleData()) : null;
8081
}
8182

8283
public static TestIdentifier toTestIdentifier(Scenario scenario) {

‎dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class KarateTest extends CiVisibilityInstrumentationTest {
5959
testcaseName | tests | expectedTracesCount | skippedTests
6060
"test-itr-skipping" | [TestSucceedKarate] | 3 | [new TestIdentifier("[org/example/test_succeed] test succeed", "first scenario", null)]
6161
"test-itr-skipping-parameterized" | [TestParameterizedKarate] | 3 | [
62-
new TestIdentifier("[org/example/test_parameterized] test parameterized", "first scenario as an outline", '{"param":"\\\'a\\\'","value":"aa"}')
62+
new TestIdentifier("[org/example/test_parameterized] test parameterized", "first scenario as an outline", '{"param":"\'a\'","value":"aa"}')
6363
]
6464
"test-itr-unskippable" | [TestUnskippableKarate] | 3 | [new TestIdentifier("[org/example/test_unskippable] test unskippable", "first scenario", null)]
6565
}

‎dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@
567567
"test_session.name" : "session-name",
568568
"env" : "none",
569569
"dummy_ci_tag" : "dummy_ci_tag_value",
570-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
570+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
571571
"component" : "karate",
572572
"_dd.profiling.ctx" : "test",
573573
"test.framework_version" : ${content_meta_test_framework_version},
@@ -611,7 +611,7 @@
611611
"env" : "none",
612612
"dummy_ci_tag" : "dummy_ci_tag_value",
613613
"test.is_retry" : "true",
614-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
614+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
615615
"component" : "karate",
616616
"_dd.profiling.ctx" : "test",
617617
"test.framework_version" : ${content_meta_test_framework_version},
@@ -655,7 +655,7 @@
655655
"env" : "none",
656656
"dummy_ci_tag" : "dummy_ci_tag_value",
657657
"test.is_retry" : "true",
658-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
658+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
659659
"component" : "karate",
660660
"_dd.profiling.ctx" : "test",
661661
"test.framework_version" : ${content_meta_test_framework_version},
@@ -698,7 +698,7 @@
698698
"test_session.name" : "session-name",
699699
"env" : "none",
700700
"dummy_ci_tag" : "dummy_ci_tag_value",
701-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
701+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
702702
"component" : "karate",
703703
"_dd.profiling.ctx" : "test",
704704
"test.framework_version" : ${content_meta_test_framework_version},
@@ -742,7 +742,7 @@
742742
"env" : "none",
743743
"dummy_ci_tag" : "dummy_ci_tag_value",
744744
"test.is_retry" : "true",
745-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
745+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
746746
"component" : "karate",
747747
"_dd.profiling.ctx" : "test",
748748
"test.framework_version" : ${content_meta_test_framework_version},
@@ -786,7 +786,7 @@
786786
"env" : "none",
787787
"dummy_ci_tag" : "dummy_ci_tag_value",
788788
"test.is_retry" : "true",
789-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
789+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
790790
"component" : "karate",
791791
"_dd.profiling.ctx" : "test",
792792
"test.framework_version" : ${content_meta_test_framework_version},
@@ -829,7 +829,7 @@
829829
"test_session.name" : "session-name",
830830
"env" : "none",
831831
"dummy_ci_tag" : "dummy_ci_tag_value",
832-
"test.parameters" : "{\"param\":\"\\'c\\'\",\"value\":\"cc\"}",
832+
"test.parameters" : "{\"param\":\"'c'\",\"value\":\"cc\"}",
833833
"component" : "karate",
834834
"_dd.profiling.ctx" : "test",
835835
"test.framework_version" : ${content_meta_test_framework_version},

‎dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
"language" : "jvm",
202202
"env" : "none",
203203
"dummy_ci_tag" : "dummy_ci_tag_value",
204-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
204+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
205205
"library_version" : ${content_meta_library_version},
206206
"component" : "karate",
207207
"_dd.profiling.ctx" : "test",
@@ -243,7 +243,7 @@
243243
"language" : "jvm",
244244
"env" : "none",
245245
"dummy_ci_tag" : "dummy_ci_tag_value",
246-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
246+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
247247
"library_version" : ${content_meta_library_version},
248248
"component" : "karate",
249249
"_dd.profiling.ctx" : "test",

‎dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
"test_session.name" : "session-name",
496496
"env" : "none",
497497
"dummy_ci_tag" : "dummy_ci_tag_value",
498-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
498+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
499499
"component" : "karate",
500500
"_dd.profiling.ctx" : "test",
501501
"test.framework_version" : ${content_meta_test_framework_version},
@@ -539,7 +539,7 @@
539539
"env" : "none",
540540
"dummy_ci_tag" : "dummy_ci_tag_value",
541541
"test.is_retry" : "true",
542-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
542+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
543543
"component" : "karate",
544544
"_dd.profiling.ctx" : "test",
545545
"test.framework_version" : ${content_meta_test_framework_version},
@@ -583,7 +583,7 @@
583583
"env" : "none",
584584
"dummy_ci_tag" : "dummy_ci_tag_value",
585585
"test.is_retry" : "true",
586-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
586+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
587587
"component" : "karate",
588588
"_dd.profiling.ctx" : "test",
589589
"test.framework_version" : ${content_meta_test_framework_version},
@@ -626,7 +626,7 @@
626626
"test_session.name" : "session-name",
627627
"env" : "none",
628628
"dummy_ci_tag" : "dummy_ci_tag_value",
629-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
629+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
630630
"component" : "karate",
631631
"_dd.profiling.ctx" : "test",
632632
"test.framework_version" : ${content_meta_test_framework_version},
@@ -670,7 +670,7 @@
670670
"env" : "none",
671671
"dummy_ci_tag" : "dummy_ci_tag_value",
672672
"test.is_retry" : "true",
673-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
673+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
674674
"component" : "karate",
675675
"_dd.profiling.ctx" : "test",
676676
"test.framework_version" : ${content_meta_test_framework_version},
@@ -714,7 +714,7 @@
714714
"env" : "none",
715715
"dummy_ci_tag" : "dummy_ci_tag_value",
716716
"test.is_retry" : "true",
717-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
717+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
718718
"component" : "karate",
719719
"_dd.profiling.ctx" : "test",
720720
"test.framework_version" : ${content_meta_test_framework_version},

‎dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"test_session.name" : "session-name",
137137
"env" : "none",
138138
"dummy_ci_tag" : "dummy_ci_tag_value",
139-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
139+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
140140
"component" : "karate",
141141
"_dd.profiling.ctx" : "test",
142142
"test.skipped_by_itr" : "true",
@@ -180,7 +180,7 @@
180180
"test_session.name" : "session-name",
181181
"env" : "none",
182182
"dummy_ci_tag" : "dummy_ci_tag_value",
183-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
183+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
184184
"component" : "karate",
185185
"_dd.profiling.ctx" : "test",
186186
"test.framework_version" : ${content_meta_test_framework_version},

‎dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
"language" : "jvm",
202202
"env" : "none",
203203
"dummy_ci_tag" : "dummy_ci_tag_value",
204-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}",
204+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}",
205205
"library_version" : ${content_meta_library_version},
206206
"component" : "karate",
207207
"_dd.profiling.ctx" : "test",
@@ -243,7 +243,7 @@
243243
"language" : "jvm",
244244
"env" : "none",
245245
"dummy_ci_tag" : "dummy_ci_tag_value",
246-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
246+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
247247
"library_version" : ${content_meta_library_version},
248248
"component" : "karate",
249249
"_dd.profiling.ctx" : "test",

‎dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@
497497
"test_session.name" : "session-name",
498498
"env" : "none",
499499
"dummy_ci_tag" : "dummy_ci_tag_value",
500-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}",
500+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}",
501501
"component" : "karate",
502502
"error.type" : "com.intuit.karate.KarateException",
503503
"_dd.profiling.ctx" : "test",
@@ -543,7 +543,7 @@
543543
"env" : "none",
544544
"dummy_ci_tag" : "dummy_ci_tag_value",
545545
"test.is_retry" : "true",
546-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}",
546+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}",
547547
"component" : "karate",
548548
"error.type" : "com.intuit.karate.KarateException",
549549
"_dd.profiling.ctx" : "test",
@@ -589,7 +589,7 @@
589589
"env" : "none",
590590
"dummy_ci_tag" : "dummy_ci_tag_value",
591591
"test.is_retry" : "true",
592-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}",
592+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}",
593593
"component" : "karate",
594594
"error.type" : "com.intuit.karate.KarateException",
595595
"_dd.profiling.ctx" : "test",
@@ -635,7 +635,7 @@
635635
"env" : "none",
636636
"dummy_ci_tag" : "dummy_ci_tag_value",
637637
"test.is_retry" : "true",
638-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}",
638+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}",
639639
"component" : "karate",
640640
"error.type" : "com.intuit.karate.KarateException",
641641
"_dd.profiling.ctx" : "test",
@@ -681,7 +681,7 @@
681681
"env" : "none",
682682
"dummy_ci_tag" : "dummy_ci_tag_value",
683683
"test.is_retry" : "true",
684-
"test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}",
684+
"test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}",
685685
"component" : "karate",
686686
"error.type" : "com.intuit.karate.KarateException",
687687
"_dd.profiling.ctx" : "test",
@@ -721,7 +721,7 @@
721721
"language" : "jvm",
722722
"env" : "none",
723723
"dummy_ci_tag" : "dummy_ci_tag_value",
724-
"test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}",
724+
"test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}",
725725
"library_version" : ${content_meta_library_version},
726726
"component" : "karate",
727727
"_dd.profiling.ctx" : "test",

0 commit comments

Comments
 (0)