Fix old merge conflicts (#2851)

* Makefile: Fix catalog-capi and capi targets

* catalog_capi.js: Remove use of deprecated safeDump

* Fix old merge conflicts

Author: tysonmote

Makefile

@@ -62,12 +62,12 @@ catalog: catalog-papi
 # uses the old configapi
 .PHONY: capi
 capi: vendor/bundle
-	@node scripts/catalog-capi.js
+	@node scripts/catalog_capi.js
 
 # shorter alias
 .PHONY: catalog-capi
 catalog-capi: vendor/bundle
-	@node scripts/catalog-capi.js
+	@node scripts/catalog_capi.js
 
 # uses the new public api
 .PHONY: catalog-papi

scripts/catalog_capi.js

@@ -303,14 +303,14 @@ const updateSources = async () => {
   var todayDate = new Date().toISOString().slice(0,10);
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   output += "# sources last updated " + todayDate + " \n";
-  output += yaml.safeDump({ items: sourcesUpdated }, options);
+  output += yaml.dump({ items: sourcesUpdated }, options);
   fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/sources_capi.yml`), output);
 
   // Create source-category mapping yaml file
   var todayDate = new Date().toISOString().slice(0,10);
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   output += "# source cateogries last updated " + todayDate + " \n";
-  output += yaml.safeDump({ items: sourceCategories }, options);
+  output += yaml.dump({ items: sourceCategories }, options);
   fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/source_categories_capi.yml`), output);
 }
 
@@ -413,14 +413,14 @@ const updateDestinations = async () => {
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   var todayDate = new Date().toISOString().slice(0,10);
   output += "# destination data last updated " + todayDate + " \n";
-  output += yaml.safeDump({ items: destinationsUpdated }, options);
+  output += yaml.dump({ items: destinationsUpdated }, options);
   fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/destinations_capi.yml`), output);
 
    // Create destination-category mapping yaml file
   output = "# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT\n"
   var todayDate = new Date().toISOString().slice(0,10);
   output += "# destination categories last updated " + todayDate + " \n";
-  output += yaml.safeDump({ items: destinationCategories }, options);
+  output += yaml.dump({ items: destinationCategories }, options);
   fs.writeFileSync(path.resolve(__dirname, `../src/_data/catalog/destination_categories_capi.yml`), output);
 }
 

src/_data/catalog/destination_categories.yml

@@ -1,9 +1,5 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
-<<<<<<< HEAD
-# destination categories last updated 2022-05-05 
-=======
 # destination categories last updated 2022-05-02 
->>>>>>> master
 items:
 - display_name: A/B Testing
   slug: a-b-testing

src/_data/catalog/destinations.yml

@@ -1,9 +1,5 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
-<<<<<<< HEAD
 # destination data last updated 2022-05-05 
-=======
-# destination data last updated 2022-05-02 
->>>>>>> master
 items:
 - id: 60b5d0a01f3726b85dc05aab
   display_name: 2mee

src/_data/catalog/regional-supported.yml

@@ -1,9 +1,5 @@
 # AUTOGENERATED LIST OF CONNECTIONS THAT SUPPORT REGIONAL
-<<<<<<< HEAD
 # Last updated 2022-05-05 
-=======
-# Last updated 2022-05-02 
->>>>>>> master
 warehouses:
   - id: WcjBCzUGff
     display_name: Azure SQL Data Warehouse

src/_data/catalog/source_categories.yml

@@ -1,9 +1,5 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
-<<<<<<< HEAD
 # source cateogries last updated 2022-05-05 
-=======
-# source cateogries last updated 2022-05-02 
->>>>>>> master
 items:
   - display_name: A/B Testing
     slug: a-b-testing

src/_data/catalog/sources.yml

@@ -1,9 +1,5 @@
 # AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
-<<<<<<< HEAD
 # sources last updated 2022-05-05 
-=======
-# sources last updated 2022-05-02 
->>>>>>> master
 items:
   - id: 8HWbgPTt3k
     display_name: .NET

src/connections/destinations/catalog/actions-google-analytics-4/index.md

@@ -64,50 +64,29 @@ Segment’s spec doesn't have an equivalent event for every Google Analytics 4 r
 #### Custom Events
 In addition to recommended events, you can also send custom events using the [Custom Event action](/docs/connections/destinations/catalog/actions-google-analytics-4/#custom-event). Custom events are events that you name. Custom events don't appear in most standard reports; you need to set up custom reports for meaningful analysis. To create custom events in the Google Analytics 4 web interface, see Google’s [Modify and create events through the user interface](https://support.google.com/analytics/answer/10085872){:target='_blank'}.
 
-<<<<<<< HEAD
-> warning ""
-> Don’t create custom events that already correspond to the pre-built mappings that Segment has. Use the standard events defined in [GA4’s doc](https://developers.google.com/analytics/devguides/collection/ga4/reference/events){:target="_blank"} with their corresponding actions. 
+warning ""
+Don’t create custom events that already correspond to the pre-built mappings that Segment has. Use the standard events defined in [GA4’s doc](https://developers.google.com/analytics/devguides/collection/ga4/reference/events){:target="_blank"} with their corresponding actions.
 
-> info "Event naming limitations"
-> Google Analytics 4 requires that all event names contain only alpha-numeric characters and underscores, and must start with an alphabetic character. Segment replaces spaces in Event Names with an underscore, so that these events are accepted by GA4. For example, Segment renames an event named `Home Profile` to `Home_Profile`. In some cases, GA4 may reject an event outright, due to unsupported characters. For example, an event named `Home | Profile` will be silently rejected due to the pipe character.
->
-> In all cases, event names in GA4 are case sensitive. The Custom Event action includes a **Lowercase Event Name** option, to ensure consistency of all events sent to Google. For more information, see Google's articles [Google Analytics 4 event name rules](https://support.google.com/analytics/answer/10085872?hl=en&ref_topic=9756175#event-name-rules){:target='_blank'} and [Event name limitations](https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=firebase){:target="_blank"}.
+info "Event naming limitations"
+Google Analytics 4 requires that all event names contain only alpha-numeric characters and underscores, and must start with an alphabetic character. Segment replaces spaces in Event Names with an underscore, so that these events are accepted by GA4. For example, Segment renames an event named `Home Profile` to `Home_Profile`. In some cases, GA4 may reject an event outright, due to unsupported characters. For example, an event named `Home | Profile` will be silently rejected due to the pipe character.
 
-#### Custom Dimensions and Metrics
-With Google Analytics 4, you must create custom dimensions and metrics within the Google Analytics 4 interface and link parameters to the corresponding dimension or metric. When you create the dimension or metric, you can either select a parameter from the list of already collected fields or enter the name of the parameter you plan to collect in the future. Custom dimensions can be either event-scoped or user-scoped, and custom metrics must be event-scoped.
-=======
-> info "Event naming limitations"
-> Google Analytics 4 requires that all event names contain only alpha-numeric characters and underscores, and must start with an alphabetic character. Segment replaces spaces in Event Names with an underscore, so that these events are accepted by GA4. For example, Segment renames an event named `Home Profile` to `Home_Profile`. In some cases, GA4 may reject an event outright, due to unsupported characters. For example, an event named `Home | Profile` will be silently rejected due to the pipe character.
-> 
-> In all cases, event names in GA4 are case sensitive. The Custom Event action includes a **Lowercase Event Name** option, to ensure consistency of all events sent to Google. For more information, see Google's articles [Google Analytics 4 event name rules](https://support.google.com/analytics/answer/10085872?hl=en&ref_topic=9756175#event-name-rules){:target='_blank'} and [Event name limitations](https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=firebase){:target="_blank"}.
+In all cases, event names in GA4 are case sensitive. The Custom Event action includes a **Lowercase Event Name** option, to ensure consistency of all events sent to Google. For more information, see Google's articles [Google Analytics 4 event name rules](https://support.google.com/analytics/answer/10085872?hl=en&ref_topic=9756175#event-name-rules){:target='_blank'} and [Event name limitations](https://developers.google.com/analytics/devguides/collection/protocol/ga4/sending-events?client_type=firebase){:target="_blank"}.
 
 #### Custom Dimensions and Metrics
-With Google Analytics 4, you must create custom dimensions and metrics within the Google Analytics 4 interface and link parameters to the corresponding dimension or metric. When you create the dimension or metric, you can either select a parameter from the list of already collected fields or enter the name of the parameter you plan to collect in the future. Custom dimensions can be either event-scoped or user-scoped, and custom metrics must be event-scoped. 
->>>>>>> master
+With Google Analytics 4, you must create custom dimensions and metrics within the Google Analytics 4 interface and link parameters to the corresponding dimension or metric. When you create the dimension or metric, you can either select a parameter from the list of already collected fields or enter the name of the parameter you plan to collect in the future. Custom dimensions can be either event-scoped or user-scoped, and custom metrics must be event-scoped.
 
 To send parameters to Google Analytics 4, use the Event Parameters or User Properties object available on every action. Only pass flat key-value pairs in the Event Parameters and User Properties objects. Keep in mind that Google silently drops any events that include nested parameters.
 
 To achieve parity with Universal Analytics, you should create the same custom dimensions that you defined in Universal Analytics. Additionally, in Google Analytics 4, you should recreate many of the values that you tracked as event dimensions in Universal Analytics, particularly event category and event label.  For more information, see [Google Analytics 4 Custom dimensions and metrics](https://support.google.com/analytics/answer/10075209){:target='_blank'}.
-<<<<<<< HEAD
 
 #### Tracking Active Users and Sessions
 The Google Analytics 4 reports only display active users who engage with your site for a non-zero amount of time. To ensure users are rendered in reports, Segment sets the `engagement_time_msec` parameter to 1 by default. If you track engagement time on your Segment events, you can use the **Engagement Time in Milliseconds** field mapping to set `engagement_time_msec` to a different value.
 
-=======
-
-#### Tracking Active Users and Sessions
-The Google Analytics 4 reports only display active users who engage with your site for a non-zero amount of time. To ensure users are rendered in reports, Segment sets the `engagement_time_msec` parameter to 1 by default. If you track engagement time on your Segment events, you can use the **Engagement Time in Milliseconds** field mapping to set `engagement_time_msec` to a different value.
-
->>>>>>> master
 If you choose to integrate with Google Analytics 4 client-side (using Gtag outside of Segment) _and_ also use Segment's Google Analytics 4 destination to send events through the API, you can track sessions server-side. When using Gtag, [Google generates a `session_id` and `session_number` when a session begins](https://support.google.com/analytics/answer/9191807?hl=en){:target='_blank'}. The `session_id` and `session_number` generated on the client can be passed as Event Parameters to stitch events sent through the API with the same session that was collected client-side.
 
 > info "Session tracking limitations"
 > Session tracking server-side only works if you're also sending data to Google Analytics 4 client-side. This is because the `session_id` must match a value that was previously collected on the client. For events to stitch properly, they must arrive within a 48 hour window of when the client-side events arrived.
-<<<<<<< HEAD
->
-=======
-> 
->>>>>>> master
+
 > Google doesn't currently support passing other reserved fields, such as [predefined user dimensions](https://support.google.com/analytics/answer/9268042?hl=en&ref_topic=11151952){:target='_blank'} or device-specific information, to the Measurement Protocol API.
 
 #### User Identification
@@ -119,11 +98,7 @@ There are certain scenarios where sending a User-ID can be helpful. For example,
 - **Use the Gtag-generated Client ID.** Gtag will set a Client ID automatically. The Client ID is stored in a cookie and can be fetched on the web client. To tie data between client-side and server-side, pass the Gtag-generated Client ID to Segment as a property and use that value as the Client ID in the Google Analytics 4 destination mappings.
 - **Use the Segment `userId` for User-ID.** The Segment `userId` should be your company’s canonical user identifier. By setting Google's User-ID to the same value as `userId` on client-side and server-side, you can benefit from cross-platform analytics.
 In addition, if you use [Firebase to send mobile data to Google Analytics 4](/docs/connections/destinations/catalog/actions-google-analytics-4/#mobile-data), using the same User-ID across web and mobile will ensure users are stitched together across devices.
-<<<<<<< HEAD
 
-=======
- 
->>>>>>> master
 #### Validating and Comparing Data
 Google recommends a period of dual-collection with both Universal Analytics and Google Analytics 4. This dual-collection approach lets you build a historical record in Google Analytics 4 while continuing to depend on Universal Analytics until you're ready to fully switch over.