Skip to content

Commit 3b2d644

Browse files
jbachorikjbachorik
authored
fix: update stale org/openjdk/btrace path strings to io/btrace (#863)
1 parent ed01360 commit 3b2d644

9 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎benchmarks/agent-benchmark/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jmhJar {
3838
include 'META-INF/BenchmarkList'
3939
include 'META-INF/CompilerHints'
4040
include 'org/openjdk/jmh/**'
41-
include 'org/openjdk/btrace/bench/**/*.class'
42-
include 'org/openjdk/btrace/generated/**/*'
41+
include 'io/btrace/bench/**/*.class'
42+
include 'io/btrace/generated/**/*'
4343
include "joptsimple/**"
4444
include "org/apache/**"
4545
include 'jmh*'

‎benchmarks/runtime-benchmarks/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jmhJar {
4747
include 'org/jctools/**/*'
4848
include 'org/objectweb/asm/**'
4949
include 'org/openjdk/jmh/**'
50-
include 'org/openjdk/btrace/bench/**/*.class'
51-
include "org/openjdk/btrace/core/**"
52-
include "org/openjdk/btrace/instr/**"
53-
include 'org/openjdk/btrace/generated/**/*'
54-
include 'org/openjdk/btrace/runtime/**'
50+
include 'io/btrace/bench/**/*.class'
51+
include "io/btrace/core/**"
52+
include "io/btrace/instr/**"
53+
include 'io/btrace/generated/**/*'
54+
include 'io/btrace/runtime/**'
5555
// no legacy services classes to package
5656
include "joptsimple/**"
5757
include "org/apache/**"

‎btrace-agent/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jar {
8585

8686
// Exclude sources that rely on JDK-internal modules from Javadoc to avoid missing-package errors
8787
tasks.named('javadoc').configure {
88-
exclude 'org/openjdk/btrace/agent/PerfReaderImpl.java'
88+
exclude 'io/btrace/agent/PerfReaderImpl.java'
8989
}
9090

9191
task compileTestProbes {

‎btrace-core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jacocoTestReport {
5757
afterEvaluate {
5858
classDirectories.setFrom(files(classDirectories.files.collect {
5959
fileTree(dir: it, include: [
60-
'**/org/openjdk/btrace/core/comm/**/*.class'
60+
'**/io/btrace/core/comm/**/*.class'
6161
])
6262
}))
6363
}

‎btrace-dist/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ test {
465465
* │ └── btrace-extensions/
466466
* │ └── ext-id/
467467
* │ └── extension.properties
468-
* ├── org/openjdk/btrace/... # Agent + API classes (.class)
469-
* └── org/openjdk/btrace/ext/impl/... # Impl classes (.classdata)
468+
* ├── io/btrace/... # Agent + API classes (.class)
469+
* └── io/btrace/ext/impl/... # Impl classes (.classdata)
470470
*
471471
* Usage:
472472
* ./gradlew :btrace-dist:fatAgentJar -PembedExtensions=btrace-spark,btrace-metrics

‎btrace-dtrace/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ sourceSets {
5656
}
5757

5858
shadowJar {
59-
include 'org/openjdk/btrace/dtrace/**/*'
59+
include 'io/btrace/dtrace/**/*'
6060
archiveClassifier = null
6161
}
6262

‎btrace-gradle-plugin/src/main/groovy/io/btrace/gradle/BTraceExtensionPlugin.groovy‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class BTraceExtensionPlugin implements Plugin<Project> {
234234
}
235235
}
236236
// Enforce: at most one package-level @ExtensionDescriptor across the project
237-
def extDescDesc = 'Lorg/openjdk/btrace/core/extensions/ExtensionDescriptor;'
237+
def extDescDesc = 'Lio/btrace/core/extensions/ExtensionDescriptor;'
238238
int extDescCount = 0
239239
def scanForPkgDescriptors = { File classesDir ->
240240
if (classesDir == null || !classesDir.exists()) return
@@ -277,8 +277,8 @@ class BTraceExtensionPlugin implements Plugin<Project> {
277277
cr.accept(cn, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG)
278278
def isInterface = (cn.access & Opcodes.ACC_INTERFACE) != 0
279279
def hasMarker = false
280-
(cn.visibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') }
281-
(cn.invisibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') }
280+
(cn.visibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') }
281+
(cn.invisibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') }
282282
if (hasMarker && isInterface) detected.add(fq)
283283
}
284284
}
@@ -354,7 +354,7 @@ class BTraceExtensionPlugin implements Plugin<Project> {
354354
// Collect ServiceDescriptor.permissions
355355
def collectServicePerms = { AnnotationNode an ->
356356
if (an == null) return
357-
if (an.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') {
357+
if (an.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') {
358358
def vals = an.values ?: []
359359
for (int i = 0; i < vals.size(); i += 2) {
360360
if (vals[i] == 'permissions') {
@@ -701,7 +701,7 @@ class BTraceExtensionPlugin implements Plugin<Project> {
701701
def cn = new ClassNode()
702702
cr.accept(cn, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG)
703703
(cn.visibleAnnotations ?: []).each { an ->
704-
if (an.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') {
704+
if (an.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') {
705705
def vals = an.values ?: []
706706
for (int i = 0; i < vals.size(); i += 2) {
707707
if (vals[i] == 'permissions') {
@@ -715,7 +715,7 @@ class BTraceExtensionPlugin implements Plugin<Project> {
715715
}
716716
}
717717
(cn.invisibleAnnotations ?: []).each { an ->
718-
if (an.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') {
718+
if (an.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') {
719719
def vals = an.values ?: []
720720
for (int i = 0; i < vals.size(); i += 2) {
721721
if (vals[i] == 'permissions') {
@@ -741,7 +741,7 @@ class BTraceExtensionPlugin implements Plugin<Project> {
741741
def cr2 = new ClassReader(bytes2)
742742
def cn2 = new ClassNode(); cr2.accept(cn2, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG)
743743
(cn2.visibleAnnotations ?: []).each { an ->
744-
if (an.desc == 'Lorg/openjdk/btrace/core/extensions/ExtensionDescriptor;') {
744+
if (an.desc == 'Lio/btrace/core/extensions/ExtensionDescriptor;') {
745745
def vals = an.values ?: []
746746
for (int i = 0; i < vals.size(); i += 2) {
747747
if (vals[i] == 'permissions') {
@@ -755,7 +755,7 @@ class BTraceExtensionPlugin implements Plugin<Project> {
755755
}
756756
}
757757
(cn2.invisibleAnnotations ?: []).each { an ->
758-
if (an.desc == 'Lorg/openjdk/btrace/core/extensions/ExtensionDescriptor;') {
758+
if (an.desc == 'Lio/btrace/core/extensions/ExtensionDescriptor;') {
759759
def vals = an.values ?: []
760760
for (int i = 0; i < vals.size(); i += 2) {
761761
if (vals[i] == 'permissions') {
@@ -1099,8 +1099,8 @@ class BTraceExtensionPlugin implements Plugin<Project> {
10991099
def cn = new ClassNode(); cr.accept(cn, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG)
11001100
boolean isInterface = (cn.access & Opcodes.ACC_INTERFACE) != 0
11011101
boolean hasMarker = false
1102-
(cn.visibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') }
1103-
(cn.invisibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;') }
1102+
(cn.visibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') }
1103+
(cn.invisibleAnnotations ?: []).each { hasMarker |= (it.desc == 'Lio/btrace/core/extensions/ServiceDescriptor;') }
11041104
if (hasMarker && isInterface) services.add(fq)
11051105
}
11061106
}

‎btrace-gradle-plugin/src/main/groovy/io/btrace/gradle/PermissionScanner.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ final class PermissionScanner {
156156
if (owner.startsWith('com/sun/management/')) {
157157
perms.add('MEMORY_INFO')
158158
}
159-
if (owner.startsWith('jdk/jfr/') || owner.startsWith('org/openjdk/btrace/core/jfr/')) {
159+
if (owner.startsWith('jdk/jfr/') || owner.startsWith('io/btrace/core/jfr/')) {
160160
perms.add('JFR_EVENTS')
161161
}
162162
}

‎btrace-gradle-plugin/src/main/groovy/io/btrace/gradle/SingleSourceApiPartition.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import org.objectweb.asm.tree.MethodNode
3333
@CompileStatic
3434
final class SingleSourceApiPartition {
3535
private static final String SERVICE_DESCRIPTOR_DESC =
36-
'Lorg/openjdk/btrace/core/extensions/ServiceDescriptor;'
36+
'Lio/btrace/core/extensions/ServiceDescriptor;'
3737
private static final String EXTERNAL_TYPE_DESC =
38-
'Lorg/openjdk/btrace/core/extensions/ExternalType;'
38+
'Lio/btrace/core/extensions/ExternalType;'
3939
private static final Pattern EXCLUDED_GENERATED =
4040
Pattern.compile('.*(\\$Ext|\\.btrace\\.shim\\.).*')
4141

0 commit comments

Comments
 (0)