Skip to content

Commit 47c8b75

Browse files
authored
Identify all dd-trace-java Gradle plugins with datadog prefix (#10030)
* chore: Identify dd-trace-java Gradle plugins with datadog prefix # Conflicts: # buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy # buildSrc/src/test/groovy/InstrumentPluginTest.groovy * chore: Rename our Gradle plugin prefixes to 'dd-trace-java'
1 parent 497bd13 commit 47c8b75

File tree

60 files changed

+72
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+72
-70
lines changed

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import com.diffplug.gradle.spotless.SpotlessExtension
22
import datadog.gradle.plugin.ci.testAggregate
33

44
plugins {
5-
id("datadog.gradle-debug")
6-
id("datadog.dependency-locking")
7-
id("datadog.tracer-version")
8-
id("datadog.dump-hanged-test")
9-
id("config-inversion-linter")
10-
id("datadog.ci-jobs")
5+
id("dd-trace-java.gradle-debug")
6+
id("dd-trace-java.dependency-locking")
7+
id("dd-trace-java.tracer-version")
8+
id("dd-trace-java.dump-hanged-test")
9+
id("dd-trace-java.config-inversion-linter")
10+
id("dd-trace-java.ci-jobs")
1111

1212
id("com.diffplug.spotless") version "6.13.0"
1313
id("com.github.spotbugs") version "5.0.14"

buildSrc/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ java {
1515
gradlePlugin {
1616
plugins {
1717
create("instrument-plugin") {
18-
id = "instrument"
18+
id = "dd-trace-java.instrument"
1919
implementationClass = "InstrumentPlugin"
2020
}
2121
create("muzzle-plugin") {
22-
id = "muzzle"
22+
id = "dd-trace-java.muzzle"
2323
implementationClass = "datadog.gradle.plugin.muzzle.MuzzlePlugin"
2424
}
2525
create("call-site-instrumentation-plugin") {
26-
id = "call-site-instrumentation"
26+
id = "dd-trace-java.call-site-instrumentation"
2727
implementationClass = "datadog.gradle.plugin.csi.CallSiteInstrumentationPlugin"
2828
}
2929
create("tracer-version-plugin") {
30-
id = "datadog.tracer-version"
30+
id = "dd-trace-java.tracer-version"
3131
implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
3232
}
3333
create("dump-hanged-test-plugin") {
34-
id = "datadog.dump-hanged-test"
34+
id = "dd-trace-java.dump-hanged-test"
3535
implementationClass = "datadog.gradle.plugin.dump.DumpHangedTestPlugin"
3636
}
3737
create("supported-config-generation") {
38-
id = "supported-config-generator"
38+
id = "dd-trace-java.supported-config-generator"
3939
implementationClass = "datadog.gradle.plugin.config.SupportedConfigPlugin"
4040
}
4141
create("supported-config-linter") {
42-
id = "config-inversion-linter"
42+
id = "dd-trace-java.config-inversion-linter"
4343
implementationClass = "datadog.gradle.plugin.config.ConfigInversionLinter"
4444
}
4545
}

buildSrc/src/main/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ abstract class CallSiteInstrumentationPlugin : Plugin<Project> {
187187
}
188188

189189
// Workaround for instrument plugin modifying compile tasks
190-
project.pluginManager.withPlugin("instrument") {
190+
project.pluginManager.withPlugin("dd-trace-java.instrument") {
191191
callSiteGeneratorTask.configure {
192192
dependsOn("instrumentJava")
193193
}

buildSrc/src/main/kotlin/datadog.ci-jobs.gradle.kts renamed to buildSrc/src/main/kotlin/dd-trace-java.ci-jobs.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* with -PgitBaseRef.
55
*/
66

7-
import datadog.gradle.plugin.ci.findAffectedTaskPath
87
import org.gradle.api.tasks.testing.Test
98
import java.io.File
109
import kotlin.math.abs
@@ -134,7 +133,7 @@ if (gitBaseRefProvider.isPresent) {
134133
tasks.register("runMuzzle") {
135134
val muzzleSubprojects = subprojects.filter { p ->
136135
val activePartition = p.extra.get("activePartition") as Boolean
137-
activePartition && p.plugins.hasPlugin("java") && p.plugins.hasPlugin("muzzle")
136+
activePartition && p.plugins.hasPlugin("java") && p.plugins.hasPlugin("dd-trace-java.muzzle")
138137
}
139138
dependsOn(muzzleSubprojects.map { p -> "${p.path}:muzzle" })
140139
}

buildSrc/src/main/kotlin/datadog.configure-tests.gradle.kts renamed to buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import org.gradle.api.services.BuildService
44
import org.gradle.api.services.BuildServiceParameters
55
import org.gradle.testing.base.TestingExtension
66
import org.gradle.api.plugins.jvm.JvmTestSuite
7+
import org.gradle.kotlin.dsl.develocity
8+
import org.gradle.kotlin.dsl.findByType
9+
import org.gradle.kotlin.dsl.withType
710
import java.time.Duration
811
import java.time.temporal.ChronoUnit
912

buildSrc/src/main/kotlin/datadog.dependency-locking.gradle.kts renamed to buildSrc/src/main/kotlin/dd-trace-java.dependency-locking.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/datadog.gradle-debug.gradle.kts renamed to buildSrc/src/main/kotlin/dd-trace-java.gradle-debug.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/datadog.instrumentation.testing-framework-tests.gradle.kts renamed to buildSrc/src/main/kotlin/dd-trace-java.instrumentation.testing-framework-tests.gradle.kts

File renamed without changes.

buildSrc/src/main/kotlin/datadog.test-jvm-contraints.gradle.kts renamed to buildSrc/src/main/kotlin/dd-trace-java.test-jvm-contraints.gradle.kts

File renamed without changes.

buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class CallSiteInstrumentationPluginTest {
1515
private val buildGradle = """
1616
plugins {
1717
id 'java'
18-
id 'call-site-instrumentation'
18+
id 'dd-trace-java.call-site-instrumentation'
1919
}
2020
2121
sourceCompatibility = JavaVersion.VERSION_1_8

0 commit comments

Comments
 (0)