open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert spotless to working version (#4884) 

* Revert "Fix Intellij import (#4877)"

This reverts commit 63aec1a401.

* Revert "Update spotless (#4863)"

This reverts commit a4f70cbd86.
This commit is contained in:
Anuraag Agrawal 2021-12-14 10:59:41 +09:00 committed by GitHub
parent 0dbc1f2e1f
commit 8d0541e0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conventions/build.gradle.kts
View File

@ -1,8 +1,7 @@
plugins { plugins {
`kotlin-dsl` `kotlin-dsl`
// When updating, update below in dependencies too // When updating, update below in dependencies too
// TEMPORARY NOTE: Intellij (re-)import is currently failing with 6.0.3 and 6.0.4 id("com.diffplug.spotless") version "5.16.0"
id("com.diffplug.spotless") version "6.0.2"
} }
spotless { spotless {
@ -36,7 +35,7 @@ dependencies {
implementation("org.apache.maven:maven-aether-provider:3.3.9") implementation("org.apache.maven:maven-aether-provider:3.3.9")
// When updating, update above in plugins too // When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.2") implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
implementation("com.google.guava:guava:31.0.1-jre") implementation("com.google.guava:guava:31.0.1-jre")
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0") implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")

2
instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala
View File

@ -31,7 +31,7 @@ object AkkaHttpTestAsyncWebServer {
def doCall(): HttpResponse = { def doCall(): HttpResponse = {
val resp = HttpResponse(status = val resp = HttpResponse(status =
endpoint.getStatus endpoint.getStatus
) // .withHeaders(headers.Type)resp.contentType = "text/plain" ) //.withHeaders(headers.Type)resp.contentType = "text/plain"
endpoint match { endpoint match {
case SUCCESS => resp.withEntity(endpoint.getBody) case SUCCESS => resp.withEntity(endpoint.getBody)
case INDEXED_CHILD => case INDEXED_CHILD =>

2
instrumentation/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala
View File

@ -27,7 +27,7 @@ object AkkaHttpTestWebServer {
) )
} }
val route = { // handleExceptions(exceptionHandler) { val route = { //handleExceptions(exceptionHandler) {
path(SUCCESS.rawPath) { path(SUCCESS.rawPath) {
complete( complete(
HttpResponse(status = SUCCESS.getStatus).withEntity(SUCCESS.getBody) HttpResponse(status = SUCCESS.getStatus).withEntity(SUCCESS.getBody)