Added support for pulled atoms for stats-log-api-gen

Currently, stats-log-api-gen allows statsd clients to send events for
pushed atoms to statsd using a simple auto-generated function call.
Allow support for pulled atoms so that clients no longer have to
hand-construct StatsEvent objects by calling StatsEvent write methods
directly and also making sure that the appropriate annotations are
added. This support is for Java clients only for now.

Bug: 160368804
Test: Ran `m statslog-framework-java-gen` and completed successfully
Test: Ran `m` and completed successfully
Test: Ran `m stats-log-api-gen-test && out/host/linux-x86/nativetest/stats-log-api-gen-test/stats-log-api-gen-test`
Test: Ran `atest CtsStatsdHostTestCases:android.cts.statsd.atom` and all passed except for CTS tests related to a SIM card because the testing device does not have a SIM card
Change-Id: Ie2cbb298690ce71ff7fe7457b17b9d7bdbb24f6b

1 files changed, 184 insertions, 142 deletions

diff --git a/tools/stats_log_api_gen/java_writer.cpp b/tools/stats_log_api_gen/java_writer.cpp
index f4c937c3f599..ffbe9f800736 100644
--- a/tools/stats_log_api_gen/java_writer.cpp
+++ b/tools/stats_log_api_gen/java_writer.cpp
@@ -96,29 +96,160 @@ static void write_annotations(FILE* out, int argIndex,
     }
 }
 
+static void write_method_signature(FILE* out, const vector<java_type_t>& signature,
+                                   const AtomDecl& attributionDecl) {
+    int argIndex = 1;
+    for (vector<java_type_t>::const_iterator arg = signature.begin(); arg != signature.end();
+         arg++) {
+        if (*arg == JAVA_TYPE_ATTRIBUTION_CHAIN) {
+            for (auto chainField : attributionDecl.fields) {
+                fprintf(out, ", %s[] %s", java_type_name(chainField.javaType),
+                        chainField.name.c_str());
+            }
+        } else if (*arg == JAVA_TYPE_KEY_VALUE_PAIR) {
+            fprintf(out, ", android.util.SparseArray<Object> valueMap");
+        } else {
+            fprintf(out, ", %s arg%d", java_type_name(*arg), argIndex);
+        }
+        argIndex++;
+    }
+}
+
+static int write_method_body(FILE* out, const vector<java_type_t>& signature,
+                             const FieldNumberToAtomDeclSet& fieldNumberToAtomDeclSet,
+                             const AtomDecl& attributionDecl, const string& indent) {
+    // Start StatsEvent.Builder.
+    fprintf(out,
+            "%s        final StatsEvent.Builder builder = "
+            "StatsEvent.newBuilder();\n",
+            indent.c_str());
+
+    // Write atom code.
+    fprintf(out, "%s        builder.setAtomId(code);\n", indent.c_str());
+    write_annotations(out, ATOM_ID_FIELD_NUMBER, fieldNumberToAtomDeclSet);
+
+    // Write the args.
+    int argIndex = 1;
+    for (vector<java_type_t>::const_iterator arg = signature.begin(); arg != signature.end();
+         arg++) {
+        switch (*arg) {
+            case JAVA_TYPE_BOOLEAN:
+                fprintf(out, "%s        builder.writeBoolean(arg%d);\n", indent.c_str(),
+                        argIndex);
+                break;
+            case JAVA_TYPE_INT:
+            case JAVA_TYPE_ENUM:
+                fprintf(out, "%s        builder.writeInt(arg%d);\n", indent.c_str(), argIndex);
+                break;
+            case JAVA_TYPE_FLOAT:
+                fprintf(out, "%s        builder.writeFloat(arg%d);\n", indent.c_str(),
+                        argIndex);
+                break;
+            case JAVA_TYPE_LONG:
+                fprintf(out, "%s        builder.writeLong(arg%d);\n", indent.c_str(), argIndex);
+                break;
+            case JAVA_TYPE_STRING:
+                fprintf(out, "%s        builder.writeString(arg%d);\n", indent.c_str(),
+                        argIndex);
+                break;
+            case JAVA_TYPE_BYTE_ARRAY:
+                fprintf(out,
+                        "%s        builder.writeByteArray(null == arg%d ? new byte[0] : "
+                        "arg%d);\n",
+                        indent.c_str(), argIndex, argIndex);
+                break;
+            case JAVA_TYPE_ATTRIBUTION_CHAIN: {
+                const char* uidName = attributionDecl.fields.front().name.c_str();
+                const char* tagName = attributionDecl.fields.back().name.c_str();
+
+                fprintf(out, "%s        builder.writeAttributionChain(\n", indent.c_str());
+                fprintf(out, "%s                null == %s ? new int[0] : %s,\n",
+                        indent.c_str(), uidName, uidName);
+                fprintf(out, "%s                null == %s ? new String[0] : %s);\n",
+                        indent.c_str(), tagName, tagName);
+                break;
+            }
+            case JAVA_TYPE_KEY_VALUE_PAIR:
+                fprintf(out, "\n");
+                fprintf(out, "%s        // Write KeyValuePairs.\n", indent.c_str());
+                fprintf(out, "%s        final int count = valueMap.size();\n", indent.c_str());
+                fprintf(out, "%s        android.util.SparseIntArray intMap = null;\n",
+                        indent.c_str());
+                fprintf(out, "%s        android.util.SparseLongArray longMap = null;\n",
+                        indent.c_str());
+                fprintf(out, "%s        android.util.SparseArray<String> stringMap = null;\n",
+                        indent.c_str());
+                fprintf(out, "%s        android.util.SparseArray<Float> floatMap = null;\n",
+                        indent.c_str());
+                fprintf(out, "%s        for (int i = 0; i < count; i++) {\n", indent.c_str());
+                fprintf(out, "%s            final int key = valueMap.keyAt(i);\n",
+                        indent.c_str());
+                fprintf(out, "%s            final Object value = valueMap.valueAt(i);\n",
+                        indent.c_str());
+                fprintf(out, "%s            if (value instanceof Integer) {\n", indent.c_str());
+                fprintf(out, "%s                if (null == intMap) {\n", indent.c_str());
+                fprintf(out,
+                        "%s                    intMap = new "
+                        "android.util.SparseIntArray();\n",
+                        indent.c_str());
+                fprintf(out, "%s                }\n", indent.c_str());
+                fprintf(out, "%s                intMap.put(key, (Integer) value);\n",
+                        indent.c_str());
+                fprintf(out, "%s            } else if (value instanceof Long) {\n",
+                        indent.c_str());
+                fprintf(out, "%s                if (null == longMap) {\n", indent.c_str());
+                fprintf(out,
+                        "%s                    longMap = new "
+                        "android.util.SparseLongArray();\n",
+                        indent.c_str());
+                fprintf(out, "%s                }\n", indent.c_str());
+                fprintf(out, "%s                longMap.put(key, (Long) value);\n",
+                        indent.c_str());
+                fprintf(out, "%s            } else if (value instanceof String) {\n",
+                        indent.c_str());
+                fprintf(out, "%s                if (null == stringMap) {\n", indent.c_str());
+                fprintf(out,
+                        "%s                    stringMap = new "
+                        "android.util.SparseArray<>();\n",
+                        indent.c_str());
+                fprintf(out, "%s                }\n", indent.c_str());
+                fprintf(out, "%s                stringMap.put(key, (String) value);\n",
+                        indent.c_str());
+                fprintf(out, "%s            } else if (value instanceof Float) {\n",
+                        indent.c_str());
+                fprintf(out, "%s                if (null == floatMap) {\n", indent.c_str());
+                fprintf(out,
+                        "%s                    floatMap = new "
+                        "android.util.SparseArray<>();\n",
+                        indent.c_str());
+                fprintf(out, "%s                }\n", indent.c_str());
+                fprintf(out, "%s                floatMap.put(key, (Float) value);\n",
+                        indent.c_str());
+                fprintf(out, "%s            }\n", indent.c_str());
+                fprintf(out, "%s        }\n", indent.c_str());
+                fprintf(out,
+                        "%s        builder.writeKeyValuePairs("
+                        "intMap, longMap, stringMap, floatMap);\n",
+                        indent.c_str());
+                break;
+            default:
+                // Unsupported types: OBJECT, DOUBLE.
+                fprintf(stderr, "Encountered unsupported type.");
+                return 1;
+        }
+        write_annotations(out, argIndex, fieldNumberToAtomDeclSet);
+        argIndex++;
+    }
+    return 0;
+}
+
 static int write_java_methods(FILE* out, const SignatureInfoMap& signatureInfoMap,
                               const AtomDecl& attributionDecl, const bool supportQ) {
     for (auto signatureInfoMapIt = signatureInfoMap.begin();
          signatureInfoMapIt != signatureInfoMap.end(); signatureInfoMapIt++) {
         // Print method signature.
         fprintf(out, "    public static void write(int code");
-        const vector<java_type_t>& signature = signatureInfoMapIt->first;
-        const FieldNumberToAtomDeclSet& fieldNumberToAtomDeclSet = signatureInfoMapIt->second;
-        int argIndex = 1;
-        for (vector<java_type_t>::const_iterator arg = signature.begin(); arg != signature.end();
-             arg++) {
-            if (*arg == JAVA_TYPE_ATTRIBUTION_CHAIN) {
-                for (auto chainField : attributionDecl.fields) {
-                    fprintf(out, ", %s[] %s", java_type_name(chainField.javaType),
-                            chainField.name.c_str());
-                }
-            } else if (*arg == JAVA_TYPE_KEY_VALUE_PAIR) {
-                fprintf(out, ", android.util.SparseArray<Object> valueMap");
-            } else {
-                fprintf(out, ", %s arg%d", java_type_name(*arg), argIndex);
-            }
-            argIndex++;
-        }
+        write_method_signature(out, signatureInfoMapIt->first, attributionDecl);
         fprintf(out, ") {\n");
 
         // Print method body.
@@ -128,130 +259,13 @@ static int write_java_methods(FILE* out, const SignatureInfoMap& signatureInfoMa
             indent = "    ";
         }
 
-        // Start StatsEvent.Builder.
-        fprintf(out,
-                "%s        final StatsEvent.Builder builder = "
-                "StatsEvent.newBuilder();\n",
-                indent.c_str());
-
-        // Write atom code.
-        fprintf(out, "%s        builder.setAtomId(code);\n", indent.c_str());
-        write_annotations(out, ATOM_ID_FIELD_NUMBER, fieldNumberToAtomDeclSet);
-
-        // Write the args.
-        argIndex = 1;
-        for (vector<java_type_t>::const_iterator arg = signature.begin(); arg != signature.end();
-             arg++) {
-            switch (*arg) {
-                case JAVA_TYPE_BOOLEAN:
-                    fprintf(out, "%s        builder.writeBoolean(arg%d);\n", indent.c_str(),
-                            argIndex);
-                    break;
-                case JAVA_TYPE_INT:
-                case JAVA_TYPE_ENUM:
-                    fprintf(out, "%s        builder.writeInt(arg%d);\n", indent.c_str(), argIndex);
-                    break;
-                case JAVA_TYPE_FLOAT:
-                    fprintf(out, "%s        builder.writeFloat(arg%d);\n", indent.c_str(),
-                            argIndex);
-                    break;
-                case JAVA_TYPE_LONG:
-                    fprintf(out, "%s        builder.writeLong(arg%d);\n", indent.c_str(), argIndex);
-                    break;
-                case JAVA_TYPE_STRING:
-                    fprintf(out, "%s        builder.writeString(arg%d);\n", indent.c_str(),
-                            argIndex);
-                    break;
-                case JAVA_TYPE_BYTE_ARRAY:
-                    fprintf(out,
-                            "%s        builder.writeByteArray(null == arg%d ? new byte[0] : "
-                            "arg%d);\n",
-                            indent.c_str(), argIndex, argIndex);
-                    break;
-                case JAVA_TYPE_ATTRIBUTION_CHAIN: {
-                    const char* uidName = attributionDecl.fields.front().name.c_str();
-                    const char* tagName = attributionDecl.fields.back().name.c_str();
-
-                    fprintf(out, "%s        builder.writeAttributionChain(\n", indent.c_str());
-                    fprintf(out, "%s                null == %s ? new int[0] : %s,\n",
-                            indent.c_str(), uidName, uidName);
-                    fprintf(out, "%s                null == %s ? new String[0] : %s);\n",
-                            indent.c_str(), tagName, tagName);
-                    break;
-                }
-                case JAVA_TYPE_KEY_VALUE_PAIR:
-                    fprintf(out, "\n");
-                    fprintf(out, "%s        // Write KeyValuePairs.\n", indent.c_str());
-                    fprintf(out, "%s        final int count = valueMap.size();\n", indent.c_str());
-                    fprintf(out, "%s        android.util.SparseIntArray intMap = null;\n",
-                            indent.c_str());
-                    fprintf(out, "%s        android.util.SparseLongArray longMap = null;\n",
-                            indent.c_str());
-                    fprintf(out, "%s        android.util.SparseArray<String> stringMap = null;\n",
-                            indent.c_str());
-                    fprintf(out, "%s        android.util.SparseArray<Float> floatMap = null;\n",
-                            indent.c_str());
-                    fprintf(out, "%s        for (int i = 0; i < count; i++) {\n", indent.c_str());
-                    fprintf(out, "%s            final int key = valueMap.keyAt(i);\n",
-                            indent.c_str());
-                    fprintf(out, "%s            final Object value = valueMap.valueAt(i);\n",
-                            indent.c_str());
-                    fprintf(out, "%s            if (value instanceof Integer) {\n", indent.c_str());
-                    fprintf(out, "%s                if (null == intMap) {\n", indent.c_str());
-                    fprintf(out,
-                            "%s                    intMap = new "
-                            "android.util.SparseIntArray();\n",
-                            indent.c_str());
-                    fprintf(out, "%s                }\n", indent.c_str());
-                    fprintf(out, "%s                intMap.put(key, (Integer) value);\n",
-                            indent.c_str());
-                    fprintf(out, "%s            } else if (value instanceof Long) {\n",
-                            indent.c_str());
-                    fprintf(out, "%s                if (null == longMap) {\n", indent.c_str());
-                    fprintf(out,
-                            "%s                    longMap = new "
-                            "android.util.SparseLongArray();\n",
-                            indent.c_str());
-                    fprintf(out, "%s                }\n", indent.c_str());
-                    fprintf(out, "%s                longMap.put(key, (Long) value);\n",
-                            indent.c_str());
-                    fprintf(out, "%s            } else if (value instanceof String) {\n",
-                            indent.c_str());
-                    fprintf(out, "%s                if (null == stringMap) {\n", indent.c_str());
-                    fprintf(out,
-                            "%s                    stringMap = new "
-                            "android.util.SparseArray<>();\n",
-                            indent.c_str());
-                    fprintf(out, "%s                }\n", indent.c_str());
-                    fprintf(out, "%s                stringMap.put(key, (String) value);\n",
-                            indent.c_str());
-                    fprintf(out, "%s            } else if (value instanceof Float) {\n",
-                            indent.c_str());
-                    fprintf(out, "%s                if (null == floatMap) {\n", indent.c_str());
-                    fprintf(out,
-                            "%s                    floatMap = new "
-                            "android.util.SparseArray<>();\n",
-                            indent.c_str());
-                    fprintf(out, "%s                }\n", indent.c_str());
-                    fprintf(out, "%s                floatMap.put(key, (Float) value);\n",
-                            indent.c_str());
-                    fprintf(out, "%s            }\n", indent.c_str());
-                    fprintf(out, "%s        }\n", indent.c_str());
-                    fprintf(out,
-                            "%s        builder.writeKeyValuePairs("
-                            "intMap, longMap, stringMap, floatMap);\n",
-                            indent.c_str());
-                    break;
-                default:
-                    // Unsupported types: OBJECT, DOUBLE.
-                    fprintf(stderr, "Encountered unsupported type.");
-                    return 1;
-            }
-            write_annotations(out, argIndex, fieldNumberToAtomDeclSet);
-            argIndex++;
+        int ret = write_method_body(out, signatureInfoMapIt->first, signatureInfoMapIt->second,
+                                    attributionDecl, indent);
+        if (ret != 0) {
+            return ret;
         }
-
         fprintf(out, "\n");
+
         fprintf(out, "%s        builder.usePooledBuffer();\n", indent.c_str());
         fprintf(out, "%s        StatsLog.write(builder.build());\n", indent.c_str());
 
@@ -259,9 +273,9 @@ static int write_java_methods(FILE* out, const SignatureInfoMap& signatureInfoMa
         if (supportQ) {
             fprintf(out, "        } else {\n");
             fprintf(out, "            QLogger.write(code");
-            argIndex = 1;
-            for (vector<java_type_t>::const_iterator arg = signature.begin();
-                 arg != signature.end(); arg++) {
+            int argIndex = 1;
+            for (vector<java_type_t>::const_iterator arg = signatureInfoMapIt->first.begin();
+                 arg != signatureInfoMapIt->first.end(); arg++) {
                 if (*arg == JAVA_TYPE_ATTRIBUTION_CHAIN) {
                     const char* uidName = attributionDecl.fields.front().name.c_str();
                     const char* tagName = attributionDecl.fields.back().name.c_str();
@@ -285,6 +299,32 @@ static int write_java_methods(FILE* out, const SignatureInfoMap& signatureInfoMa
     return 0;
 }
 
+static int write_java_build_stats_event_methods(FILE* out, const SignatureInfoMap& signatureInfoMap,
+                              const AtomDecl& attributionDecl) {
+    for (auto signatureInfoMapIt = signatureInfoMap.begin();
+         signatureInfoMapIt != signatureInfoMap.end(); signatureInfoMapIt++) {
+        // Print method signature.
+        fprintf(out, "    public static StatsEvent buildStatsEvent(int code");
+        write_method_signature(out, signatureInfoMapIt->first, attributionDecl);
+        fprintf(out, ") {\n");
+
+        // Print method body.
+        string indent("");
+        int ret = write_method_body(out, signatureInfoMapIt->first, signatureInfoMapIt->second,
+                                    attributionDecl, indent);
+        if (ret != 0) {
+            return ret;
+        }
+        fprintf(out, "\n");
+
+        fprintf(out, "%s        return builder.build();\n", indent.c_str());
+
+        fprintf(out, "    }\n");  // method
+        fprintf(out, "\n");
+    }
+    return 0;
+}
+
 int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl& attributionDecl,
                          const string& javaClass, const string& javaPackage, const bool supportQ,
                          const bool supportWorkSource) {
@@ -319,6 +359,8 @@ int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl& attribut
     fprintf(out, "    // Write methods\n");
     errors += write_java_methods(out, atoms.signatureInfoMap, attributionDecl, supportQ);
     errors += write_java_non_chained_methods(out, atoms.nonChainedSignatureInfoMap);
+    errors += write_java_build_stats_event_methods(out, atoms.pulledAtomsSignatureInfoMap,
+                                                   attributionDecl);
     if (supportWorkSource) {
         errors += write_java_work_source_methods(out, atoms.signatureInfoMap);
     }