Skip to content

Commit 8897dd4

Browse files
authored
Revert removal final newline (open-telemetry#5133)
* Revert removal final newline * Add to final newlin editorconfigoverride
1 parent 1e4a7be commit 8897dd4

File tree

59 files changed

+62
-59
lines changed

Some content is hidden

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

59 files changed

+62
-59
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ charset = utf-8
33
end_of_line = lf
44
indent_size = 2
55
indent_style = space
6-
insert_final_newline = false
6+
insert_final_newline = true
77
max_line_length = 100
88
tab_width = 2
99
ij_continuation_indent_size = 4

all/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ tasks.named<JacocoReport>("jacocoTestReport") {
113113
// without any external tools
114114
html.required.set(true)
115115
}
116-
}
116+
}

api/all/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ dependencies {
2222
tasks.test {
2323
// Configure environment variable for ConfigUtilTest
2424
environment("CONFIG_KEY", "environment")
25-
}
25+
}

api/logs/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ otelJava.moduleName.set("io.opentelemetry.api.logs")
1010

1111
dependencies {
1212
api(project(":api:all"))
13-
}
13+
}

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ tasks {
7272
}
7373
}
7474
}
75-
}
75+
}

buildSrc/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ spotless {
1111
"indent_size" to "2",
1212
"continuation_indent_size" to "2",
1313
"max_line_length" to "160",
14+
"insert_final_newline" to "true",
1415
"ktlint_standard_no-wildcard-imports" to "disabled",
1516
// ktlint does not break up long lines, it just fails on them
1617
"ktlint_standard_max-line-length" to "disabled",
@@ -61,4 +62,4 @@ tasks {
6162
release.set(8)
6263
}
6364
}
64-
}
65+
}

buildSrc/src/main/kotlin/otel.animalsniffer-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ animalsniffer {
1717
tasks.withType<AnimalSniffer> {
1818
// always having declared output makes this task properly participate in tasks up-to-date checks
1919
reports.text.required.set(true)
20-
}
20+
}

buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ afterEvaluate {
6868
}
6969
}
7070
}
71-
}
71+
}

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ tasks {
112112
}
113113
}
114114
}
115-
}
115+
}

buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ configurations {
5050
outgoing.artifact(the<JacocoTaskExtension>().destinationFile!!)
5151
}
5252
}
53-
}
53+
}

buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,4 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
143143
}
144144
}
145145
}
146-
}
146+
}

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,4 @@ testing {
240240
}
241241
}
242242
}
243-
}
243+
}

buildSrc/src/main/kotlin/otel.jmh-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ tasks {
3535

3636
outputs.cacheIf { false }
3737
}
38-
}
38+
}

buildSrc/src/main/kotlin/otel.protobuf-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ afterEvaluate {
3333
add("compileProtoPath", platform(project(":dependencyManagement")))
3434
add("testCompileProtoPath", platform(project(":dependencyManagement")))
3535
}
36-
}
36+
}

buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ if (System.getenv("CI") != null) {
6262
useInMemoryPgpKeys(System.getenv("GPG_PRIVATE_KEY"), System.getenv("GPG_PASSWORD"))
6363
sign(publishing.publications["mavenPublication"])
6464
}
65-
}
65+
}

buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ spotless {
2626
"indent_size" to "2",
2727
"continuation_indent_size" to "2",
2828
"max_line_length" to "160",
29+
"insert_final_newline" to "true",
2930
"ktlint_standard_no-wildcard-imports" to "disabled",
3031
// ktlint does not break up long lines, it just fails on them
3132
"ktlint_standard_max-line-length" to "disabled",
@@ -42,6 +43,7 @@ spotless {
4243
"indent_size" to "2",
4344
"continuation_indent_size" to "2",
4445
"max_line_length" to "160",
46+
"insert_final_newline" to "true",
4547
"ktlint_standard_no-wildcard-imports" to "disabled",
4648
// ktlint does not break up long lines, it just fails on them
4749
"ktlint_standard_max-line-length" to "disabled",
@@ -68,4 +70,4 @@ spotless {
6870
trimTrailingWhitespace()
6971
endWithNewline()
7072
}
71-
}
73+
}

context/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ tasks {
7171
check {
7272
dependsOn(testing.suites)
7373
}
74-
}
74+
}

exporters/common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ dependencies {
3636
testImplementation("com.google.api.grpc:proto-google-common-protos")
3737
testImplementation("io.grpc:grpc-testing")
3838
testRuntimeOnly("io.grpc:grpc-netty-shaded")
39-
}
39+
}

exporters/jaeger-proto/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ tasks {
2222
compilerArgs.add("-Xlint:-serial")
2323
}
2424
}
25-
}
25+
}

exporters/jaeger-thrift/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ dependencies {
2525
testImplementation("com.google.guava:guava-testlib")
2626

2727
testImplementation(project(":sdk:testing"))
28-
}
28+
}

exporters/jaeger/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ sourceSets {
4646
main {
4747
java.srcDir("$buildDir/generated/source/wire")
4848
}
49-
}
49+
}

exporters/logging-otlp/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ dependencies {
2525
testImplementation(project(":sdk:trace"))
2626

2727
testImplementation("org.skyscreamer:jsonassert")
28-
}
28+
}

exporters/logging/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ dependencies {
1717

1818
testImplementation(project(":sdk:testing"))
1919
testImplementation(project(":sdk:logs-testing"))
20-
}
20+
}

exporters/otlp/all/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ tasks {
8080
},
8181
)
8282
}
83-
}
83+
}

exporters/otlp/common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ sourceSets {
5757
main {
5858
java.srcDir("$buildDir/generated/source/wire")
5959
}
60-
}
60+
}

exporters/otlp/logs/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ tasks {
6262
named("check") {
6363
dependsOn(testing.suites)
6464
}
65-
}
65+
}

exporters/otlp/testing-internal/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ dependencies {
3030
implementation("com.linecorp.armeria:armeria-junit5")
3131
implementation("io.github.netmikey.logunit:logunit-jul")
3232
implementation("org.assertj:assertj-core")
33-
}
33+
}

exporters/prometheus/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ tasks {
9090
compilerArgs.add("--add-reads=io.opentelemetry.exporters.prometheus.test=org.junit.jupiter.api")
9191
}
9292
}
93-
}
93+
}

exporters/zipkin/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ dependencies {
2323

2424
testImplementation("com.linecorp.armeria:armeria")
2525
testImplementation("org.testcontainers:junit-jupiter")
26-
}
26+
}

extensions/incubator/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ dependencies {
1313
api(project(":api:all"))
1414

1515
testImplementation(project(":sdk:testing"))
16-
}
16+
}

extensions/kotlin/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ tasks {
5959
check {
6060
dependsOn(testing.suites)
6161
}
62-
}
62+
}

extensions/kotlin/src/main/kotlin/io/opentelemetry/extension/kotlin/ContextExtensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ fun CoroutineContext.getOpenTelemetryContext(): Context {
3434
return element.context
3535
}
3636
return Context.root()
37-
}
37+
}

extensions/kotlin/src/test/kotlin/io/opentelemetry/extension/kotlin/KotlinCoroutinesTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ class KotlinCoroutinesTest {
101101
}
102102
}
103103
}
104-
}
104+
}

extensions/kotlin/src/testStrictContext/kotlin/io/opentelemetry/extension/kotlin/StrictContextWithCoroutinesTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ class StrictContextWithCoroutinesTest {
149149
assertThat(Context.current().get(ANIMAL)).isEqualTo(animal)
150150
}
151151
}
152-
}
152+
}

extensions/trace-propagators/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ dependencies {
1616

1717
testImplementation("io.jaegertracing:jaeger-client")
1818
testImplementation("com.google.guava:guava")
19-
}
19+
}

integration-tests/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ dependencies {
1313
testImplementation("com.linecorp.armeria:armeria-junit5")
1414
testImplementation("org.junit.jupiter:junit-jupiter-params")
1515
testImplementation("org.testcontainers:junit-jupiter")
16-
}
16+
}

integration-tests/graal/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ graalvmNative {
2626
}
2727
}
2828
toolchainDetection.set(false)
29-
}
29+
}

integration-tests/otlp/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ tasks {
4040
check {
4141
dependsOn(testing.suites)
4242
}
43-
}
43+
}

integration-tests/tracecontext/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ tasks {
3030

3131
jvmArgs("-Dio.opentelemetry.testArchive=${shadowJar.get().archiveFile.get().asFile.absolutePath}")
3232
}
33-
}
33+
}

opencensus-shim/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ tasks.named<Test>("test") {
2828
// methods available.
2929
setForkEvery(1)
3030
maxParallelForks = 3
31-
}
31+
}

opentracing-shim/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ tasks {
2424
showStandardStreams = true
2525
}
2626
}
27-
}
27+
}

perf-harness/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ dependencies {
1717
implementation("org.testcontainers:junit-jupiter")
1818

1919
runtimeOnly("io.grpc:grpc-netty-shaded")
20-
}
20+
}

sdk-extensions/autoconfigure-spi/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ dependencies {
1515
// implementation dependency to require users to add the artifact directly to their build to use
1616
// SdkLoggerProviderBuilder.
1717
implementation(project(":sdk:logs"))
18-
}
18+
}

sdk-extensions/autoconfigure/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ tasks {
114114
check {
115115
dependsOn(testing.suites)
116116
}
117-
}
117+
}

sdk-extensions/incubator/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ dependencies {
3030
testImplementation(project(":sdk-extensions:autoconfigure"))
3131

3232
testImplementation("com.google.guava:guava-testlib")
33-
}
33+
}

sdk-extensions/jaeger-remote-sampler/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ tasks {
8282
compilerArgs.add("-Xlint:-serial")
8383
}
8484
}
85-
}
85+
}

sdk/all/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ dependencies {
2525
testAnnotationProcessor("com.google.auto.value:auto-value")
2626

2727
testImplementation(project(":sdk:testing"))
28-
}
28+
}

sdk/common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ tasks {
7979
check {
8080
dependsOn(testing.suites)
8181
}
82-
}
82+
}

sdk/logs-testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ dependencies {
2121
testImplementation(project(":sdk:logs-testing"))
2222

2323
testImplementation("junit:junit")
24-
}
24+
}

sdk/logs/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ dependencies {
1818
testImplementation("org.awaitility:awaitility")
1919

2020
annotationProcessor("com.google.auto.value:auto-value")
21-
}
21+
}

sdk/metrics-testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ dependencies {
1818
annotationProcessor("com.google.auto.value:auto-value")
1919

2020
testImplementation("junit:junit")
21-
}
21+
}

sdk/metrics/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ tasks {
5454
check {
5555
dependsOn(testing.suites)
5656
}
57-
}
57+
}

sdk/testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ dependencies {
2020

2121
testImplementation("junit:junit")
2222
testImplementation("org.junit.vintage:junit-vintage-engine")
23-
}
23+
}

0 commit comments

Comments
 (0)