8000 Add basic Scala Weaver sbt support by daniel-mohedano · Pull Request #8189 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Add basic Scala Weaver sbt support #8189

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 13 commits into from
Jan 20, 2025
Merged

Add basic Scala Weaver sbt support #8189

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f10262f
weaver instrumentation skeleton
daniel-mohedano Dec 17, 2024
9aebeb1
even simpler skeleton
daniel-mohedano Dec 17, 2024
28bd1e7
changed instrumentation to type hierarchy
daniel-mohedano Dec 17, 2024
bc83850
basic suite and test reporting
daniel-mohedano Dec 20, 2024
100aafe
weaver test reporting logic
daniel-mohedano Jan 10, 2025
6fb4039
weaver integration tests
daniel-mohedano Jan 13, 2025
af77573
weaver integration test fixtures
daniel-mohedano Jan 13, 2025
933ea53
update weaver integration test names
daniel-mohedano Jan 13, 2025
c28c082
Merge branch 'master' into daniel.mohedano/weaver-support
daniel-mohedano Jan 13, 2025
9028e01
fix weaver integration test fixtures and other issues
daniel-mohedano Jan 13, 2025
339d59d
refactors TestEventsHandler start and end times and pr fixes
daniel-mohedano Jan 15, 2025
af56922
add resource sharing integration tests for Weaver
daniel-mohedano Jan 16, 2025
25de5c4
removes redundant warning log
daniel-mohedano Jan 20, 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
Prev Previous commit
Next Next commit
update weaver integration test names
  • Loading branch information
@daniel-mohedano
daniel-mohedano committed Jan 13, 2025
commit 933ea53aa02a6cec22b37fa8c2bb7ff012327006
24 changes: 12 additions & 12 deletions dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import datadog.trace.instrumentation.weaver.WeaverInstrumentationTestRunner
import datadog.trace.instrumentation.weaver.WeaverUtils
import org.example.TestCanceled
import org.example.TestFailed
import org.example.TestFailedExceptionPure
import org.example.TestFailedPure
import org.example.TestIgnored
import org.example.TestPureException
import org.example.TestPureFailed
import org.example.TestPureSucceeded
import org.example.TestSucceded
import org.example.TestSucceed
import org.example.TestSucceedPure

@DisableTestTrace(reason = "avoid self-tracing")
class WeaverTest extends CiVisibilityInstrumentationTest {
Expand All @@ -19,14 +19,14 @@ class WeaverTest extends CiVisibilityInstrumentationTest {
assertSpansData(testcaseName, expectedTracesCount)

where:
testcaseName | tests | expectedTracesCount
"test-pure-succeeded" | [TestPureSucceeded] | 2
"test-pure-failed" | [TestPureFailed] | 2
"test-pure-exception" | [TestPureException] | 2
"test-succeeded" | [TestSucceded] | 2
"test-failed" | [TestFailed] | 2
"test-ignored" | [TestIgnored] | 2
"test-canceled" | [TestCanceled] | 2
testcaseName | tests | expectedTracesCount
"test-succeed-pure" | [TestSucceedPure] | 2
"test-failed-pure" | [TestFailedPure] | 2
"test-failed-exception-pure" | [TestFailedExceptionPure] | 2
"test-succeeded" | [TestSucceed] | 2
"test-failed" | [TestFailed] | 2
"test-ignored" | [TestIgnored] | 2
"test-canceled" | [TestCanceled] | 2
}

@Override
Expand Down
0 ...sources/test-pure-exception/coverages.ftl → .../test-failed-exception-pure/coverages.ftl
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../resources/test-pure-exception/events.ftl → ...ces/test-failed-exception-pure/events.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test_suite",
"resource" : "org.example.TestPureException",
"resource" : "org.example.TestFailedExceptionPure",
"start" : ${content_start},
"duration" : ${content_duration},
"error" : 0,
Expand All @@ -29,7 +29,7 @@
"library_version" : ${content_meta_library_version},
"component" : "weaver",
"span.kind" : "test_suite_end",
"test.suite" : "org.example.TestPureException",
"test.suite" : "org.example.TestFailedExceptionPure",
"test.framework_version" : ${content_meta_test_framework_version},
"test.framework" : "weaver"
}
Expand All @@ -46,7 +46,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test",
"resource" : "org.example.TestPureException.pure exception test",
"resource" : "org.example.TestFailedExceptionPure.pure exception test",
"start" : ${content_start_2},
"duration" : ${content_duration_2},
"error" : 1,
Expand All @@ -66,7 +66,7 @@
"library_version" : ${content_meta_library_version},
"test.name" : "pure exception test",
"span.kind" : "test",
"test.suite" : "org.example.TestPureException",
"test.suite" : "org.example.TestFailedExceptionPure",
"runtime-id" : ${content_meta_runtime_id},
"test.type" : "test",
"test_session.name" : "session-name",
Expand Down
0 .../resources/test-pure-failed/coverages.ftl → .../resources/test-failed-pure/coverages.ftl
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...est/resources/test-pure-failed/events.ftl → ...est/resources/test-failed-pure/events.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test_suite",
"resource" : "org.example.TestPureFailed",
"resource" : "org.example.TestFailedPure",
"start" : ${content_start},
"duration" : ${content_duration},
"error" : 0,
Expand All @@ -29,7 +29,7 @@
"library_version" : ${content_meta_library_version},
"component" : "weaver",
"span.kind" : "test_suite_end",
"test.suite" : "org.example.TestPureFailed",
"test.suite" : "org.example.TestFailedPure",
"test.framework_version" : ${content_meta_test_framework_version},
"test.framework" : "weaver"
}
Expand All @@ -46,7 +46,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test",
"resource" : "org.example.TestPureFailed.pure test fails",
"resource" : "org.example.TestFailedPure.pure test fails",
"start" : ${content_start_2},
"duration" : ${content_duration_2},
"error" : 1,
Expand All @@ -66,7 +66,7 @@
"library_version" : ${content_meta_library_version},
"test.name" : "pure test fails",
"span.kind" : "test",
"test.suite" : "org.example.TestPureFailed",
"test.suite" : "org.example.TestFailedPure",
"runtime-id" : ${content_meta_runtime_id},
"test.type" : "test",
"test_session.name" : "session-name",
Expand Down
0 ...sources/test-pure-succeeded/coverages.ftl → ...resources/test-succeed-pure/coverages.ftl
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../resources/test-pure-succeeded/events.ftl → ...st/resources/test-succeed-pure/events.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test_suite",
"resource" : "org.example.TestPureSucceeded",
"resource" : "org.example.TestSucceedPure",
"start" : ${content_start},
"duration" : ${content_duration},
"error" : 0,
Expand All @@ -29,7 +29,7 @@
"library_version" : ${content_meta_library_version},
"component" : "weaver",
"span.kind" : "test_suite_end",
"test.suite" : "org.example.TestPureSucceeded",
"test.suite" : "org.example.TestSucceedPure",
"test.framework_version" : ${content_meta_test_framework_version},
"test.framework" : "weaver"
}
Expand All @@ -46,7 +46,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test",
"resource" : "org.example.TestPureSucceeded.pure test succeeds",
"resource" : "org.example.TestSucceedPure.pure test succeeds",
"start" : ${content_start_2},
"duration" : ${content_duration_2},
"error" : 0,
Expand All @@ -66,7 +66,7 @@
"library_version" : ${content_meta_library_version},
"test.name" : "pure test succeeds",
"span.kind" : "test",
"test.suite" : "org.example.TestPureSucceeded",
"test.suite" : "org.example.TestSucceedPure",
"runtime-id" : ${content_meta_runtime_id},
"test.type" : "test",
"test_session.name" : "session-name",
Expand Down
8 changes: 4 additions & 4 deletions dd-java-agent/instrumentation/weaver/src/test/resources/test-succeeded/events.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test_suite",
"resource" : "org.example.TestSucceded",
"resource" : "org.example.TestSucceed",
"start" : ${content_start},
"duration" : ${content_duration},
"error" : 0,
Expand All @@ -29,7 +29,7 @@
"library_version" : ${content_meta_library_version},
"component" : "weaver",
"span.kind" : "test_suite_end",
"test.suite" : "org.example.TestSucceded",
"test.suite" : "org.example.TestSucceed",
"test.framework_version" : ${content_meta_test_framework_version},
"test.framework" : "weaver"
}
Expand All @@ -46,7 +46,7 @@
"test_suite_id" : ${content_test_suite_id},
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
"name" : "weaver.test",
"resource" : "org.example.TestSucceded.test succeeds",
"resource" : "org.example.TestSucceed.test succeeds",
"start" : ${content_start_2},
"duration" : ${content_duration_2},
"error" : 0,
Expand All @@ -66,7 +66,7 @@
"library_version" : ${content_meta_library_version},
"test.name" : "test succeeds",
"span.kind" : "test",
"test.suite" : "org.example.TestSucceded",
"test.suite" : "org.example.TestSucceed",
"runtime-id" : ${content_meta_runtime_id},
"test.type" : "test",
"test_session.name" : "session-name",
Expand Down
2 changes: 1 addition & 1 deletion ...scala/org/example/TestPureException.scala → ...org/example/TestFailedExceptionPure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.example

import weaver._

object TestPureException extends FunSuite {
object TestFailedExceptionPure extends FunSuite {
test("pure exception test") {
expect(1 == 1)
throw new RuntimeException("Exception inside test.")
Expand Down
2 changes: 1 addition & 1 deletion ...st/scala/org/example/TestPureFailed.scala → ...st/scala/org/example/TestFailedPure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.example

import weaver._

object TestPureFailed extends FunSuite {
object TestFailedPure extends FunSuite {
test("pure test fails") {
expect(2 == 1)
}
Expand Down
2 changes: 1 addition & 1 deletion ...test/scala/org/example/TestSucceded.scala → .../test/scala/org/example/TestSucceed.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.example
import cats.effect._
import weaver._

object TestSucceded extends SimpleIOSuite {
object TestSucceed extends SimpleIOSuite {
test("test succeeds") {
for {
x <- IO.delay(1)
Expand Down
2 changes: 1 addition & 1 deletion ...scala/org/example/TestPureSucceeded.scala → ...t/scala/org/example/TestSucceedPure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.example

import weaver._

object TestPureSucceeded extends FunSuite {
object TestSucceedPure extends FunSuite {
test("pure test succeeds") {
expect(1 == 1)
}
Expand Down
Loading
0