Revert "Revert "Revert "Revert "Revert "Cronet 121_0_6167_71: Merge remo...""

This reverts commit 181bb75.

Change-Id: I08f9366b868455e9e4294e0563b86b423ec395a8

Author: aymanm-google

Android.bp

@@ -177,13 +177,20 @@ filegroup {
 android_library {
     name: "cronet_java_tests",
     manifest: "components/cronet/android/test/src/org/chromium/net/AndroidManifest.xml",
+    srcs: [
+        ":cronet_logger_tests_sources",
+    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
     static_libs: [
         "cronet_aml_components_cronet_android_cronet_javatests__testing",
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "cronet_aml_java__testing",
+        "cronet_experimental_options",
+        "cronet_rate_limiter",
+        "cronet_size_buckets",
+        "cronetstatslog_autogenerated_methods",
         "guava",
         "hamcrest-library",
         "junit",
@@ -205,3 +212,103 @@ android_library {
     ],
 }
 
+// ------------------------------ TELEMETRY TARGETS --------------------------------------------
+
+genrule {
+  name: "statslog-cronet-java-gen",
+  tools: ["stats-log-api-gen"],
+  cmd: "$(location stats-log-api-gen) --java $(out) --module cronet --javaPackage android.net.http --javaClass CronetStatsLog",
+  out: ["android/net/http/CronetStatsLog.java"],
+}
+
+java_library {
+    name: "cronetstatslog_autogenerated_methods",
+    srcs: [
+        ":statslog-cronet-java-gen",
+    ],
+    libs: [
+        "androidx.annotation_annotation",
+        "framework-statsd",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "cronet_experimental_options",
+    srcs: [
+        "android/java/src/android/net/http/ExperimentalOptions.java",
+    ],
+    libs: [
+        "cronetstatslog_autogenerated_methods",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "cronet_rate_limiter",
+    srcs: [
+        "android/java/src/android/net/http/RateLimiter.java",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "cronet_size_buckets",
+    srcs: [
+        "android/java/src/android/net/http/SizeBuckets.java",
+    ],
+    libs: [
+        "cronetstatslog_autogenerated_methods",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
+java_library {
+    name: "http_client_logging",
+    srcs: [
+        "android/java/src/android/net/http/CronetLoggerImpl.java",
+    ],
+    static_libs: [
+        "cronetstatslog_autogenerated_methods",
+        "cronet_experimental_options",
+        "cronet_rate_limiter",
+        "cronet_size_buckets",
+    ],
+    libs: [
+        "androidx.annotation_annotation",
+        "cronet_aml_java",
+    ],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+    visibility: [
+        "//packages/modules/Connectivity:__subpackages__",
+    ],
+}
+
+filegroup {
+   name: "cronet_logger_tests_sources",
+   srcs: [
+        "android/javatests/src/android/net/http/SizeBucketsTest.java",
+        "android/javatests/src/android/net/http/RateLimiterTest.java",
+        "android/javatests/src/android/net/http/ExperimentalOptionsTest.java",
+    ],
+}

Android.extras.bp

@@ -8,5 +8,5 @@ third_party {
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src.git"
   }
-  version: "121.0.6167.71"
+  version: "110.0.5481.154"
 }

METADATA

@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * 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 android.net.http;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import java.nio.ByteBuffer;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.chromium.net.impl.CronetLogger;
+
+/** Logger for logging cronet's telemetry */
+public class CronetLoggerImpl extends CronetLogger {
+  private static final String TAG = CronetLoggerImpl.class.getSimpleName();
+
+  private static final MessageDigest MD5_MESSAGE_DIGEST;
+
+  static {
+    MessageDigest messageDigest;
+    try {
+      messageDigest = MessageDigest.getInstance("MD5");
+    } catch (NoSuchAlgorithmException e) {
+      Log.d(TAG, "Error while instantiating messageDigest", e);
+      messageDigest = null;
+    }
+    MD5_MESSAGE_DIGEST = messageDigest;
+  }
+
+  private final AtomicInteger samplesRateLimited = new AtomicInteger();
+  private final RateLimiter rateLimiter;
+
+  public CronetLoggerImpl(int sampleRatePerSecond) {
+    this(new RateLimiter(sampleRatePerSecond));
+  }
+
+  @VisibleForTesting
+  public CronetLoggerImpl(RateLimiter rateLimiter) {
+    super();
+    this.rateLimiter = rateLimiter;
+  }
+
+  @Override
+  public void logCronetEngineCreation(
+      int cronetEngineId,
+      CronetEngineBuilderInfo builder,
+      CronetVersion version,
+      CronetSource source) {
+
+    if (builder == null || version == null || source == null) {
+      return;
+    }
+
+    writeCronetEngineCreation(cronetEngineId, builder, version, source);
+  }
+
+  @Override
+  public void logCronetTrafficInfo(int cronetEngineId, CronetTrafficInfo trafficInfo) {
+    if (trafficInfo == null) {
+      return;
+    }
+
+    if (!rateLimiter.tryAcquire()) {
+      samplesRateLimited.incrementAndGet();
+      return;
+    }
+
+    writeCronetTrafficReported(cronetEngineId, trafficInfo, samplesRateLimited.getAndSet(0));
+  }
+
+  @SuppressWarnings("CatchingUnchecked")
+  public void writeCronetEngineCreation(
+      long cronetEngineId,
+      CronetEngineBuilderInfo builder,
+      CronetVersion version,
+      CronetSource source) {
+
+    try {
+      // Parse experimental Options
+      ExperimentalOptions experimentalOptions =
+          new ExperimentalOptions(builder.getExperimentalOptions());
+
+      CronetStatsLog.write(
+          CronetStatsLog.CRONET_ENGINE_CREATED,
+          cronetEngineId,
+          version.getMajorVersion(),
+          version.getMinorVersion(),
+          version.getBuildVersion(),
+          version.getPatchVersion(),
+          convertToProtoCronetSource(source),
+          builder.isBrotliEnabled(),
+          builder.isHttp2Enabled(),
+          convertToProtoHttpCacheMode(builder.getHttpCacheMode()),
+          builder.isPublicKeyPinningBypassForLocalTrustAnchorsEnabled(),
+          builder.isQuicEnabled(),
+          builder.isNetworkQualityEstimatorEnabled(),
+          builder.getThreadPriority(),
+          // QUIC options
+          experimentalOptions.getConnectionOptionsOption(),
+          experimentalOptions.getStoreServerConfigsInPropertiesOption().getValue(),
+          experimentalOptions.getMaxServerConfigsStoredInPropertiesOption(),
+          experimentalOptions.getIdleConnectionTimeoutSecondsOption(),
+          experimentalOptions.getGoawaySessionsOnIpChangeOption().getValue(),
+          experimentalOptions.getCloseSessionsOnIpChangeOption().getValue(),
+          experimentalOptions.getMigrateSessionsOnNetworkChangeV2Option().getValue(),
+          experimentalOptions.getMigrateSessionsEarlyV2().getValue(),
+          experimentalOptions.getDisableBidirectionalStreamsOption().getValue(),
+          experimentalOptions.getMaxTimeBeforeCryptoHandshakeSecondsOption(),
+          experimentalOptions.getMaxIdleTimeBeforeCryptoHandshakeSecondsOption(),
+          experimentalOptions.getEnableSocketRecvOptimizationOption().getValue(),
+          // AsyncDNS
+          experimentalOptions.getAsyncDnsEnableOption().getValue(),
+          // StaleDNS
+          experimentalOptions.getStaleDnsEnableOption().getValue(),
+          experimentalOptions.getStaleDnsDelayMillisOption(),
+          experimentalOptions.getStaleDnsMaxExpiredTimeMillisOption(),
+          experimentalOptions.getStaleDnsMaxStaleUsesOption(),
+          experimentalOptions.getStaleDnsAllowOtherNetworkOption().getValue(),
+          experimentalOptions.getStaleDnsPersistToDiskOption().getValue(),
+          experimentalOptions.getStaleDnsPersistDelayMillisOption(),
+          experimentalOptions.getStaleDnsUseStaleOnNameNotResolvedOption().getValue(),
+          experimentalOptions.getDisableIpv6OnWifiOption().getValue(),
+          /* cronet_initialization_ref = */ -1);
+    } catch (Exception e) { // catching all exceptions since we don't want to crash the client
+      Log.d(
+          TAG,
+          String.format(
+              "Failed to log CronetEngine:%s creation: %s", cronetEngineId, e.getMessage()));
+    }
+  }
+
+  @SuppressWarnings("CatchingUnchecked")
+  @VisibleForTesting
+  public void writeCronetTrafficReported(
+      long cronetEngineId, CronetTrafficInfo trafficInfo, int samplesRateLimitedCount) {
+    try {
+      CronetStatsLog.write(
+          CronetStatsLog.CRONET_TRAFFIC_REPORTED,
+          cronetEngineId,
+          SizeBuckets.calcRequestHeadersSizeBucket(trafficInfo.getRequestHeaderSizeInBytes()),
+          SizeBuckets.calcRequestBodySizeBucket(trafficInfo.getRequestBodySizeInBytes()),
+          SizeBuckets.calcResponseHeadersSizeBucket(trafficInfo.getResponseHeaderSizeInBytes()),
+          SizeBuckets.calcResponseBodySizeBucket(trafficInfo.getResponseBodySizeInBytes()),
+          trafficInfo.getResponseStatusCode(),
+          hashNegotiatedProtocol(trafficInfo.getNegotiatedProtocol()),
+          (int) trafficInfo.getHeadersLatency().toMillis(),
+          (int) trafficInfo.getTotalLatency().toMillis(),
+          trafficInfo.wasConnectionMigrationAttempted(),
+          trafficInfo.didConnectionMigrationSucceed(),
+          samplesRateLimitedCount,
+          /* terminal_state = */ CronetStatsLog.CRONET_TRAFFIC_REPORTED__TERMINAL_STATE__STATE_UNKNOWN,
+          /* user_callback_exception_count = */ -1,
+          /* total_idle_time_millis = */ -1,
+          /* total_user_executor_execute_latency_millis = */ -1,
+          /* read_count = */ -1,
+          /* on_upload_read_count = */ -1,
+          /* is_bidi_stream = */ CronetStatsLog.CRONET_TRAFFIC_REPORTED__IS_BIDI_STREAM__UNSET); // 0 maps to UNKNOWN
+    } catch (Exception e) {
+      // using addAndGet because another thread might have modified samplesRateLimited's value
+      samplesRateLimited.addAndGet(samplesRateLimitedCount);
+      Log.d(
+          TAG,
+          String.format(
+              "Failed to log cronet traffic sample for CronetEngine %s: %s",
+              cronetEngineId, e.getMessage()));
+    }
+  }
+
+  private static int convertToProtoCronetSource(CronetSource source) {
+    switch (source) {
+      case CRONET_SOURCE_STATICALLY_LINKED:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_STATICALLY_LINKED;
+      case CRONET_SOURCE_PLAY_SERVICES:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_GMSCORE_DYNAMITE;
+      case CRONET_SOURCE_FALLBACK:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_FALLBACK;
+      case CRONET_SOURCE_UNSPECIFIED:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_UNSPECIFIED;
+    }
+    return CronetStatsLog.CRONET_ENGINE_CREATED__SOURCE__CRONET_SOURCE_UNSPECIFIED;
+  }
+
+  private static int convertToProtoHttpCacheMode(int httpCacheMode) {
+    switch (httpCacheMode) {
+      case 0:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_DISABLED;
+      case 1:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_DISK;
+      case 2:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_DISK_NO_HTTP;
+      case 3:
+        return CronetStatsLog.CRONET_ENGINE_CREATED__HTTP_CACHE_MODE__HTTP_CACHE_IN_MEMORY;
+      default:
+        throw new IllegalArgumentException("Expected httpCacheMode to range from 0 to 3");
+    }
+  }
+
+  private static long hashNegotiatedProtocol(String protocol) {
+    if (MD5_MESSAGE_DIGEST == null || protocol == null || protocol.isEmpty()) {
+      return 0L;
+    }
+
+    byte[] md = MD5_MESSAGE_DIGEST.digest(protocol.getBytes(UTF_8));
+    return ByteBuffer.wrap(md).getLong();
+  }
+}