Skip to content

Commit ae79334

Browse files
bric3mhlidd
authored andcommitted
New Migrate build.gradle to kotlin dsl (#9103)
* chore(build): Migrate :dd-trace-api to Kotlin DSL # Conflicts: # dd-trace-api/build.gradle * chore(gradle): Convert :internal-api:internal-api-9 to kotlin dsl chore(build): Migrate :internal-api:internal-api-9 to Kotlin DSL * chore(build): Migrate :internal-api to Kotlin DSL # Conflicts: # internal-api/build.gradle.kts # Conflicts: # internal-api/build.gradle.kts # Conflicts: # internal-api/build.gradle * chore(build): Migrate :dd-trace-ot to Kotlin DSL * chore(build): Migrate :dd-trace-ot:correlation-id-injection to Kotlin DSL * chore(build): Migrate :communication to Kotlin DSL
1 parent de530a6 commit ae79334

File tree

12 files changed

+742
-675
lines changed

12 files changed

+742
-675
lines changed

communication/build.gradle

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

communication/build.gradle.kts

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
plugins {
2+
`java-library`
3+
}
4+
5+
description = "communication"
6+
7+
apply(from = rootDir.resolve("gradle/java.gradle"))
8+
9+
dependencies {
10+
implementation(libs.slf4j)
11+
12+
api(project(":remote-config:remote-config-api"))
13+
implementation(project(":remote-config:remote-config-core"))
14+
implementation(project(":internal-api"))
15+
implementation(project(":utils:container-utils"))
16+
implementation(project(":utils:socket-utils"))
17+
implementation(project(":utils:version-utils"))
18+
19+
api(libs.okio)
20+
api(libs.okhttp)
21+
api(libs.moshi)
22+
implementation(libs.dogstatsd)
23+
24+
testImplementation(project(":utils:test-utils"))
25+
testImplementation(libs.bundles.junit5)
26+
testImplementation(libs.truth)
27+
testImplementation(libs.bytebuddy)
28+
testImplementation("org.msgpack:msgpack-core:0.8.20")
29+
testImplementation("org.msgpack:jackson-dataformat-msgpack:0.8.20")
30+
testImplementation(
31+
group = "com.squareup.okhttp3",
32+
name = "mockwebserver",
33+
version = libs.versions.okhttp.legacy.get() // actually a version range
34+
)
35+
}
36+
37+
val minimumBranchCoverage by extra(0.5)
38+
val minimumInstructionCoverage by extra(0.8)
39+
val excludedClassesCoverage by extra(
40+
listOf(
41+
"datadog.communication.ddagent.ExternalAgentLauncher",
42+
"datadog.communication.ddagent.ExternalAgentLauncher.NamedPipeHealthCheck",
43+
"datadog.communication.ddagent.SharedCommunicationObjects.FixedConfigUrlSupplier",
44+
"datadog.communication.ddagent.SharedCommunicationObjects.RetryConfigUrlSupplier",
45+
"datadog.communication.http.OkHttpUtils",
46+
"datadog.communication.http.OkHttpUtils.1",
47+
"datadog.communication.http.OkHttpUtils.ByteBufferRequestBody",
48+
"datadog.communication.http.OkHttpUtils.CustomListener",
49+
"datadog.communication.http.OkHttpUtils.GZipByteBufferRequestBody",
50+
"datadog.communication.http.OkHttpUtils.GZipRequestBodyDecorator",
51+
"datadog.communication.http.OkHttpUtils.JsonRequestBody",
52+
"datadog.communication.monitor.DDAgentStatsDConnection",
53+
"datadog.communication.monitor.DDAgentStatsDConnection.*",
54+
"datadog.communication.monitor.LoggingStatsDClient",
55+
"datadog.communication.BackendApiFactory",
56+
"datadog.communication.BackendApiFactory.Intake",
57+
"datadog.communication.EvpProxyApi",
58+
"datadog.communication.IntakeApi",
59+
"datadog.communication.util.IOUtils",
60+
"datadog.communication.util.IOUtils.1",
61+
)
62+
)
63+
val excludedClassesBranchCoverage by extra(
64+
listOf(
65+
"datadog.communication.ddagent.TracerVersion",
66+
"datadog.communication.BackendApiFactory",
67+
"datadog.communication.EvpProxyApi",
68+
"datadog.communication.IntakeApi",
69+
)
70+
)
71+
val excludedClassesInstructionCoverage by extra(
72+
listOf(
73+
// can't reach the error condition now
74+
"datadog.communication.fleet.FleetServiceImpl",
75+
"datadog.communication.ddagent.SharedCommunicationObjects",
76+
"datadog.communication.ddagent.TracerVersion",
77+
"datadog.communication.BackendApiFactory",
78+
"datadog.communication.BackendApiFactory.Intake",
79+
"datadog.communication.EvpProxyApi",
80+
"datadog.communication.IntakeApi",
81+
"datadog.communication.util.IOUtils",
82+
"datadog.communication.util.IOUtils.1",
83+
)
84+
)

dd-trace-api/build.gradle

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

dd-trace-api/build.gradle.kts

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
plugins {
2+
`java-library`
3+
}
4+
5+
apply(from = "$rootDir/gradle/java.gradle")
6+
apply(from = "$rootDir/gradle/publish.gradle")
7+
8+
val minimumBranchCoverage by extra(0.8)
9+
10+
// These are tested outside of this module since this module mainly just defines 'API'
11+
val excludedClassesCoverage by extra(
12+
listOf(
13+
"datadog.trace.api.ConfigDefaults",
14+
"datadog.trace.api.CorrelationIdentifier",
15+
"datadog.trace.api.DDSpanTypes",
16+
"datadog.trace.api.DDTags",
17+
"datadog.trace.api.DDTraceApiInfo",
18+
"datadog.trace.api.DDTraceId",
19+
"datadog.trace.api.EventTracker",
20+
"datadog.trace.api.GlobalTracer*",
21+
"datadog.trace.api.PropagationStyle",
22+
"datadog.trace.api.TracePropagationStyle",
23+
"datadog.trace.api.TracePropagationBehaviorExtract",
24+
"datadog.trace.api.SpanCorrelation*",
25+
"datadog.trace.api.internal.TraceSegment",
26+
"datadog.trace.api.internal.TraceSegment.NoOp",
27+
"datadog.trace.api.civisibility.CIVisibility",
28+
"datadog.trace.api.civisibility.DDTestModule",
29+
"datadog.trace.api.civisibility.noop.NoOpDDTest",
30+
"datadog.trace.api.civisibility.noop.NoOpDDTestModule",
31+
"datadog.trace.api.civisibility.noop.NoOpDDTestSession",
32+
"datadog.trace.api.civisibility.noop.NoOpDDTestSuite",
33+
"datadog.trace.api.config.ProfilingConfig",
34+
"datadog.trace.api.interceptor.MutableSpan",
35+
"datadog.trace.api.profiling.Profiling",
36+
"datadog.trace.api.profiling.Profiling.NoOp",
37+
"datadog.trace.api.profiling.ProfilingScope",
38+
"datadog.trace.api.profiling.ProfilingContext",
39+
"datadog.trace.api.profiling.ProfilingContextAttribute.NoOp",
40+
"datadog.trace.api.llmobs.LLMObs",
41+
"datadog.trace.api.llmobs.LLMObs.LLMMessage",
42+
"datadog.trace.api.llmobs.LLMObs.ToolCall",
43+
"datadog.trace.api.llmobs.LLMObsSpan",
44+
"datadog.trace.api.llmobs.noop.NoOpLLMObsSpan",
45+
"datadog.trace.api.llmobs.noop.NoOpLLMObsSpanFactory",
46+
"datadog.trace.api.llmobs.noop.NoOpLLMObsEvalProcessor",
47+
"datadog.trace.api.experimental.DataStreamsCheckpointer",
48+
"datadog.trace.api.experimental.DataStreamsCheckpointer.NoOp",
49+
"datadog.trace.api.experimental.DataStreamsContextCarrier",
50+
"datadog.trace.api.experimental.DataStreamsContextCarrier.NoOp",
51+
"datadog.appsec.api.blocking.*",
52+
"datadog.appsec.api.user.*",
53+
"datadog.appsec.api.login.*",
54+
// Default fallback methods to not break legacy API
55+
"datadog.trace.context.TraceScope",
56+
"datadog.trace.context.NoopTraceScope.NoopContinuation",
57+
"datadog.trace.context.NoopTraceScope",
58+
"datadog.trace.payloadtags.PayloadTagsData",
59+
"datadog.trace.payloadtags.PayloadTagsData.PathAndValue",
60+
"datadog.trace.api.llmobs.LLMObsTags",
61+
)
62+
)
63+
64+
description = "dd-trace-api"
65+
66+
dependencies {
67+
api(libs.slf4j)
68+
testImplementation(libs.guava)
69+
testImplementation(project(":utils:test-utils"))
70+
}

0 commit comments

Comments
 (0)