diff --git a/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn
index e102b27d8c..0f590c65bd 100644
--- a/api/audio_codecs/BUILD.gn
+++ b/api/audio_codecs/BUILD.gn
@@ -35,6 +35,7 @@ rtc_library("audio_codecs_api") {
     "../../api:field_trials_view",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:sanitizer",
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 1e9c23669d..d8549e9037 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -194,6 +194,7 @@ rtc_library("rtc_software_fallback_wrappers") {
     "../../modules/video_coding:video_codec_interface",
     "../../modules/video_coding:video_coding_utility",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:rtc_export",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index c759736fb1..8b8c14d05e 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -211,6 +211,7 @@ rtc_library("rtp_sender") {
     "../modules/video_coding:video_codec_interface",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -322,6 +323,7 @@ rtc_library("call") {
     "../modules/video_coding",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 5b4be9f5bb..6156d3cad8 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -60,6 +60,7 @@ rtc_library("common_video") {
     "../rtc_base:bitstream_reader",
     "../rtc_base:buffer",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:race_checker",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 09be87a598..f4e91143cd 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -301,6 +301,7 @@ rtc_library("rtc_audio_video") {
     "../rtc_base:byte_order",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:ignore_wundef",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -420,6 +421,7 @@ if (rtc_build_dcsctp) {
       "../p2p:rtc_p2p",
       "../rtc_base:checks",
       "../rtc_base:copy_on_write_buffer",
+      "../rtc_base:event_tracer",
       "../rtc_base:logging",
       "../rtc_base:random",
       "../rtc_base:rtc_base_approved",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index b1847cefea..a09ea4b2a5 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1035,6 +1035,7 @@ rtc_library("neteq") {
     "../../rtc_base:audio_format_to_string",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:gtest_prod",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index e53c002e28..2123cba1c5 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -179,6 +179,7 @@ rtc_library("audio_processing") {
     "../../common_audio/third_party/ooura:fft_size_256",
     "../../rtc_base:atomicops",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:gtest_prod",
     "../../rtc_base:ignore_wundef",
     "../../rtc_base:logging",
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index edafe332c9..1f2d6b9e6e 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -488,6 +488,7 @@ rtc_library("desktop_capture_generic") {
     "../../api:sequence_checker",
     "../../rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:random",
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 728a7a6473..46cd90c643 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -48,6 +48,7 @@ rtc_library("pacing") {
     "../../logging:rtc_event_bwe",
     "../../logging:rtc_event_pacing",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 434b1e615d..fa4f90d916 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -124,6 +124,7 @@ rtc_library("rtp_rtcp_format") {
     "../../rtc_base:checks",
     "../../rtc_base:copy_on_write_buffer",
     "../../rtc_base:divide_round",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
@@ -302,6 +303,7 @@ rtc_library("rtp_rtcp") {
     "../../rtc_base:checks",
     "../../rtc_base:copy_on_write_buffer",
     "../../rtc_base:divide_round",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:gtest_prod",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn
index dd48ce4d27..d0b917eedd 100644
--- a/modules/utility/BUILD.gn
+++ b/modules/utility/BUILD.gn
@@ -35,6 +35,7 @@ rtc_library("utility") {
     "../../api/task_queue",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:platform_thread",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 455a9ba74e..cf86f93c36 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -32,6 +32,7 @@ rtc_library("video_capture_module") {
     "../../api/video:video_rtp_headers",
     "../../common_video",
     "../../media:rtc_media_base",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:refcount",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 783ec86309..a8af689484 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -343,6 +343,7 @@ rtc_library("video_coding") {
     "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:copy_on_write_buffer",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
@@ -448,6 +449,7 @@ rtc_library("video_coding_legacy") {
     "../../common_video",
     "../../modules/rtp_rtcp:rtp_video_header",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -586,6 +588,7 @@ rtc_library("webrtc_h264") {
     "../../media:rtc_media_base",
     "../../rtc_base",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:timeutils",
     "../../rtc_base/system:rtc_export",
@@ -690,6 +693,7 @@ rtc_library("webrtc_vp8") {
     "../../api/video_codecs:vp8_temporal_layers_factory",
     "../../common_video",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
@@ -798,6 +802,7 @@ rtc_library("webrtc_vp9") {
     "../../rtc_base",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:stringutils",
     "../../rtc_base:timeutils",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index b63e50c18d..5deda02057 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -108,6 +108,7 @@ rtc_library("rtc_p2p") {
     "../rtc_base:byte_order",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:ip_address",
     "../rtc_base:location",
     "../rtc_base:logging",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 8509784192..8b53291fde 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -48,6 +48,7 @@ rtc_library("proxy") {
   deps = [
     "../api:scoped_refptr",
     "../api/task_queue",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
@@ -84,6 +85,7 @@ rtc_source_set("channel") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -135,6 +137,7 @@ rtc_source_set("channel_manager") {
     "../media:rtc_media_config",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
@@ -251,6 +254,7 @@ rtc_source_set("jsep_transport") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -320,6 +324,7 @@ rtc_source_set("jsep_transport_controller") {
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -467,6 +472,7 @@ rtc_source_set("rtp_transport") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:socket",
@@ -633,6 +639,7 @@ rtc_source_set("srtp_transport") {
     "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:safe_conversions",
@@ -1056,6 +1063,7 @@ rtc_source_set("rtc_stats_collector") {
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:ip_address",
     "../rtc_base:location",
     "../rtc_base:logging",
@@ -1140,6 +1148,7 @@ rtc_source_set("sdp_offer_answer") {
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -1240,6 +1249,7 @@ rtc_source_set("peer_connection") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
+    "../rtc_base:event_tracer",
     "../rtc_base:ip_address",
     "../rtc_base:location",
     "../rtc_base:logging",
@@ -1327,6 +1337,7 @@ rtc_source_set("stats_collector") {
     "../modules/audio_processing:audio_processing_statistics",
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:ip_address",
     "../rtc_base:location",
     "../rtc_base:logging",
@@ -1921,6 +1932,7 @@ rtc_library("rtp_sender") {
     "../api/crypto:frame_encryptor_interface",
     "../media:rtc_media_base",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -2396,6 +2408,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:byte_buffer",
       "../rtc_base:checks",
       "../rtc_base:copy_on_write_buffer",
+      "../rtc_base:event_tracer",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
       "../rtc_base:location",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 6f64fb3b3e..2b92b36ddc 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -89,6 +89,7 @@ rtc_library("rtc_base_approved") {
     ":byte_order",
     ":checks",
     ":copy_on_write_buffer",
+    ":event_tracer",
     ":histogram_percentile_counter",
     ":location",
     ":logging",
@@ -137,8 +138,7 @@ rtc_library("rtc_base_approved") {
     "byte_buffer.h",  # Transitional, use :byte_buffer
     "byte_order.h",  # Transitional, use :byte_order
     "copy_on_write_buffer.h",  # Transitional, use :copy_on_write_buffer
-    "event_tracer.cc",
-    "event_tracer.h",
+    "event_tracer.h",  # Transitional, use :event_tracer
     "location.h",  # Transitional, use :location
     "numerics/histogram_percentile_counter.h",  # Transitional, use
                                                 # :histogram_percentile_counter
@@ -153,7 +153,7 @@ rtc_library("rtc_base_approved") {
     "strong_alias.h",  # Transitional, use :strong_alias
     "swap_queue.h",  # Transitional, use :swap_queue
     "timestamp_aligner.h",  # Transitional, use :timestamp_aligner
-    "trace_event.h",
+    "trace_event.h",  # Transitional, use :event_tracer
     "zero_memory.h",  # Transitional, use :zero_memory
   ]
 
@@ -306,6 +306,29 @@ rtc_library("copy_on_write_buffer") {
   ]
 }
 
+rtc_library("event_tracer") {
+  visibility = [ "*" ]
+  sources = [
+    "event_tracer.cc",
+    "event_tracer.h",
+    "trace_event.h",
+  ]
+  deps = [
+    ":atomicops",
+    ":checks",
+    ":logging",
+    ":macromagic",
+    ":platform_thread",
+    ":platform_thread_types",
+    ":rtc_event",
+    ":timeutils",
+    "../api:sequence_checker",
+    "synchronization:mutex",
+    "system:rtc_export",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
+}
+
 rtc_library("histogram_percentile_counter") {
   visibility = [ "*" ]
   sources = [
@@ -1025,6 +1048,7 @@ rtc_library("threading") {
     ":byte_order",
     ":checks",
     ":criticalsection",
+    ":event_tracer",
     ":ip_address",
     ":location",
     ":logging",
@@ -1658,6 +1682,7 @@ if (rtc_include_tests) {
         ":copy_on_write_buffer",
         ":criticalsection",
         ":divide_round",
+        ":event_tracer",
         ":gunit_helpers",
         ":histogram_percentile_counter",
         ":ip_address",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index aac15cbfc8..2ebb904405 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -1037,6 +1037,7 @@ if (is_ios || is_mac) {
         "../pc:webrtc_sdp",
         "../rtc_base",
         "../rtc_base:checks",
+        "../rtc_base:event_tracer",
         "../rtc_base:logging",
         "../rtc_base:network_constants",
         "../rtc_base:safe_conversions",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index ca1b13b3a7..c9df3f1795 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -803,6 +803,7 @@ if (current_os == "linux" || is_android) {
       "../../pc:webrtc_sdp",
       "../../rtc_base",
       "../../rtc_base:checks",
+      "../../rtc_base:event_tracer",
       "../../rtc_base:logging",
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_base_approved",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index c108bbb0ca..7c85c8245e 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -454,6 +454,7 @@ if (rtc_include_tests && !build_with_chromium) {
       ":test_support",
       "../rtc_base",
       "../rtc_base:checks",
+      "../rtc_base:event_tracer",
       "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:threading",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index c6386ac179..355005bce3 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -111,6 +111,7 @@ rtc_library("video") {
     "../modules/video_processing",
     "../rtc_base:atomicops",
     "../rtc_base:checks",
+    "../rtc_base:event_tracer",
     "../rtc_base:histogram_percentile_counter",
     "../rtc_base:location",
     "../rtc_base:logging",
@@ -493,6 +494,7 @@ rtc_library("video_stream_encoder_impl") {
     "../modules/video_coding/svc:svc_rate_allocator",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
+    "../rtc_base:event_tracer",
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
diff --git a/video/adaptation/BUILD.gn b/video/adaptation/BUILD.gn
index d68a69cf65..e196800281 100644
--- a/video/adaptation/BUILD.gn
+++ b/video/adaptation/BUILD.gn
@@ -48,6 +48,7 @@ rtc_library("video_adaptation") {
     "../../call/adaptation:resource_adaptation",
     "../../modules/video_coding:video_coding_utility",
     "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:refcount",