Add tracing implementations of listeners

gradle/libs.versions.toml

@@ -1,4 +1,5 @@
 [versions]
+androidx-tracing = "1.1.0"
 biz-aQute-bnd = "6.4.0"
 checkStyle = "10.11.0"
 com-squareup-moshi = "1.15.0"
@@ -18,6 +19,7 @@ androidx-annotation = "androidx.annotation:annotation:1.6.0"
 androidx-espresso-core = "androidx.test.espresso:espresso-core:3.5.1"
 androidx-junit = "androidx.test.ext:junit:1.1.5"
 androidx-test-runner = "androidx.test:runner:1.5.2"
+androidx-tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref = "androidx-tracing" }
 animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23"
 aqute-resolve = { module = "biz.aQute.bnd:biz.aQute.resolve", version.ref = "biz-aQute-bnd" }
 assertj-core = "org.assertj:assertj-core:3.24.2"

okhttp-android/build.gradle.kts

@@ -1,9 +1,6 @@
-import com.vanniktech.maven.publish.JavadocJar
-
 plugins {
   id("com.android.library")
   kotlin("android")
-  id("de.mannodermaus.android-junit5")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
   id("binary-compatibility-validator")
@@ -14,7 +11,6 @@ android {
 
   defaultConfig {
     minSdk = 21
-    targetSdk = 31
 
     // Make sure to use the AndroidJUnitRunner (or a sub-class) in order to hook in the JUnit 5 Test Builder
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -47,6 +43,7 @@ dependencies {
   debugImplementation(libs.findbugs.jsr305)
   compileOnly(libs.animalsniffer.annotations)
   compileOnly(libs.robolectric.android)
+  implementation(libs.androidx.tracing.ktx)
 
   testImplementation(projects.okhttpTestingSupport)
   testImplementation(projects.mockwebserver3Junit5)

okhttp-android/src/main/kotlin/okhttp3/android/TracingConnectionListener.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 Block, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package okhttp3.android;
+
+import androidx.tracing.Trace
+import java.util.concurrent.atomic.AtomicInteger
+import okhttp3.Call
+import okhttp3.Connection
+import okhttp3.ConnectionListener
+import okhttp3.Route
+import okio.IOException
+
+/**
+ * Tracing implementation of ConnectionListener that marks the lifetime of each connection
+ * in perfetto traces.
+ */
+class TracingConnectionListener : ConnectionListener() {
+  private val idGenerator = AtomicInteger(0)
+
+  override fun connectStart(route: Route, call: Call) {
+    Trace.beginAsyncSection(route.tracingTag, idGenerator.incrementAndGet())
+  }
+
+  override fun connectFailed(route: Route, call: Call, failure: IOException) {
+    Trace.endAsyncSection(route.tracingTag, idGenerator.incrementAndGet())
+  }
+
+  override fun connectionClosed(connection: Connection) {
+    Trace.endAsyncSection(connection.route().tracingTag, idGenerator.incrementAndGet())
+  }
+
+  val Route.tracingTag: String
+    get() = this.address.url.host
+}

okhttp-android/src/main/kotlin/okhttp3/android/TracingInterceptor.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 Block, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package okhttp3.android;
+
+import androidx.tracing.trace
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+
+/**
+ * Tracing implementation of Interceptor that marks each Call in a perfetto
+ * trace.
+ */
+class TracingInterceptor : Interceptor {
+  override fun intercept(chain: Interceptor.Chain): Response {
+    return trace(chain.request().tracingTag) {
+      chain.proceed(chain.request())
+    }
+  }
+
+  val Request.tracingTag: String
+    get() = url.encodedPath.take(127)
+}

okhttp-logging-interceptor/src/main/kotlin/okhttp3/logging/LoggingEventListener.kt

@@ -181,4 +181,6 @@ class LoggingEventListener private constructor(
   ) : EventListener.Factory {
     override fun create(call: Call): EventListener = LoggingEventListener(logger)
   }
+
+  companion object
 }