Skip to content
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.

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

Rename build files to build.gradle #3409

Merged
merged 3 commits into from
Jun 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

import static io.opentelemetry.javaagent.instrumentation.extannotations.TraceAnnotationsInstrumentationModule.DEFAULT_ANNOTATIONS
import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some build cache problem 😮

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, the old build file had a typo in its name!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Independently I had already filed gradle/gradle#17540


import io.opentelemetry.instrumentation.api.config.Config
import io.opentelemetry.instrumentation.api.config.ConfigBuilder
import io.opentelemetry.javaagent.instrumentation.extannotations.TraceAnnotationsInstrumentationModule
import io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation
import spock.lang.Specification
import spock.lang.Unroll

Expand All @@ -26,7 +26,7 @@ class IncludeTest extends Specification {
}

expect:
TraceAnnotationsInstrumentationModule.AnnotatedMethodsInstrumentation.configureAdditionalTraceAnnotations(config) == expected.toSet()
ExternalAnnotationInstrumentation.configureAdditionalTraceAnnotations(config) == expected.toSet()

where:
value | expected
Expand Down
File renamed without changes.
File renamed without changes.
23 changes: 0 additions & 23 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -315,26 +315,3 @@ include ':benchmark'
include ':benchmark-integration'
include ':benchmark-integration:jetty-perftest'
include ':benchmark-e2e'

def setBuildFile(project) {
// javaagent-unittests modules are needed until those projects have library modules
// at which time those unittests can be moved to the library modules
//
// javaagent-integration-tests modules are only needed by "internal-" instrumentation
// which needs to be tested by creating some other "test" instrumentation
if (['javaagent', 'javaagent-unit-tests', 'javaagent-integration-tests', 'library', 'testing'].contains(project.projectDir.name) && project.path != ':javaagent') {
project.buildFileName = "${project.projectDir.parentFile.name}-${project.projectDir.name}.gradle"
} else {
project.buildFileName = "${project.name}.gradle"
}
if (!(project.buildFile.exists())) {
project.buildFileName += ".kts"
}
project.children.each {
setBuildFile(it)
}
}

rootProject.children.each {
setBuildFile(it)
}
File renamed without changes.
File renamed without changes.