diff --git a/cpp/codegen/config/android.py b/cpp/codegen/config/android.py
index 12a87a0e..fd323c06 100644
--- a/cpp/codegen/config/android.py
+++ b/cpp/codegen/config/android.py
@@ -69,6 +69,7 @@
     "TRACE_START",
     "TRACE_BACKWARDS",
     "TRACE_TIMEOUT",
+    "TRACE_TRIGGER",
     "BLACKBOX_TRACE_START",
     "COUNTER",
     "STACK_FRAME",
diff --git a/cpp/generated/EntryType.cpp b/cpp/generated/EntryType.cpp
index afdf3815..cddee104 100644
--- a/cpp/generated/EntryType.cpp
+++ b/cpp/generated/EntryType.cpp
@@ -1,4 +1,4 @@
-// @generated SignedSource<<390e60e658a65e09e8228eae35f255b4>>
+// @generated SignedSource<<884d58f3557768478d1eb759f0bfc4ba>>
 
 #include <stdexcept>
 #include <profilo/entries/EntryType.h>
@@ -52,6 +52,7 @@ const char* to_string(EntryType type) {
     case EntryType::TRACE_START: return "TRACE_START";
     case EntryType::TRACE_BACKWARDS: return "TRACE_BACKWARDS";
     case EntryType::TRACE_TIMEOUT: return "TRACE_TIMEOUT";
+    case EntryType::TRACE_TRIGGER: return "TRACE_TRIGGER";
     case EntryType::BLACKBOX_TRACE_START: return "BLACKBOX_TRACE_START";
     case EntryType::COUNTER: return "COUNTER";
     case EntryType::STACK_FRAME: return "STACK_FRAME";
diff --git a/cpp/generated/EntryType.h b/cpp/generated/EntryType.h
index fca2c8b2..f42df93d 100644
--- a/cpp/generated/EntryType.h
+++ b/cpp/generated/EntryType.h
@@ -1,4 +1,4 @@
-// @generated SignedSource<<f0679634001e78402be9dd5db5850900>>
+// @generated SignedSource<<f47b996e783580997f3b9e84739d7721>>
 
 #pragma once
 
@@ -49,79 +49,80 @@ enum class EntryType {
   TRACE_START = 40,
   TRACE_BACKWARDS = 41,
   TRACE_TIMEOUT = 42,
-  BLACKBOX_TRACE_START = 43,
-  COUNTER = 44,
-  STACK_FRAME = 45,
-  QPL_START = 46,
-  QPL_END = 47,
-  QPL_CANCEL = 48,
-  QPL_NOTE = 49,
-  QPL_POINT = 50,
-  QPL_EVENT = 51,
-  TRACE_ANNOTATION = 52,
-  WAIT_START = 53,
-  WAIT_END = 54,
-  WAIT_SIGNAL = 55,
-  STRING_KEY = 56,
-  STRING_VALUE = 57,
-  QPL_TAG = 58,
-  QPL_ANNOTATION = 59,
-  TRACE_THREAD_NAME = 60,
-  TRACE_PRE_END = 61,
-  TRACE_THREAD_PRI = 62,
-  MINOR_FAULT = 63,
-  MAJOR_FAULT = 64,
-  PERFEVENTS_LOST = 65,
-  CLASS_LOAD = 66,
-  JAVASCRIPT_STACK_FRAME = 67,
-  MESSAGE_START = 68,
-  MESSAGE_END = 69,
-  CLASS_VALUE = 70,
-  HTTP2_REQUEST_INITIATED = 71,
-  HTTP2_FRAME_HEADER = 72,
-  HTTP2_WINDOW_UPDATE = 73,
-  HTTP2_PRIORITY = 74,
-  HTTP2_EGRESS_FRAME_HEADER = 75,
-  PROCESS_LIST = 76,
-  IO_START = 77,
-  IO_END = 78,
-  CPU_COUNTER = 79,
-  CLASS_LOAD_START = 80,
-  CLASS_LOAD_END = 81,
-  CLASS_LOAD_FAILED = 82,
-  STRING_NAME = 83,
-  JAVA_FRAME_NAME = 84,
-  BINDER_START = 85,
-  BINDER_END = 86,
-  MEMORY_ALLOCATION = 87,
-  MEMORY_DEALLOCATION = 88,
-  STKERR_EMPTYSTACK = 89,
-  STKERR_STACKOVERFLOW = 90,
-  STKERR_NOSTACKFORTHREAD = 91,
-  STKERR_SIGNALINTERRUPT = 92,
-  STKERR_NESTEDUNWIND = 93,
-  STKERR_PARTIALSTACK = 94,
-  STKERR_STACKCOPYFAILED = 95,
-  STKERR_QUEUEOVERFLOW = 96,
-  MAPPING = 97,
-  LOGGER_PRIORITY = 98,
-  CONDITIONAL_UPLOAD_RATE = 99,
-  NATIVE_ALLOC = 100,
-  NATIVE_FREE = 101,
-  NATIVE_ALLOC_FAILURE = 102,
-  NATIVE_STACK_FRAME = 103,
-  NATIVE_FRAME_NAME = 104,
-  MEMORY_MAPPED = 105,
-  MEMORY_UNMAPPED = 106,
-  ION_MEMORY_ALLOC = 107,
-  ION_MEMORY_FREE = 108,
-  ION_MEMORY_MAPPED = 109,
-  GPU_MEMORY_ALLOC = 110,
-  GPU_MEMORY_FREE = 111,
-  THREAD_START = 112,
-  THREAD_FINISH = 113,
-  CPU_STACK_SAMPLE = 114,
-  WALL_STACK_SAMPLE = 115,
+  TRACE_TRIGGER = 43,
+  BLACKBOX_TRACE_START = 44,
+  COUNTER = 45,
+  STACK_FRAME = 46,
+  QPL_START = 47,
+  QPL_END = 48,
+  QPL_CANCEL = 49,
+  QPL_NOTE = 50,
+  QPL_POINT = 51,
+  QPL_EVENT = 52,
+  TRACE_ANNOTATION = 53,
+  WAIT_START = 54,
+  WAIT_END = 55,
+  WAIT_SIGNAL = 56,
+  STRING_KEY = 57,
+  STRING_VALUE = 58,
+  QPL_TAG = 59,
+  QPL_ANNOTATION = 60,
+  TRACE_THREAD_NAME = 61,
+  TRACE_PRE_END = 62,
+  TRACE_THREAD_PRI = 63,
+  MINOR_FAULT = 64,
+  MAJOR_FAULT = 65,
+  PERFEVENTS_LOST = 66,
+  CLASS_LOAD = 67,
+  JAVASCRIPT_STACK_FRAME = 68,
+  MESSAGE_START = 69,
+  MESSAGE_END = 70,
+  CLASS_VALUE = 71,
+  HTTP2_REQUEST_INITIATED = 72,
+  HTTP2_FRAME_HEADER = 73,
+  HTTP2_WINDOW_UPDATE = 74,
+  HTTP2_PRIORITY = 75,
+  HTTP2_EGRESS_FRAME_HEADER = 76,
+  PROCESS_LIST = 77,
+  IO_START = 78,
+  IO_END = 79,
+  CPU_COUNTER = 80,
+  CLASS_LOAD_START = 81,
+  CLASS_LOAD_END = 82,
+  CLASS_LOAD_FAILED = 83,
+  STRING_NAME = 84,
+  JAVA_FRAME_NAME = 85,
+  BINDER_START = 86,
+  BINDER_END = 87,
+  MEMORY_ALLOCATION = 88,
+  MEMORY_DEALLOCATION = 89,
+  STKERR_EMPTYSTACK = 90,
+  STKERR_STACKOVERFLOW = 91,
+  STKERR_NOSTACKFORTHREAD = 92,
+  STKERR_SIGNALINTERRUPT = 93,
+  STKERR_NESTEDUNWIND = 94,
+  STKERR_PARTIALSTACK = 95,
+  STKERR_STACKCOPYFAILED = 96,
+  STKERR_QUEUEOVERFLOW = 97,
+  MAPPING = 98,
+  LOGGER_PRIORITY = 99,
+  CONDITIONAL_UPLOAD_RATE = 100,
+  NATIVE_ALLOC = 101,
+  NATIVE_FREE = 102,
+  NATIVE_ALLOC_FAILURE = 103,
+  NATIVE_STACK_FRAME = 104,
+  NATIVE_FRAME_NAME = 105,
+  MEMORY_MAPPED = 106,
+  MEMORY_UNMAPPED = 107,
+  ION_MEMORY_ALLOC = 108,
+  ION_MEMORY_FREE = 109,
+  ION_MEMORY_MAPPED = 110,
+  GPU_MEMORY_ALLOC = 111,
+  GPU_MEMORY_FREE = 112,
+  THREAD_START = 113,
+  THREAD_FINISH = 114,
+  CPU_STACK_SAMPLE = 115,
+  WALL_STACK_SAMPLE = 116,
 };
 
 
diff --git a/cpp/generated/EntryType.java b/cpp/generated/EntryType.java
index e5d9658f..7c8d1a0f 100644
--- a/cpp/generated/EntryType.java
+++ b/cpp/generated/EntryType.java
@@ -1,4 +1,4 @@
-// @generated SignedSource<<5e4debd0d0a6279e0d17129e294db714>>
+// @generated SignedSource<<6e7a15b5b6fc92e87cabe8628bfac979>>
 
 package com.facebook.profilo.entries;
 
@@ -47,79 +47,80 @@ public class EntryType {
   public static final int TRACE_START = 40;
   public static final int TRACE_BACKWARDS = 41;
   public static final int TRACE_TIMEOUT = 42;
-  public static final int BLACKBOX_TRACE_START = 43;
-  public static final int COUNTER = 44;
-  public static final int STACK_FRAME = 45;
-  public static final int QPL_START = 46;
-  public static final int QPL_END = 47;
-  public static final int QPL_CANCEL = 48;
-  public static final int QPL_NOTE = 49;
-  public static final int QPL_POINT = 50;
-  public static final int QPL_EVENT = 51;
-  public static final int TRACE_ANNOTATION = 52;
-  public static final int WAIT_START = 53;
-  public static final int WAIT_END = 54;
-  public static final int WAIT_SIGNAL = 55;
-  public static final int STRING_KEY = 56;
-  public static final int STRING_VALUE = 57;
-  public static final int QPL_TAG = 58;
-  public static final int QPL_ANNOTATION = 59;
-  public static final int TRACE_THREAD_NAME = 60;
-  public static final int TRACE_PRE_END = 61;
-  public static final int TRACE_THREAD_PRI = 62;
-  public static final int MINOR_FAULT = 63;
-  public static final int MAJOR_FAULT = 64;
-  public static final int PERFEVENTS_LOST = 65;
-  public static final int CLASS_LOAD = 66;
-  public static final int JAVASCRIPT_STACK_FRAME = 67;
-  public static final int MESSAGE_START = 68;
-  public static final int MESSAGE_END = 69;
-  public static final int CLASS_VALUE = 70;
-  public static final int HTTP2_REQUEST_INITIATED = 71;
-  public static final int HTTP2_FRAME_HEADER = 72;
-  public static final int HTTP2_WINDOW_UPDATE = 73;
-  public static final int HTTP2_PRIORITY = 74;
-  public static final int HTTP2_EGRESS_FRAME_HEADER = 75;
-  public static final int PROCESS_LIST = 76;
-  public static final int IO_START = 77;
-  public static final int IO_END = 78;
-  public static final int CPU_COUNTER = 79;
-  public static final int CLASS_LOAD_START = 80;
-  public static final int CLASS_LOAD_END = 81;
-  public static final int CLASS_LOAD_FAILED = 82;
-  public static final int STRING_NAME = 83;
-  public static final int JAVA_FRAME_NAME = 84;
-  public static final int BINDER_START = 85;
-  public static final int BINDER_END = 86;
-  public static final int MEMORY_ALLOCATION = 87;
-  public static final int MEMORY_DEALLOCATION = 88;
-  public static final int STKERR_EMPTYSTACK = 89;
-  public static final int STKERR_STACKOVERFLOW = 90;
-  public static final int STKERR_NOSTACKFORTHREAD = 91;
-  public static final int STKERR_SIGNALINTERRUPT = 92;
-  public static final int STKERR_NESTEDUNWIND = 93;
-  public static final int STKERR_PARTIALSTACK = 94;
-  public static final int STKERR_STACKCOPYFAILED = 95;
-  public static final int STKERR_QUEUEOVERFLOW = 96;
-  public static final int MAPPING = 97;
-  public static final int LOGGER_PRIORITY = 98;
-  public static final int CONDITIONAL_UPLOAD_RATE = 99;
-  public static final int NATIVE_ALLOC = 100;
-  public static final int NATIVE_FREE = 101;
-  public static final int NATIVE_ALLOC_FAILURE = 102;
-  public static final int NATIVE_STACK_FRAME = 103;
-  public static final int NATIVE_FRAME_NAME = 104;
-  public static final int MEMORY_MAPPED = 105;
-  public static final int MEMORY_UNMAPPED = 106;
-  public static final int ION_MEMORY_ALLOC = 107;
-  public static final int ION_MEMORY_FREE = 108;
-  public static final int ION_MEMORY_MAPPED = 109;
-  public static final int GPU_MEMORY_ALLOC = 110;
-  public static final int GPU_MEMORY_FREE = 111;
-  public static final int THREAD_START = 112;
-  public static final int THREAD_FINISH = 113;
-  public static final int CPU_STACK_SAMPLE = 114;
-  public static final int WALL_STACK_SAMPLE = 115;
+  public static final int TRACE_TRIGGER = 43;
+  public static final int BLACKBOX_TRACE_START = 44;
+  public static final int COUNTER = 45;
+  public static final int STACK_FRAME = 46;
+  public static final int QPL_START = 47;
+  public static final int QPL_END = 48;
+  public static final int QPL_CANCEL = 49;
+  public static final int QPL_NOTE = 50;
+  public static final int QPL_POINT = 51;
+  public static final int QPL_EVENT = 52;
+  public static final int TRACE_ANNOTATION = 53;
+  public static final int WAIT_START = 54;
+  public static final int WAIT_END = 55;
+  public static final int WAIT_SIGNAL = 56;
+  public static final int STRING_KEY = 57;
+  public static final int STRING_VALUE = 58;
+  public static final int QPL_TAG = 59;
+  public static final int QPL_ANNOTATION = 60;
+  public static final int TRACE_THREAD_NAME = 61;
+  public static final int TRACE_PRE_END = 62;
+  public static final int TRACE_THREAD_PRI = 63;
+  public static final int MINOR_FAULT = 64;
+  public static final int MAJOR_FAULT = 65;
+  public static final int PERFEVENTS_LOST = 66;
+  public static final int CLASS_LOAD = 67;
+  public static final int JAVASCRIPT_STACK_FRAME = 68;
+  public static final int MESSAGE_START = 69;
+  public static final int MESSAGE_END = 70;
+  public static final int CLASS_VALUE = 71;
+  public static final int HTTP2_REQUEST_INITIATED = 72;
+  public static final int HTTP2_FRAME_HEADER = 73;
+  public static final int HTTP2_WINDOW_UPDATE = 74;
+  public static final int HTTP2_PRIORITY = 75;
+  public static final int HTTP2_EGRESS_FRAME_HEADER = 76;
+  public static final int PROCESS_LIST = 77;
+  public static final int IO_START = 78;
+  public static final int IO_END = 79;
+  public static final int CPU_COUNTER = 80;
+  public static final int CLASS_LOAD_START = 81;
+  public static final int CLASS_LOAD_END = 82;
+  public static final int CLASS_LOAD_FAILED = 83;
+  public static final int STRING_NAME = 84;
+  public static final int JAVA_FRAME_NAME = 85;
+  public static final int BINDER_START = 86;
+  public static final int BINDER_END = 87;
+  public static final int MEMORY_ALLOCATION = 88;
+  public static final int MEMORY_DEALLOCATION = 89;
+  public static final int STKERR_EMPTYSTACK = 90;
+  public static final int STKERR_STACKOVERFLOW = 91;
+  public static final int STKERR_NOSTACKFORTHREAD = 92;
+  public static final int STKERR_SIGNALINTERRUPT = 93;
+  public static final int STKERR_NESTEDUNWIND = 94;
+  public static final int STKERR_PARTIALSTACK = 95;
+  public static final int STKERR_STACKCOPYFAILED = 96;
+  public static final int STKERR_QUEUEOVERFLOW = 97;
+  public static final int MAPPING = 98;
+  public static final int LOGGER_PRIORITY = 99;
+  public static final int CONDITIONAL_UPLOAD_RATE = 100;
+  public static final int NATIVE_ALLOC = 101;
+  public static final int NATIVE_FREE = 102;
+  public static final int NATIVE_ALLOC_FAILURE = 103;
+  public static final int NATIVE_STACK_FRAME = 104;
+  public static final int NATIVE_FRAME_NAME = 105;
+  public static final int MEMORY_MAPPED = 106;
+  public static final int MEMORY_UNMAPPED = 107;
+  public static final int ION_MEMORY_ALLOC = 108;
+  public static final int ION_MEMORY_FREE = 109;
+  public static final int ION_MEMORY_MAPPED = 110;
+  public static final int GPU_MEMORY_ALLOC = 111;
+  public static final int GPU_MEMORY_FREE = 112;
+  public static final int THREAD_START = 113;
+  public static final int THREAD_FINISH = 114;
+  public static final int CPU_STACK_SAMPLE = 115;
+  public static final int WALL_STACK_SAMPLE = 116;
 
   public static final String[] NAMES = {
     "UNKNOWN_TYPE",
@@ -165,6 +166,7 @@ public class EntryType {
     "TRACE_START",
     "TRACE_BACKWARDS",
     "TRACE_TIMEOUT",
+    "TRACE_TRIGGER",
     "BLACKBOX_TRACE_START",
     "COUNTER",
     "STACK_FRAME",