Prevent _gtagEvent from being called in a non-release builds (#4841)

* Prevent _gtagEvent from being called in a non-release builds

* fixes

* add missing new line

Author: kenzieschmoll

packages/devtools_app/lib/src/analytics/_analytics_web.dart

@@ -171,15 +171,15 @@ class GtagEventDevTools extends GtagEvent {
 GtagEventDevTools _gtagEvent({
   String? event_category,
   String? event_label,
-  String? Function()? send_to,
+  String? send_to,
   bool non_interaction = false,
   int value = 0,
   ScreenAnalyticsMetrics? screenMetrics,
 }) {
   return GtagEventDevTools(
     event_category: event_category,
     event_label: event_label,
-    send_to: send_to?.call(),
+    send_to: send_to,
     non_interaction: non_interaction,
     value: value,
     user_app: userAppType,
@@ -385,10 +385,10 @@ void screen(
 ]) {
   GTag.event(
     screenName,
-    _gtagEvent(
+    gaEventProvider: () => _gtagEvent(
       event_category: analytics_constants.screenViewEvent,
       value: value,
-      send_to: () => gaDevToolsPropertyId(),
+      send_to: gaDevToolsPropertyId(),
     ),
   );
 }
@@ -528,11 +528,11 @@ void _timing(
 }) {
   GTag.event(
     screenName,
-    _gtagEvent(
+    gaEventProvider: () => _gtagEvent(
       event_category: analytics_constants.timingEvent,
       event_label: timedOperation,
       value: durationMicros,
-      send_to: () => gaDevToolsPropertyId(),
+      send_to: gaDevToolsPropertyId(),
       screenMetrics: screenMetrics,
     ),
   );
@@ -547,12 +547,12 @@ void select(
 }) {
   GTag.event(
     screenName,
-    _gtagEvent(
+    gaEventProvider: () => _gtagEvent(
       event_category: analytics_constants.selectEvent,
       event_label: selectedItem,
       value: value,
       non_interaction: nonInteraction,
-      send_to: () => gaDevToolsPropertyId(),
+      send_to: gaDevToolsPropertyId(),
       screenMetrics:
           screenMetricsProvider != null ? screenMetricsProvider() : null,
     ),
@@ -571,7 +571,7 @@ void reportError(
   _lastGaError = errorMessage;
 
   GTag.exception(
-    _gtagException(
+    gaExceptionProvider: () => _gtagException(
       errorMessage,
       fatal: fatal,
       screenMetrics:

packages/devtools_app/lib/src/ui/gtags.dart

@@ -29,18 +29,23 @@ class GTag {
   static const String _event = 'event';
   static const String _exception = 'exception';
 
+  static bool get shouldSendAnalytics => kReleaseMode || _debugAnalytics;
+
   /// Collect the analytic's event and its parameters.
-  static void event(String eventName, GtagEvent gaEvent) async {
-    if (kReleaseMode || _debugAnalytics) {
-      if (await ga.isAnalyticsEnabled()) {
-        _gTagCommandName(_event, eventName, gaEvent);
-      }
+  static void event(
+    String eventName, {
+    required GtagEvent Function() gaEventProvider,
+  }) async {
+    if (shouldSendAnalytics && await ga.isAnalyticsEnabled()) {
+      _gTagCommandName(_event, eventName, gaEventProvider());
     }
   }
 
-  static void exception(GtagException gaException) async {
-    if (await ga.isAnalyticsEnabled()) {
-      _gTagCommandName(_event, _exception, gaException);
+  static void exception({
+    required GtagException Function() gaExceptionProvider,
+  }) async {
+    if (shouldSendAnalytics && await ga.isAnalyticsEnabled()) {
+      _gTagCommandName(_event, _exception, gaExceptionProvider());
     }
   }
 }