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

Update spotless version (#4296) 

* Update spotless version

* Apply new spotless version
This commit is contained in:
Trask Stalnaker 2021-10-04 23:44:03 -07:00 committed by GitHub
parent dafc97f96e
commit 34a631965b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 128 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
benchmark-overhead-jmh/build.gradle.kts
View File

@ -53,13 +53,15 @@ tasks {
"-Dotel.instrumentation.http-url-connection.enabled=false"
)
if (jmhStartFlightRecording != null) {
args.addAll(listOf(
"-XX:+FlightRecorder",
"-XX:StartFlightRecording=$jmhStartFlightRecording",
// enabling profiling at non-safepoints helps with micro-profiling
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+DebugNonSafepoints"
))
args.addAll(
listOf(
"-XX:+FlightRecorder",
"-XX:StartFlightRecording=$jmhStartFlightRecording",
// enabling profiling at non-safepoints helps with micro-profiling
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+DebugNonSafepoints"
)
)
}
// see https://github.com/melix/jmh-gradle-plugin/issues/200
jvmArgsPrepend.add(args.joinToString(" "))

2
build.gradle.kts
View File

@ -1,5 +1,5 @@
import java.time.Duration
import nebula.plugin.release.git.opinion.Strategies
import java.time.Duration
plugins {
id("idea")

4
conventions/build.gradle.kts
View File

@ -2,7 +2,7 @@ plugins {
`java-gradle-plugin`
`kotlin-dsl`
// When updating, update below in dependencies too
id("com.diffplug.spotless") version "5.13.0"
id("com.diffplug.spotless") version "5.16.0"
}
spotless {
@ -37,7 +37,7 @@ dependencies {
implementation("org.apache.maven:maven-aether-provider:3.3.9")
// When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.0")
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
implementation("com.google.guava:guava:30.1-jre")
implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
implementation("org.ow2.asm:asm:9.1")

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

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

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

@ -21,11 +21,10 @@ object AkkaHttpTestWebServer {
// needed for the future flatMap/onComplete in the end
implicit val executionContext = system.dispatcher
val exceptionHandler = ExceptionHandler {
case ex: Exception =>
complete(
HttpResponse(status = EXCEPTION.getStatus).withEntity(ex.getMessage)
)
val exceptionHandler = ExceptionHandler { case ex: Exception =>
complete(
HttpResponse(status = EXCEPTION.getStatus).withEntity(ex.getMessage)
)
}
val route = { //handleExceptions(exceptionHandler) {

55
instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/FinatraController.scala
View File

@ -12,42 +12,57 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest.controller
class FinatraController extends Controller {
any(SUCCESS.getPath) { request: Request =>
controller(SUCCESS, new Closure[Response](null) {
override def call(): Response = {
response.ok(SUCCESS.getBody)
controller(
SUCCESS,
new Closure[Response](null) {
override def call(): Response = {
response.ok(SUCCESS.getBody)
}
}
})
)
}
any(ERROR.getPath) { request: Request =>
controller(ERROR, new Closure[Response](null) {
override def call(): Response = {
response.internalServerError(ERROR.getBody)
controller(
ERROR,
new Closure[Response](null) {
override def call(): Response = {
response.internalServerError(ERROR.getBody)
}
}
})
)
}
any(QUERY_PARAM.getPath) { request: Request =>
controller(QUERY_PARAM, new Closure[Response](null) {
override def call(): Response = {
response.ok(QUERY_PARAM.getBody)
controller(
QUERY_PARAM,
new Closure[Response](null) {
override def call(): Response = {
response.ok(QUERY_PARAM.getBody)
}
}
})
)
}
any(EXCEPTION.getPath) { request: Request =>
controller(EXCEPTION, new Closure[Future[Response]](null) {
override def call(): Future[Response] = {
throw new Exception(EXCEPTION.getBody)
controller(
EXCEPTION,
new Closure[Future[Response]](null) {
override def call(): Future[Response] = {
throw new Exception(EXCEPTION.getBody)
}
}
})
)
}
any(REDIRECT.getPath) { request: Request =>
controller(REDIRECT, new Closure[Response](null) {
override def call(): Response = {
response.found.location(REDIRECT.getBody)
controller(
REDIRECT,
new Closure[Response](null) {
override def call(): Response = {
response.found.location(REDIRECT.getBody)
}
}
})
)
}
}

2
instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/ResponseSettingExceptionMapper.scala
View File

@ -9,7 +9,7 @@ import com.twitter.finatra.http.response.ResponseBuilder
import javax.inject.{Inject, Singleton}
@Singleton
class ResponseSettingExceptionMapper @Inject()(response: ResponseBuilder)
class ResponseSettingExceptionMapper @Inject() (response: ResponseBuilder)
extends ExceptionMapper[Exception] {
override def toResponse(request: Request, exception: Exception): Response = {

66
instrumentation/finatra-2.9/javaagent/src/test/scala/FinatraController.scala
View File

@ -12,50 +12,68 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest.controller
class FinatraController extends Controller {
any(SUCCESS.getPath) { request: Request =>
controller(SUCCESS, new Closure[Response](null) {
override def call(): Response = {
response.ok(SUCCESS.getBody)
controller(
SUCCESS,
new Closure[Response](null) {
override def call(): Response = {
response.ok(SUCCESS.getBody)
}
}
})
)
}
any(ERROR.getPath) { request: Request =>
controller(ERROR, new Closure[Response](null) {
override def call(): Response = {
response.internalServerError(ERROR.getBody)
controller(
ERROR,
new Closure[Response](null) {
override def call(): Response = {
response.internalServerError(ERROR.getBody)
}
}
})
)
}
any(QUERY_PARAM.getPath) { request: Request =>
controller(QUERY_PARAM, new Closure[Response](null) {
override def call(): Response = {
response.ok(QUERY_PARAM.getBody)
controller(
QUERY_PARAM,
new Closure[Response](null) {
override def call(): Response = {
response.ok(QUERY_PARAM.getBody)
}
}
})
)
}
any(EXCEPTION.getPath) { request: Request =>
controller(EXCEPTION, new Closure[Future[Response]](null) {
override def call(): Future[Response] = {
throw new Exception(EXCEPTION.getBody)
controller(
EXCEPTION,
new Closure[Future[Response]](null) {
override def call(): Future[Response] = {
throw new Exception(EXCEPTION.getBody)
}
}
})
)
}
any(REDIRECT.getPath) { request: Request =>
controller(REDIRECT, new Closure[Response](null) {
override def call(): Response = {
response.found.location(REDIRECT.getBody)
controller(
REDIRECT,
new Closure[Response](null) {
override def call(): Response = {
response.found.location(REDIRECT.getBody)
}
}
})
)
}
any("/path/:id/param") { request: Request =>
controller(PATH_PARAM, new Closure[Response](null) {
override def call(): Response = {
response.ok(request.params("id"))
controller(
PATH_PARAM,
new Closure[Response](null) {
override def call(): Response = {
response.ok(request.params("id"))
}
}
})
)
}
}

2
instrumentation/finatra-2.9/javaagent/src/test/scala/ResponseSettingExceptionMapper.scala
View File

@ -9,7 +9,7 @@ import com.twitter.finatra.http.response.ResponseBuilder
import javax.inject.{Inject, Singleton}
@Singleton
class ResponseSettingExceptionMapper @Inject()(response: ResponseBuilder)
class ResponseSettingExceptionMapper @Inject() (response: ResponseBuilder)
extends ExceptionMapper[Exception] {
override def toResponse(request: Request, exception: Exception): Response = {

2
instrumentation/kotlinx-coroutines/javaagent/src/test/kotlin/KotlinCoroutineTests.kt
View File

@ -6,7 +6,6 @@
import io.opentelemetry.api.GlobalOpenTelemetry
import io.opentelemetry.api.trace.Tracer
import io.opentelemetry.extension.kotlin.asContextElement
import java.util.concurrent.TimeUnit
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
@ -24,6 +23,7 @@ import kotlinx.coroutines.selects.select
import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeout
import kotlinx.coroutines.yield
import java.util.concurrent.TimeUnit
class KotlinCoroutineTests(private val dispatcher: CoroutineDispatcher) {
val tracer: Tracer = GlobalOpenTelemetry.getTracer("test")

43
instrumentation/scala-executors/javaagent/src/test/scala/ScalaConcurrentTests.scala
View File

@ -59,16 +59,15 @@ class ScalaConcurrentTests {
val goodFuture: Future[Integer] = Future {
1
}
goodFuture onSuccess {
case _ =>
Future {
2
} onSuccess {
case _ => {
tracedChild("callback")
latch.countDown()
}
goodFuture onSuccess { case _ =>
Future {
2
} onSuccess {
case _ => {
tracedChild("callback")
latch.countDown()
}
}
}
latch.await()
@ -131,16 +130,22 @@ class ScalaConcurrentTests {
val parentScope =
Java8BytecodeBridge.currentContext().`with`(parentSpan).makeCurrent()
try {
val completedVal = Future.firstCompletedOf(List(Future {
tracedChild("timeout1")
false
}, Future {
tracedChild("timeout2")
false
}, Future {
tracedChild("timeout3")
true
}))
val completedVal = Future.firstCompletedOf(
List(
Future {
tracedChild("timeout1")
false
},
Future {
tracedChild("timeout2")
false
},
Future {
tracedChild("timeout3")
true
}
)
)
Await.result(completedVal, 30 seconds)
} finally {
parentSpan.end()

8
testing/agent-for-testing/build.gradle.kts
View File

@ -28,9 +28,11 @@ tasks {
// Extracts manifest from OpenTelemetry Java agent to reuse it later
val agentManifest by registering(Copy::class) {
dependsOn(agent)
from(zipTree(agent.singleFile).matching {
include("META-INF/MANIFEST.MF")
})
from(
zipTree(agent.singleFile).matching {
include("META-INF/MANIFEST.MF")
}
)
into("$buildDir/tmp")
}