Skip to content

Commit da65fe4

Browse files
committed
chore: Identify dd-trace-java Gradle plugins with datadog prefix
# Conflicts: # buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy # buildSrc/src/test/groovy/InstrumentPluginTest.groovy
1 parent 6bbe053 commit da65fe4

File tree

36 files changed

+42
-42
lines changed

36 files changed

+42
-42
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id("datadog.dependency-locking")
77
id("datadog.tracer-version")
88
id("datadog.dump-hanged-test")
9-
id("config-inversion-linter")
9+
id("datadog.config-inversion-linter")
1010
id("datadog.ci-jobs")
1111

1212
id("com.diffplug.spotless") version "6.13.0"

buildSrc/build.gradle.kts

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

buildSrc/src/main/kotlin/datadog.ci-jobs.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ if (gitBaseRefProvider.isPresent) {
134134
tasks.register("runMuzzle") {
135135
val muzzleSubprojects = subprojects.filter { p ->
136136
val activePartition = p.extra.get("activePartition") as Boolean
137-
activePartition && p.plugins.hasPlugin("java") && p.plugins.hasPlugin("muzzle")
137+
activePartition && p.plugins.hasPlugin("java") && p.plugins.hasPlugin("datadog.muzzle")
138138
}
139139
dependsOn(muzzleSubprojects.map { p -> "${p.path}:muzzle" })
140140
}

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("datadog.instrument") {
191191
callSiteGeneratorTask.configure {
192192
dependsOn("instrumentJava")
193193
}

buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class CallSiteInstrumentationPluginTest extends Specification {
1010
def buildGradle = '''
1111
plugins {
1212
id 'java'
13-
id 'call-site-instrumentation'
13+
id 'datadog.call-site-instrumentation'
1414
}
1515
1616
sourceCompatibility = JavaVersion.VERSION_1_8

buildSrc/src/test/groovy/InstrumentPluginTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class InstrumentPluginTest extends Specification {
1212
def buildGradle = '''
1313
plugins {
1414
id 'java'
15-
id 'instrument'
15+
id 'datadog.instrument'
1616
}
1717
1818
sourceCompatibility = JavaVersion.VERSION_1_8

dd-java-agent/agent-otel/otel-bootstrap/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def otelApiVersion = '1.38.0'
88
def otelInstrumentationApiVersion = '2.4.0'
99

1010
apply from: "$rootDir/gradle/java.gradle"
11-
apply plugin: 'instrument'
11+
apply plugin: 'datadog.instrument'
1212

1313
configurations {
1414
def ec = register('embeddedClasspath') {

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply from: "$rootDir/gradle/java.gradle"
22
apply plugin: 'scala'
3-
apply plugin: 'call-site-instrumentation'
3+
apply plugin: 'datadog.call-site-instrumentation'
44

55
// Since we are using different scala versions for different test sets,
66
// we put the test classes in the baseTest test set so that the scala

dd-java-agent/instrumentation/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ tasks.register("latestDepTest", Test)
1010

1111
Project parent_project = project
1212
subprojects { Project subProj ->
13-
apply plugin: 'instrument'
14-
apply plugin: 'muzzle'
13+
apply plugin: 'datadog.instrument'
14+
apply plugin: 'datadog.muzzle'
1515

1616
configurations {
1717
instrumentPluginClasspath {
@@ -95,7 +95,7 @@ dependencies {
9595
}
9696

9797
if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleReport") }) {
98-
apply plugin: 'muzzle'
98+
apply plugin: 'datadog.muzzle'
9999
tasks.register('muzzleInstrumentationReport') {
100100
dependsOn(subprojects.collect { p -> p.tasks.matching { it.name == "generateMuzzleReport" } })
101101
finalizedBy(tasks.named('mergeMuzzleReports'))

dd-java-agent/instrumentation/commons-codec-1.1/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ muzzle {
88
}
99

1010
apply from: "$rootDir/gradle/java.gradle"
11-
apply plugin: 'call-site-instrumentation'
11+
apply plugin: 'datadog.call-site-instrumentation'
1212

1313
addTestSuiteForDir('latestDepTest', 'test')
1414

0 commit comments

Comments
 (0)