Skip to content

Commit

Permalink
Rename build files to build.gradle (#3409)
Browse files Browse the repository at this point in the history
* Rename build files to build.gradle

* Rename smoke-tests

* Fix already broken
  • Loading branch information
Anuraag Agrawal authored Jun 25, 2021
1 parent ce36486 commit 785dc6a
Show file tree
Hide file tree
Showing 262 changed files with 3 additions and 26 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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

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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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.
File renamed without changes.
File renamed without changes.

0 comments on commit 785dc6a

Please sign in to comment.