diff --git a/inc/Editor/BlockManagement/BlockRegistration.php b/inc/Editor/BlockManagement/BlockRegistration.php
index 1bfd88c86..a625f821c 100644
--- a/inc/Editor/BlockManagement/BlockRegistration.php
+++ b/inc/Editor/BlockManagement/BlockRegistration.php
@@ -5,7 +5,7 @@
 defined( 'ABSPATH' ) || exit();
 
 use RemoteDataBlocks\Editor\Assets\Assets;
-use RemoteDataBlocks\Telemetry\TracksTelemetry;
+use RemoteDataBlocks\Telemetry\Telemetry;
 use RemoteDataBlocks\Editor\BlockPatterns\BlockPatterns;
 use RemoteDataBlocks\REST\RemoteDataController;
 use function register_block_type;
@@ -66,7 +66,7 @@ public static function register_container_blocks(): void {
 			wp_localize_script( $script_handle, 'REMOTE_DATA_BLOCKS', [
 				'config' => $all_remote_block_configs,
 				'rest_url' => RemoteDataController::get_url(),
-				'tracks_global_properties' => TracksTelemetry::get_global_properties(),
+				'tracks_global_properties' => Telemetry::get_global_properties(),
 			] );
 		}
 	}
diff --git a/inc/Telemetry/DataSourceTelemetry.php b/inc/Telemetry/DataSourceTelemetry.php
index c6dd711f0..ae79c45cc 100644
--- a/inc/Telemetry/DataSourceTelemetry.php
+++ b/inc/Telemetry/DataSourceTelemetry.php
@@ -2,8 +2,9 @@
 
 namespace RemoteDataBlocks\Telemetry;
 
-use RemoteDataBlocks\Telemetry\TracksTelemetry;
 use RemoteDataBlocks\Store\DataSource\DataSourceConfigManager;
+use function do_action;
+
 defined( 'ABSPATH' ) || exit();
 
 class DataSourceTelemetry {
@@ -23,7 +24,7 @@ private static function get_interaction_track_props( array $config ): array {
 	}
 
 	private static function track_interaction( array $config, string $action ): void {
-		TracksTelemetry::record_event( self::DATA_SOURCE_INTERACTION_EVENT_NAME, array_merge( [
+		do_action( 'remote_data_blocks_track_event', self::DATA_SOURCE_INTERACTION_EVENT_NAME, array_merge( [
 			'data_source_type' => $config['service'],
 			'action' => $action,
 		], self::get_interaction_track_props( $config ) ) );
@@ -61,7 +62,7 @@ function ( $config ) {
 			}
 		) );
 
-		TracksTelemetry::record_event( self::DATA_SOURCE_VIEW_EVENT_NAME, [
+		do_action( 'remote_data_blocks_track_event', self::DATA_SOURCE_VIEW_EVENT_NAME, [
 			'total_data_sources_count' => count( $configs ),
 			'code_configured_data_sources_count' => $code_configured_count,
 			'ui_configured_data_sources_count' => $storage_configured_count,
diff --git a/inc/Telemetry/EnvironmentConfig.php b/inc/Telemetry/EnvironmentConfig.php
deleted file mode 100644
index 21712c3ce..000000000
--- a/inc/Telemetry/EnvironmentConfig.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace RemoteDataBlocks\Telemetry;
-
-defined( 'ABSPATH' ) || exit();
-
-use Automattic\VIP\Telemetry\Tracks;
-use function Automattic\VIP\Telemetry\Tracks\get_tracks_core_properties;
-
-/**
- * Class to handle environment configuration for telemetry.
- *
- * This class abstracts WordPress-specific functions for easy mocking.
- */
-class EnvironmentConfig {
-
-	public function is_enabled_via_filter(): bool {
-		return apply_filters( 'remote_data_blocks_enable_tracks_telemetry', false ) ?? false;
-	}
-
-	public function get_tracks_lib_class(): ?string {
-		if ( ! class_exists( 'Automattic\VIP\Telemetry\Tracks' ) ) {
-			return null;
-		}
-
-		return Tracks::class;
-	}
-
-	public function is_wpvip_site(): bool {
-		$core_props = $this->get_tracks_core_properties();
-		if ( ! isset( $core_props['hosting_provider'] ) ) {
-			return false;
-		}
-
-		return 'wpvip' === $core_props['hosting_provider'];
-	}
-
-	public function is_local_env(): bool {
-		$core_props = $this->get_tracks_core_properties();
-		if ( ! isset( $core_props['vip_env'] ) ) {
-			return false;
-		}
-
-		return 'local' === $core_props['vip_env'];
-	}
-
-	public function is_remote_data_blocks_plugin( string|null $plugin_path ): bool {
-		return 'remote-data-blocks/remote-data-blocks.php' === $plugin_path;
-	}
-
-	public function should_track_post_having_remote_data_blocks( int $post_id ): bool {
-		// Ensure this is not an auto-save or revision.
-		if ( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get the core properties to be sent with each event.
-	 */
-	public function get_tracks_core_properties(): array {
-		if ( function_exists( 'Automattic\VIP\Telemetry\Tracks\get_tracks_core_properties' ) ) {
-			return get_tracks_core_properties();
-		}
-
-		return [];
-	}
-
-	/**
-	 * Get `Tracks` properties which are specific to "Remote Data Blocks". These properties are sent with each event.
-	 */
-	public function get_remote_data_blocks_properties(): array {
-		return [
-			'plugin_version' => defined( 'REMOTE_DATA_BLOCKS__PLUGIN_VERSION' ) ? constant( 'REMOTE_DATA_BLOCKS__PLUGIN_VERSION' ) : '',
-		];
-	}
-}
diff --git a/inc/Telemetry/Telemetry.php b/inc/Telemetry/Telemetry.php
new file mode 100644
index 000000000..b92f24845
--- /dev/null
+++ b/inc/Telemetry/Telemetry.php
@@ -0,0 +1,151 @@
+<?php declare(strict_types = 1);
+
+namespace RemoteDataBlocks\Telemetry;
+
+use RemoteDataBlocks\Editor\BlockManagement\ConfigStore;
+use WP_Post;
+
+defined( 'ABSPATH' ) || exit();
+
+/**
+ * Class to implement telemetry on WordPress VIP.
+ */
+class Telemetry {
+	private const EVENT_PREFIX = 'remotedatablocks_';
+	private static ?self $instance = null;
+
+	final private function __construct( private string $plugin_path, private ?object $telemetry = null ) {}
+
+	/**
+	 * Initialize telemetry for the plugin. The Telemetry library is provided
+	 * by VIP mu-plugins and only runs in approved environments.
+	 *
+	 * @psalm-suppress UndefinedClass
+	 *
+	 * @param string $plugin_path Plugin path.
+	 * @param object|null $telemetry Telemetry instance. If null, we will attempt to create one.
+	 */
+	public static function init( string $plugin_path, ?object $telemetry = null ): void {
+		if ( isset( self::$instance ) ) {
+			return;
+		}
+
+		if ( null === $telemetry && class_exists( 'Automattic\VIP\Telemetry\Telemetry' ) ) {
+			$telemetry = new \Automattic\VIP\Telemetry\Telemetry( self::EVENT_PREFIX, self::get_global_properties() );
+		}
+
+		self::$instance = new self( $plugin_path, $telemetry );
+		self::$instance->setup_tracking_via_hooks();
+	}
+
+	/**
+	 * Get global event properties. These properties are sent with each event.
+	 */
+	public static function get_global_properties(): array {
+		$plugin_version = defined( 'REMOTE_DATA_BLOCKS__PLUGIN_VERSION' ) ? constant( 'REMOTE_DATA_BLOCKS__PLUGIN_VERSION' ) : 'unknown';
+
+		return [
+			'plugin_version' => $plugin_version,
+		];
+	}
+
+	private function setup_tracking_via_hooks(): void {
+		// WordPress hooks.
+		add_action( 'activated_plugin', [ $this, 'track_plugin_activation' ], 10, 1 );
+		add_action( 'deactivated_plugin', [ $this, 'track_plugin_deactivation' ], 10, 1 );
+		add_action( 'save_post', [ $this, 'track_remote_data_blocks_usage' ], 10, 2 );
+
+		// Custom hook to allow other plugin code to track events
+		add_action( 'remote_data_blocks_track_event', [ $this, 'record_event' ], 10, 2 );
+	}
+
+	/**
+	 * Activation hook.
+	 *
+	 * @param string $plugin_path Path of the plugin that was activated.
+	 */
+	public function track_plugin_activation( string $plugin_path ): void {
+		if ( ! str_ends_with( $this->plugin_path, $plugin_path ) ) {
+			return;
+		}
+
+		$this->record_event( 'plugin_toggle', [ 'action' => 'activate' ] );
+	}
+
+	/**
+	 * Deactivation hook.
+	 *
+	 * @param string $plugin_path Path of the plugin that was deactivated.
+	 */
+	public function track_plugin_deactivation( string $plugin_path ): void {
+		if ( ! str_ends_with( $this->plugin_path, $plugin_path ) ) {
+			return;
+		}
+
+		$this->record_event( 'plugin_toggle', [ 'action' => 'deactivate' ] );
+	}
+
+	/**
+	 * Track usage of Remote Data Blocks.
+	 *
+	 * @param int     $post_id Post ID.
+	 * @param WP_Post $post Post object.
+	 */
+	public function track_remote_data_blocks_usage( int $post_id, WP_Post $post ): void {
+		if ( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) {
+			return;
+		}
+
+		$post_status = $post->post_status;
+		if ( 'publish' !== $post_status ) {
+			return;
+		}
+
+		// Regular expression to match all remote data blocks present in the post content.
+		$reg_exp = '/<!--\s{1}wp:remote-data-blocks\/([^\s]+)\s/';
+		preg_match_all( $reg_exp, $post->post_content, $matches );
+		if ( count( $matches[1] ) === 0 ) {
+			return;
+		}
+
+		// Get data source and track usage.
+		$track_props = [
+			'post_status' => $post_status,
+			'post_type' => $post->post_type,
+		];
+		foreach ( $matches[1] as $match ) {
+			$data_source_type = ConfigStore::get_data_source_type( 'remote-data-blocks/' . $match );
+			if ( ! $data_source_type ) {
+				continue;
+			}
+
+			// Calculate stats of each remote data source.
+			$key = $data_source_type . '_data_source_count';
+			$track_props[ $key ] = ( $track_props[ $key ] ?? 0 ) + 1;
+			$track_props['remote_data_blocks_total_count'] = ( $track_props['remote_data_blocks_total_count'] ?? 0 ) + 1;
+		}
+
+		$this->record_event( 'blocks_usage_stats', $track_props );
+	}
+
+	/**
+	 * Record a telemetry event.
+	 *
+	 * @param string $event_name The name of the event.
+	 * @param array  $props      The properties to send with the event.
+	 */
+	public function record_event( string $event_name, array $props ): void {
+		if ( null === $this->telemetry ) {
+			return;
+		}
+
+		$this->telemetry->record_event( $event_name, $props );
+	}
+
+	/**
+	 * Reset class properties.
+	 */
+	public static function reset(): void {
+		self::$instance = null;
+	}
+}
diff --git a/inc/Telemetry/TracksTelemetry.php b/inc/Telemetry/TracksTelemetry.php
deleted file mode 100644
index a6dbc2d08..000000000
--- a/inc/Telemetry/TracksTelemetry.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace RemoteDataBlocks\Telemetry;
-
-defined( 'ABSPATH' ) || exit();
-
-use RemoteDataBlocks\Editor\BlockManagement\ConfigStore;
-
-/**
- * Class to implement Tracks Telemetry.
- */
-class TracksTelemetry {
-	private const TRACKS_EVENT_PREFIX = 'remotedatablocks_';
-
-	/**
-	 * The tracks instance (not using Tracks as type because it is present in MU Plugins codebase).
-	 */
-	private static object|null $instance = null;
-
-	/**
-	 * Environment configuration.
-	 */
-	private static ?EnvironmentConfig $env_config = null;
-
-	/**
-	 * Initialize Tracks Telemetry based on the environment configuration.
-	 *
-	 * @param EnvironmentConfig $env_config Environment configuration.
-	 */
-	public static function init( EnvironmentConfig $env_config ): void {
-		self::$env_config = $env_config;
-
-		// Do not track on local environment.
-		if ( self::$env_config->is_local_env() ) {
-			return;
-		}
-
-		$tracks_class = self::$env_config->get_tracks_lib_class();
-		if ( ! $tracks_class ) {
-			return;
-		}
-
-		if ( self::$env_config->is_wpvip_site() || self::$env_config->is_enabled_via_filter() ) {
-			// We don't need to pass core properties here as they are already set by Tracks library.
-			self::$instance = new $tracks_class( '', self::$env_config->get_remote_data_blocks_properties() );
-			self::setup_tracking_via_hooks();
-		}
-	}
-
-	/**
-	 * Get `Tracks` global properties to be sent with each event.
-	 */
-	public static function get_global_properties(): array {
-		return array_merge( self::$env_config->get_remote_data_blocks_properties(), self::$env_config->get_tracks_core_properties() );
-	}
-
-	private static function setup_tracking_via_hooks(): void {
-		// WordPress Dashboard Hooks.
-		add_action( 'activated_plugin', [ __CLASS__, 'track_plugin_activation' ] );
-		add_action( 'deactivated_plugin', [ __CLASS__, 'track_plugin_deactivation' ] );
-		add_action( 'save_post', [ __CLASS__, 'track_remote_data_blocks_usage' ], 10, 2 );
-	}
-
-	/**
-	 * Activation hook.
-	 *
-	 * @param string $plugin_path Path of the plugin that was activated.
-	 */
-	public static function track_plugin_activation( string $plugin_path ): void {
-		if ( ! self::$env_config->is_remote_data_blocks_plugin( $plugin_path ) ) {
-			return;
-		}
-
-		self::record_event( 'plugin_toggle', [ 'action' => 'activate' ] );
-	}
-
-	/**
-	 * Deactivation hook.
-	 *
-	 * @param string $plugin_path Path of the plugin that was deactivated.
-	 */
-	public static function track_plugin_deactivation( string $plugin_path ): void {
-		if ( ! self::$env_config->is_remote_data_blocks_plugin( $plugin_path ) ) {
-			return;
-		}
-
-		self::record_event( 'plugin_toggle', [ 'action' => 'deactivate' ] );
-	}
-
-	/**
-	 * Track usage of Remote Data Blocks.
-	 *
-	 * @param int      $post_id Post ID.
-	 * @param \WP_Post $post Post object.
-	 */
-	public static function track_remote_data_blocks_usage( int $post_id, object $post ): void {
-		if ( ! self::$env_config->should_track_post_having_remote_data_blocks( $post_id ) ) {
-			return;
-		}
-
-		$post_status = $post->post_status;
-		if ( 'publish' !== $post_status ) {
-			return;
-		}
-
-		// Regular expression to match all remote data blocks present in the post content.
-		$reg_exp = '/<!--\s{1}wp:remote-data-blocks\/([^\s]+)\s/';
-		preg_match_all( $reg_exp, $post->post_content, $matches );
-		if ( count( $matches[1] ) === 0 ) {
-			return;
-		}
-
-		// Get data source and track usage.
-		$track_props = [
-			'post_status' => $post_status,
-			'post_type' => $post->post_type,
-		];
-		foreach ( $matches[1] as $match ) {
-			$data_source_type = ConfigStore::get_data_source_type( 'remote-data-blocks/' . $match );
-			if ( ! $data_source_type ) {
-				continue;
-			}
-
-			// Calculate stats of each remote data source.
-			$key = $data_source_type . '_data_source_count';
-			$track_props[ $key ] = ( $track_props[ $key ] ?? 0 ) + 1;
-			$track_props['remote_data_blocks_total_count'] = ( $track_props['remote_data_blocks_total_count'] ?? 0 ) + 1;
-		}
-
-		self::record_event( 'blocks_usage_stats', $track_props );
-	}
-
-	/**
-	 * Record an event with Tracks.
-	 *
-	 * @param string $event_name The name of the event.
-	 * @param array  $props      The properties to send with the event.
-	 *
-	 * @return bool True if the event was recorded, false otherwise.
-	 */
-	public static function record_event( string $event_name, array $props ): bool {
-		if ( ! isset( self::$instance ) ) {
-			return false;
-		}
-
-		$event_name = self::TRACKS_EVENT_PREFIX . $event_name;
-
-		self::$instance->record_event( $event_name, $props );
-
-		return true;
-	}
-
-	/**
-	 * Get the instance of Tracks.
-	 */
-	public static function get_instance(): ?object {
-		return self::$instance;
-	}
-
-	public static function get_env_config(): ?EnvironmentConfig {
-		return self::$env_config;
-	}
-
-	/**
-	 * Reset class properties.
-	 */
-	public static function reset(): void {
-		self::$instance = null;
-		self::$env_config = null;
-	}
-}
diff --git a/remote-data-blocks.php b/remote-data-blocks.php
index 75943ddb0..125ae56ae 100644
--- a/remote-data-blocks.php
+++ b/remote-data-blocks.php
@@ -40,7 +40,7 @@
 Editor\PatternEditor\PatternEditor::init();
 
 // Telemetry
-Telemetry\TracksTelemetry::init( new Telemetry\EnvironmentConfig() );
+Telemetry\Telemetry::init( __FILE__ );
 
 // Example API
 ExampleApi\ExampleApi::init();
diff --git a/tests/inc/Mocks/MockTracks.php b/tests/inc/Mocks/MockTelemetry.php
similarity index 87%
rename from tests/inc/Mocks/MockTracks.php
rename to tests/inc/Mocks/MockTelemetry.php
index 874427d71..dc01adfab 100644
--- a/tests/inc/Mocks/MockTracks.php
+++ b/tests/inc/Mocks/MockTelemetry.php
@@ -2,6 +2,6 @@
 
 namespace RemoteDataBlocks\Tests\Mocks;
 
-class MockTracks {
+class MockTelemetry {
 	public function record_event( string $_name, array $_props ): void {}
 }
diff --git a/tests/inc/Telemetry/EnvironmentConfigTest.php b/tests/inc/Telemetry/EnvironmentConfigTest.php
deleted file mode 100644
index 0810f08df..000000000
--- a/tests/inc/Telemetry/EnvironmentConfigTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace RemoteDataBlocks\Tests\Telemetry;
-
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use RemoteDataBlocks\Telemetry\EnvironmentConfig;
-use RemoteDataBlocks\Tests\Mocks\MockWordPressFunctions;
-
-class EnvironmentConfigTest extends TestCase {
-	public function setUp(): void {
-		MockWordPressFunctions::reset();
-	}
-
-	public function testIsEnabledViaFilterReturnsFalse(): void {
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( false, $obj->is_enabled_via_filter() );
-	}
-
-	public function testIsEnabledViaFilterReturnsTrue(): void {
-		MockWordPressFunctions::add_mock_filter( 'remote_data_blocks_enable_tracks_telemetry', true );
-
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( true, $obj->is_enabled_via_filter() );
-	}
-
-	public function testIsWpvipSiteReturnsFalse(): void {
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( false, $obj->is_wpvip_site() );
-	}
-
-	public function testIsWpvipSiteReturnsTrue(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$obj = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'get_tracks_core_properties' ] )->getMock();
-		$obj->expects( $this->once() )->method( 'get_tracks_core_properties' )->with()->willReturn( [ 'hosting_provider' => 'wpvip' ] );
-
-		$this->assertEquals( true, $obj->is_wpvip_site() );
-	}
-
-	public function testIsLocalEnvReturnsFalse(): void {
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( false, $obj->is_local_env() );
-	}
-
-	public function testIsLocalEnvReturnsTrue(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$obj = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'get_tracks_core_properties' ] )->getMock();
-		$obj->expects( $this->once() )->method( 'get_tracks_core_properties' )->with()->willReturn( [ 'vip_env' => 'local' ] );
-
-		$this->assertEquals( true, $obj->is_local_env() );
-	}
-
-	public function testIsRemoteDataBlocksPluginReturnsFalse(): void {
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( false, $obj->is_remote_data_blocks_plugin( '' ) );
-	}
-
-	public function testIsRemoteDataBlocksPluginReturnsTrue(): void {
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( true, $obj->is_remote_data_blocks_plugin( 'remote-data-blocks/remote-data-blocks.php' ) );
-	}
-
-	public function testGetTracksCoreProperties(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$obj = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'get_tracks_core_properties' ] )->getMock();
-		$obj->expects( $this->once() )->method( 'get_tracks_core_properties' )->with()->willReturn( [
-			'hosting_provider' => 'wpvip',
-			'vip_env' => 'local',
-		] );
-
-		$this->assertEquals( [
-			'hosting_provider' => 'wpvip',
-			'vip_env' => 'local',
-		], $obj->get_tracks_core_properties() );
-	}
-
-	public function testRemoteDataBlockProperties(): void {
-		$obj = new EnvironmentConfig();
-
-		$this->assertEquals( [
-			'plugin_version' => '',
-		], $obj->get_remote_data_blocks_properties() );
-	}
-}
diff --git a/tests/inc/Telemetry/TracksTelemetryTest.php b/tests/inc/Telemetry/TracksTelemetryTest.php
deleted file mode 100644
index 3cbfc91bf..000000000
--- a/tests/inc/Telemetry/TracksTelemetryTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace RemoteDataBlocks\Tests\Telemetry;
-
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\MockObject\MockObject;
-use RemoteDataBlocks\Telemetry\TracksTelemetry;
-use RemoteDataBlocks\Telemetry\EnvironmentConfig;
-use RemoteDataBlocks\Config\DataSource\HttpDataSource;
-use RemoteDataBlocks\Config\Query\HttpQuery;
-use RemoteDataBlocks\Editor\BlockManagement\ConfigStore;
-use RemoteDataBlocks\Integrations\Shopify\ShopifyDataSource;
-use RemoteDataBlocks\Tests\Mocks\MockTracks;
-
-class TracksTelemetryTest extends TestCase {
-	public function tearDown(): void {
-		parent::tearDown();
-		TracksTelemetry::reset();
-	}
-
-	public function testInitDoesNotSetTracksIfLibraryIsNotPresent(): void {
-		TracksTelemetry::init( new EnvironmentConfig() );
-
-		$this->assertEquals( null, TracksTelemetry::get_instance() );
-	}
-
-	public function testInitDoesNotSetTracksOnLocalEnvironment(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'get_tracks_lib_class', 'is_local_env', 'is_enabled_via_filter' ] )->getMock();
-		$env_config_mock->method( 'get_tracks_lib_class' )->with()->willReturn( MockTracks::class );
-		$env_config_mock->method( 'is_local_env' )->with()->willReturn( true );
-		$env_config_mock->method( 'is_enabled_via_filter' )->with()->willReturn( true );
-
-		TracksTelemetry::init( $env_config_mock );
-
-		$this->assertEquals( null, TracksTelemetry::get_instance() );
-	}
-
-	public function testInitDoesSetTracksIfTrackingIsEnabledViaFilter(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'is_enabled_via_filter', 'get_tracks_lib_class', 'get_remote_data_blocks_properties' ] )->getMock();
-		$env_config_mock->method( 'is_enabled_via_filter' )->with()->willReturn( true );
-		$env_config_mock->method( 'get_tracks_lib_class' )->with()->willReturn( MockTracks::class );
-		$env_config_mock->expects( $this->once() )->method( 'get_remote_data_blocks_properties' )->with();
-
-		TracksTelemetry::init( $env_config_mock );
-
-		$this->assertInstanceOf( MockTracks::class, TracksTelemetry::get_instance() );
-	}
-
-	public function testInitDoesSetTracksIfTrackingIsEnabledOnVipSite(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'is_wpvip_site', 'get_tracks_lib_class', 'get_remote_data_blocks_properties' ] )->getMock();
-		$env_config_mock->method( 'is_wpvip_site' )->with()->willReturn( true );
-		$env_config_mock->method( 'get_tracks_lib_class' )->with()->willReturn( MockTracks::class );
-		$env_config_mock->expects( $this->once() )->method( 'get_remote_data_blocks_properties' )->with();
-
-		TracksTelemetry::init( $env_config_mock );
-
-		$this->assertInstanceOf( MockTracks::class, TracksTelemetry::get_instance() );
-	}
-
-	public function testGetGlobalProperties(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'get_tracks_core_properties' ] )->getMock();
-		$env_config_mock->expects( $this->exactly( 2 ) )->method( 'get_tracks_core_properties' )->with()->willReturn( [ 'vip_env' => '123' ] );
-
-		TracksTelemetry::init( $env_config_mock );
-
-		$this->assertEquals( [
-			'plugin_version' => '',
-			'vip_env' => '123',
-		], TracksTelemetry::get_global_properties() );
-	}
-
-	public function testTrackPluginActivationDoesNotRecordEventIfPluginIsNotRDB(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'is_remote_data_blocks_plugin' ] )->getMock();
-		$env_config_mock->method( 'is_remote_data_blocks_plugin' )->with()->willReturn( false );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 0 ) )->method( 'record_event' );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_plugin_activation( 'plugin_path' );
-	}
-
-	public function testTrackPluginActivationDoesRecordEventIfPluginIsRDB(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'is_remote_data_blocks_plugin' ] )->getMock();
-		$env_config_mock->method( 'is_remote_data_blocks_plugin' )->with()->willReturn( true );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 1 ) )->method( 'record_event' )->with( 'remotedatablocks_plugin_toggle', $this->isType( 'array' ) );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_plugin_activation( 'plugin_path' );
-	}
-
-	public function testTrackPluginDeactivationDoesNotRecordEventIfPluginIsNotRDB(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'is_remote_data_blocks_plugin' ] )->getMock();
-		$env_config_mock->method( 'is_remote_data_blocks_plugin' )->with()->willReturn( false );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 0 ) )->method( 'record_event' );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_plugin_deactivation( 'plugin_path' );
-	}
-
-	public function testTrackPluginDeactivationDoesRecordEventIfPluginIsRDB(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'is_remote_data_blocks_plugin' ] )->getMock();
-		$env_config_mock->method( 'is_remote_data_blocks_plugin' )->with()->willReturn( true );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 1 ) )->method( 'record_event' )->with( 'remotedatablocks_plugin_toggle', $this->isType( 'array' ) );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_plugin_deactivation( 'plugin_path' );
-	}
-
-	public function testTrackRemoteDataBlocksUsageDoesNotTrackEventIfUsageShouldNotBeTracked(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'should_track_post_having_remote_data_blocks' ] )->getMock();
-		$env_config_mock->method( 'should_track_post_having_remote_data_blocks' )->with( 1 )->willReturn( false );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 0 ) )->method( 'record_event' );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_remote_data_blocks_usage( 1, (object) [] );
-	}
-
-	public function testTrackRemoteDataBlocksUsageDoesNotTrackEventIfPostStatusIsNotPublish(): void {
-			/** @var MockObject|EnvironmentConfig */
-			$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'should_track_post_having_remote_data_blocks' ] )->getMock();
-			$env_config_mock->method( 'should_track_post_having_remote_data_blocks' )->with( 1 )->willReturn( true );
-
-			/** @var MockTracks|MockObject */
-			$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-			$tracks_mock->expects( $this->exactly( 0 ) )->method( 'record_event' );
-
-			set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-			TracksTelemetry::init( $env_config_mock );
-			TracksTelemetry::track_remote_data_blocks_usage( 1, (object) [ 'post_status' => 'draft' ] );
-	}
-
-	public function testTrackRemoteDataBlocksUsageDoesNotTrackEventIfPostContentHaveNoRemoteBlocks(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'should_track_post_having_remote_data_blocks' ] )->getMock();
-		$env_config_mock->method( 'should_track_post_having_remote_data_blocks' )->with( 1 )->willReturn( true );
-
-		// Setup data sources.
-		ConfigStore::init();
-		ConfigStore::set_block_configuration( 'remote-data-blocks/shopify-vip-store', [
-			'queries' => [
-				'display' => HttpQuery::from_array( [
-					'data_source' => ShopifyDataSource::from_array( [
-						'access_token' => 'token',
-						'store_name' => 'B. Walton',
-					] ),
-				] ),
-			],
-		] );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 0 ) )->method( 'record_event' );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_remote_data_blocks_usage( 1, (object) [
-			'post_type' => 'post',
-			'post_status' => 'publish',
-			'post_content' => '<p>No remote data blocks</p>',
-		] );
-	}
-
-	public function testTrackRemoteDataBlocksUsageDoesTrackEventIfPostContentHaveRemoteBlocks(): void {
-		/** @var MockObject|EnvironmentConfig */
-		$env_config_mock = $this->getMockBuilder( EnvironmentConfig::class )->onlyMethods( [ 'should_track_post_having_remote_data_blocks' ] )->getMock();
-		$env_config_mock->method( 'should_track_post_having_remote_data_blocks' )->with( 1 )->willReturn( true );
-
-		// Setup data sources.
-		ConfigStore::init();
-		ConfigStore::set_block_configuration( 'remote-data-blocks/shopify-vip-store', [
-			'queries' => [
-				'display' => HttpQuery::from_array( [
-					'data_source' => ShopifyDataSource::from_array( [
-						'service_config' => [
-							'__version' => 1,
-							'access_token' => 'token',
-							'display_name' => 'Shopify Source',
-							'store_name' => 'B. Walton',
-						],
-					] ),
-					'output_schema' => [ 'type' => 'string' ],
-				] ),
-			],
-		] );
-
-		ConfigStore::set_block_configuration( 'remote-data-blocks/conference-event', [
-			'queries' => [
-				'display' => HttpQuery::from_array( [
-					'data_source' => HttpDataSource::from_array( [
-						'service_config' => [
-							'__version' => 1,
-							'display_name' => 'HTTP Source',
-							'endpoint' => 'https://example.com/api/v1',
-						],
-					] ),
-					'output_schema' => [ 'type' => 'string' ],
-				] ),
-			],
-		] );
-
-		/** @var MockTracks|MockObject */
-		$tracks_mock = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$tracks_mock->expects( $this->exactly( 1 ) )->method( 'record_event' )->with( 'remotedatablocks_blocks_usage_stats', [
-			'post_status' => 'publish',
-			'post_type' => 'post',
-			'shopify_data_source_count' => 2,
-			'remote_data_blocks_total_count' => 3,
-			'generic-http_data_source_count' => 1,
-		] );
-
-		set_private_property( TracksTelemetry::class, null, 'instance', $tracks_mock );
-		TracksTelemetry::init( $env_config_mock );
-		TracksTelemetry::track_remote_data_blocks_usage( 1, (object) [
-			'post_type' => 'post',
-			'post_status' => 'publish',
-			'post_content' => '<!-- wp:remote-data-blocks/shopify-vip-store {"remoteData":{"blockName":"remote-data-blocks/shopify-vip-store","metadata":{"last_updated":{"name":"Last updated","type":"string","value":"2024-10-07 14:43:51"},"total_count":{"name":"Total count","type":"number","value":1}},"queryInput":{"id":"gid://shopify/Product/8642689958112"},"resultId":"d9583b2d-b79f-4af7-8adc-a723c53d7f67","results":[{"description":"Our floating shelf is the perfect way to store all your Tonal accessories. Its sleek, versatile design makes this an easy fit with any style room. Available in Coffee Oak (seen here), as well as Matte Black and Light Aged Ash.\nMade in the U.S.","title":"Tonal Accessories Shelf (Coffee Oak)","image_url":"https://cdn.shopify.com/s/files/1/0680/3456/0224/files/Coffee-Oak-with-products.webp?v=1721748682","image_alt_text":"","price":"$272.99","variant_id":"gid://shopify/ProductVariant/46081522368736"}]}} --> <div class="wp-block-remote-data-blocks-shopify-vip-store rdb-container"><!-- wp:group {"metadata":{"categories":["Remote Data Blocks"],"patternName":"remote-data-blocks/shopify-vip-store/pattern","name":"Shopify (vip-store) Data"},"layout":{"type":"constrained"}} --> <div class="wp-block-group"><!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"width":"33%"} --> <div class="wp-block-column" style="flex-basis:33%"><!-- wp:image {"metadata":{"bindings":{"alt":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"image_alt_text"}},"url":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"image_url"}}},"name":"Image URL"}} --> <figure class="wp-block-image"><img src="https://cdn.shopify.com/s/files/1/0680/3456/0224/files/Coffee-Oak-with-products.webp?v=1721748682" alt=""/></figure> <!-- /wp:image --></div> <!-- /wp:column --> <!-- wp:column --> <div class="wp-block-column"><!-- wp:heading {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"title"}}},"name":"Title"}} --> <h2 class="wp-block-heading">Tonal Accessories Shelf (Coffee Oak)</h2> <!-- /wp:heading --> <!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"description"}}},"name":"Product description"}} --> <p>Our floating shelf is the perfect way to store all your Tonal accessories. Its sleek, versatile design makes this an easy fit with any style room. Available in Coffee Oak (seen here), as well as Matte Black and Light Aged Ash. Made in the U.S.</p> <!-- /wp:paragraph --> <!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"price"}}},"name":"Item price"}} --> <p>$272.99</p> <!-- /wp:paragraph --></div> <!-- /wp:column --></div> <!-- /wp:columns --></div> <!-- /wp:group --></div> <!-- /wp:remote-data-blocks/shopify-vip-store --> <!-- wp:remote-data-blocks/shopify-vip-store {"remoteData":{"blockName":"remote-data-blocks/shopify-vip-store","metadata":{"last_updated":{"name":"Last updated","type":"string","value":"2024-10-07 14:44:01"},"total_count":{"name":"Total count","type":"number","value":1}},"queryInput":{"id":"gid://shopify/Product/8642627207392"},"resultId":"ea7d7dae-4888-42c5-b64c-2b69ccbb958e","results":[{"description":"No detail is too small. Tonal’s proprietary T-Locks let you swap out Tonal accessories with a quick push and twist to lock everything in place.","title":"T-Locks (Pack of 4)","image_url":"https://cdn.shopify.com/s/files/1/0680/3456/0224/files/T-Locks.webp?v=1721746444","image_alt_text":"","price":"$42.99","variant_id":"gid://shopify/ProductVariant/46081259307232"}]}} --> <div class="wp-block-remote-data-blocks-shopify-vip-store rdb-container"><!-- wp:group {"metadata":{"categories":["Remote Data Blocks"],"patternName":"remote-data-blocks/shopify-vip-store/pattern","name":"Shopify (vip-store) Data"},"layout":{"type":"constrained"}} --> <div class="wp-block-group"><!-- wp:columns --> <div class="wp-block-columns"><!-- wp:column {"width":"33%"} --> <div class="wp-block-column" style="flex-basis:33%"><!-- wp:image {"metadata":{"bindings":{"alt":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"image_alt_text"}},"url":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"image_url"}}},"name":"Image URL"}} --> <figure class="wp-block-image"><img src="https://cdn.shopify.com/s/files/1/0680/3456/0224/files/T-Locks.webp?v=1721746444" alt=""/></figure> <!-- /wp:image --></div> <!-- /wp:column --> <!-- wp:column --> <div class="wp-block-column"><!-- wp:heading {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"title"}}},"name":"Title"}} --> <h2 class="wp-block-heading">T-Locks (Pack of 4)</h2> <!-- /wp:heading --> <!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"description"}}},"name":"Product description"}} --> <p>No detail is too small. Tonal’s proprietary T-Locks let you swap out Tonal accessories with a quick push and twist to lock everything in place.</p> <!-- /wp:paragraph --> <!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/shopify-vip-store","field":"price"}}},"name":"Item price"}} --> <p>$42.99</p> <!-- /wp:paragraph --></div> <!-- /wp:column --></div> <!-- /wp:columns --></div> <!-- /wp:group --></div> <!-- /wp:remote-data-blocks/shopify-vip-store --> <!-- wp:remote-data-blocks/conference-event {"remoteData":{"blockName":"remote-data-blocks/conference-event","metadata":{"last_updated":{"name":"Last updated","type":"string","value":"2024-10-07 14:44:10"},"total_count":{"name":"Total count","type":"number","value":1}},"queryInput":{"record_id":"rec1eYD2JFtevz39u"},"resultId":"268c2a0f-2322-4197-b915-e3cede1d1c83","results":[{"id":"rec1eYD2JFtevz39u","title":"Break","location":"Pearl room","type":"Panel"}]}} --> <div class="wp-block-remote-data-blocks-conference-event rdb-container"><!-- wp:heading {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/conference-event","field":"title"}}},"name":"Title"}} --> <h2 class="wp-block-heading">Break</h2> <!-- /wp:heading --> <!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/conference-event","field":"location"}}},"name":"Location"}} --> <p>Pearl room</p> <!-- /wp:paragraph --> <!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":"remote-data/binding","args":{"block":"remote-data-blocks/conference-event","field":"type"}}},"name":"Type"}} --> <p>Panel</p> <!-- /wp:paragraph --></div> <!-- /wp:remote-data-blocks/conference-event -->',
-		] );
-	}
-
-	public function testRecordEventDoesNothingIfInstanceIsNotSet(): void {
-		/** @var TracksTelemetry|MockObject */
-		$obj = new TracksTelemetry();
-
-		$result = $obj->record_event( 'name', [] );
-
-		$this->assertEquals( false, $result );
-	}
-
-	public function testRecordEventTracksTheEventIfInstanceIsSet(): void {
-		$mock_tracks = $this->getMockBuilder( MockTracks::class )->onlyMethods( [ 'record_event' ] )->getMock();
-		$mock_tracks->expects( $this->exactly( 1 ) )->method( 'record_event' )->with( 'remotedatablocks_event_name', [ 'event_props' ] );
-		/** @var TracksTelemetry|MockObject */
-		$obj = new TracksTelemetry();
-		set_private_property( TracksTelemetry::class, $obj, 'instance', $mock_tracks );
-
-		$result = $obj->record_event( 'event_name', [ 'event_props' ] );
-
-		$this->assertEquals( true, $result );
-	}
-
-	public function testResetMethod(): void {
-		$obj = new TracksTelemetry();
-		set_private_property( TracksTelemetry::class, $obj, 'instance', new MockTracks() );
-		TracksTelemetry::init( new EnvironmentConfig() );
-
-		$this->assertInstanceOf( MockTracks::class, TracksTelemetry::get_instance() );
-		$this->assertInstanceOf( EnvironmentConfig::class, TracksTelemetry::get_env_config() );
-
-		TracksTelemetry::reset();
-
-		$this->assertEquals( null, TracksTelemetry::get_instance() );
-		$this->assertEquals( null, TracksTelemetry::get_env_config() );
-	}
-}
diff --git a/tests/integration/telemetry/TelemetryTest.php b/tests/integration/telemetry/TelemetryTest.php
new file mode 100644
index 000000000..d971b55ff
--- /dev/null
+++ b/tests/integration/telemetry/TelemetryTest.php
@@ -0,0 +1,112 @@
+<?php declare(strict_types = 1);
+
+namespace RemoteDataBlocks\Tests\Telemetry;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use RemoteDataBlocks\Editor\BlockManagement\ConfigStore;
+use WP_UnitTestCase;
+use RemoteDataBlocks\Telemetry\Telemetry;
+use RemoteDataBlocks\Tests\Mocks\MockQuery;
+use RemoteDataBlocks\Tests\Mocks\MockTelemetry;
+use function do_action;
+
+class TelemetryTest extends WP_UnitTestCase {
+	private string $plugin_path;
+	private MockObject $mock_telemetry;
+
+	protected function setUp(): void {
+		parent::setUp();
+		$this->plugin_path = '/path/to/plugin';
+		$this->mock_telemetry = $this->createMock( MockTelemetry::class );
+		Telemetry::reset();
+	}
+
+	public function test_track_plugin_activation_calls_record_event(): void {
+		$this->mock_telemetry
+			->expects( $this->once() )
+			->method( 'record_event' )
+			->with(
+				'plugin_toggle',
+				$this->equalTo( [ 'action' => 'activate' ] )
+			);
+
+		Telemetry::init( $this->plugin_path, $this->mock_telemetry );
+		do_action( 'activated_plugin', $this->plugin_path );
+	}
+
+	public function test_track_plugin_activation_does_not_call_record_event_for_other_plugins(): void {
+		$this->mock_telemetry
+			->expects( $this->never() )
+			->method( 'record_event' );
+
+		Telemetry::init( $this->plugin_path, $this->mock_telemetry );
+		do_action( 'activated_plugin', '/path/to/other-plugin' );
+	}
+
+	public function test_track_plugin_deactivation_calls_record_event(): void {
+		$this->mock_telemetry
+			->expects( $this->once() )
+			->method( 'record_event' )
+			->with(
+				'plugin_toggle',
+				$this->equalTo( [ 'action' => 'deactivate' ] )
+			);
+
+		Telemetry::init( $this->plugin_path, $this->mock_telemetry );
+		do_action( 'deactivated_plugin', $this->plugin_path );
+	}
+
+	public function test_track_plugin_deactivation_does_not_call_record_event_for_other_plugins(): void {
+		$this->mock_telemetry
+			->expects( $this->never() )
+			->method( 'record_event' );
+
+		Telemetry::init( $this->plugin_path, $this->mock_telemetry );
+		do_action( 'deactivated_plugin', '/path/to/other-plugin' );
+	}
+
+	public function test_track_remote_data_blocks_usage_calls_record_event(): void {
+		$post_id = $this->factory()->post->create( [
+			'post_status' => 'publish',
+			'post_type' => 'post',
+			'post_content' => '<!-- wp:remote-data-blocks/example -->',
+		] );
+
+		ConfigStore::set_block_configuration( 'remote-data-blocks/example', [
+			'queries' => [
+				'display' => MockQuery::create(),
+			],
+		] );
+
+		$this->mock_telemetry
+			->expects( $this->once() )
+			->method( 'record_event' )
+			->with(
+				'blocks_usage_stats',
+				$this->equalTo( [
+					'post_status' => 'publish',
+					'post_type' => 'post',
+					'remote_data_blocks_total_count' => 1,
+					'generic-http_data_source_count' => 1,
+				] ),
+			);
+
+		Telemetry::init( $this->plugin_path, $this->mock_telemetry );
+		do_action( 'save_post', $post_id, get_post( $post_id ) );
+	}
+
+	public function test_track_remote_data_blocks_usage_does_not_call_record_event_for_non_published_posts(): void {
+		$post_id = $this->factory()->post->create( [
+			'post_status' => 'draft',
+			'post_type' => 'post',
+			'post_content' => '<!-- wp:remote-data-blocks/example -->',
+		] );
+
+		$this->mock_telemetry
+			->expects( $this->never() )
+			->method( 'record_event' );
+
+		Telemetry::init( $this->plugin_path, $this->mock_telemetry );
+		do_action( 'save_post', $post_id, get_post( $post_id ) );
+	}
+}