Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(release): pull main into develop post release v1.83.1 #1577

Merged
merged 7 commits into from
Jul 26, 2024
Merged

chore(release): pull main into develop post release v1.83.1 #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15c1745
chore: enable override flag to ga4 v2 ui configs
utsabc Jul 25, 2024
254df36
Merge pull request #1572 from rudderlabs/chore.ga4-v2-override-flag
utsabc Jul 25, 2024
a035d03
chore(release): 1.83.1
web-flow Jul 25, 2024
83e3313
feat: cordial source (#1575)
Gauravudia Jul 26, 2024
c878405
chore: update changelog (#1576)
Gauravudia Jul 26, 2024
0322448
fix: ga4 v2 config updates (#1574)
utsabc Jul 26, 2024
63f53c2
Merge pull request #1573 from rudderlabs/hotfix-release/v1.83.1
utsabc Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [1.83.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.83.0...v1.83.1) (2024-07-25)


### Features

* feat: cordial source ([#1575](https://github.com/rudderlabs/rudder-integrations-config/pull/1575)) ([83e3313](https://github.com/rudderlabs/rudder-integrations-config/commit/83e331334859bbfc2b9d0e6f2deb2c36e29fc2cf))

## [1.83.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.82.1...v1.83.0) (2024-07-22)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.83.0",
"version": "1.83.1",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
18 changes: 6 additions & 12 deletions src/configurations/destinations/ga4_v2/db-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"eventFilteringOption",
"extendPageViewParams",
"piiPropertiesToIgnore",
"overrideClientAndSessionId",
"oneTrustCookieCategories",
"ketchConsentPurposes",
"consentManagement",
Expand All @@ -41,9 +42,7 @@
"supportedMessageTypes": {
"cloud": ["track", "group", "page"],
"device": {
"web": ["identify", "track", "page", "group"],
"android": ["identify", "track", "screen"],
"ios": ["identify", "track", "screen"]
"web": ["identify", "page"]
}
},
"supportedConnectionModes": {
Expand Down Expand Up @@ -72,18 +71,13 @@
"oneTrustCookieCategories",
"ketchConsentPurposes",
"eventsMapping",
"sdkBaseUrl"
],
"web": [
"debugView",
"useNativeSDK",
"connectionMode",
"capturePageView",
"useNativeSDKToSend",
"sdkBaseUrl",
"extendPageViewParams",
"overrideClientAndSessionId",
"consentManagement"
"capturePageView",
"debugView"
],
"web": ["useNativeSDK", "connectionMode", "useNativeSDKToSend", "consentManagement"],
"android": ["useNativeSDK", "connectionMode", "consentManagement"],
"ios": ["useNativeSDK", "connectionMode", "consentManagement"],
"unity": ["consentManagement", "connectionMode"],
Expand Down
14 changes: 6 additions & 8 deletions src/configurations/destinations/ga4_v2/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,15 +512,13 @@
}
},
"capturePageView": {
"type": "object",
"properties": { "web": { "type": "string", "enum": ["rs", "gtag"], "default": "rs" } }
},
"debugView": { "type": "object", "properties": { "web": { "type": "boolean" } } },
"extendPageViewParams": { "type": "object", "properties": { "web": { "type": "boolean" } } },
"overrideClientAndSessionId": {
"type": "object",
"properties": { "web": { "type": "boolean" } }
"type": "string",
"enum": ["rs", "gtag"],
"default": "rs"
},
"debugView": { "type": "boolean" },
"extendPageViewParams": { "type": "boolean" },
"overrideClientAndSessionId": { "type": "boolean" },
"useNativeSDK": {
"type": "object",
"properties": {
Expand Down
120 changes: 73 additions & 47 deletions src/configurations/destinations/ga4_v2/ui-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,78 @@
]
}
]
},
{
"title": "Hybrid mode settings",
"note": "Configure additional settings for hybrid mode here",
"preRequisites": {
"fields": [
{
"configKey": "connectionMode.web",
"value": "hybrid"
}
]
},
"fields": [
{
"type": "singleSelect",
"label": "Choose how to capture pageviews",
"configKey": "capturePageView",
"note": [
"Choose whether you want to send page view events through the RudderStack JS SDK, or through automatic collection on each page load using GA4 Enhanced Measurement (gtag).",
{
"text": "Learn more here ",
"link": "https://developers.google.com/analytics/devguides/collection/ga4/views?client_type=gtag"
},
"about how GA4 measures pages and screens"
],
"options": [
{
"label": "RudderStack JS SDK",
"value": "rs"
},
{
"label": "gtag Automated Capture",
"value": "gtag"
}
],
"default": "rs"
},
{
"type": "checkbox",
"label": "Debug via DebugView",
"configKey": "debugView",
"default": false,
"note": [
"Enabling this allows you to monitor your device mode events in ",
{
"text": "DebugView.",
"link": "https://support.google.com/analytics/answer/7201382"
},
"For hybrid mode, these would be only your page calls"
]
},
{
"type": "checkbox",
"label": "Include URL and Search as Page View properties",
"configKey": "extendPageViewParams",
"note": "Enabling this extends the set of properties automatically collected to include 'URL' and 'search'. Note that GA4 has a limit on the number of unique properties per event name",
"default": false
},
{
"type": "checkbox",
"label": "Override gtag client ID & session ID",
"configKey": "overrideClientAndSessionId",
"note": [
"Override the gtag clientID & sessionID with RudderStack's to ensure attribution is properly unified across page and track events. We recommend turning on the override function. Otherwise, instrument your RudderStack SDK based on instructions ",
{
"text": "here",
"link": "https://www.rudderstack.com/docs/destinations/streaming-destinations/google-analytics-4/setting-up-google-analytics-4-in-rudderstack/#hybrid-mode"
}
],
"default": false
}
]
}
]
},
Expand Down Expand Up @@ -306,53 +378,7 @@
"sdkTemplate": {
"title": "Web SDK settings",
"note": "not visible in the ui",
"fields": [
{
"type": "singleSelect",
"label": "Choose how to capture pageviews",
"configKey": "capturePageView",
"note": [
"Choose whether you want to send page view events through the RudderStack JS SDK, or through automatic collection on each page load using GA4 Enhanced Measurement (gtag).",
{
"text": "Learn more here ",
"link": "https://developers.google.com/analytics/devguides/collection/ga4/views?client_type=gtag"
},
"about how GA4 measures pages and screens"
],
"options": [
{
"label": "RudderStack JS SDK",
"value": "rs"
},
{
"label": "gtag Automated Capture",
"value": "gtag"
}
],
"default": "rs"
},
{
"type": "checkbox",
"label": "Debug via DebugView",
"configKey": "debugView",
"default": true,
"note": [
"Enabling this allows you to monitor your device mode events in ",
{
"text": "DebugView.",
"link": "https://support.google.com/analytics/answer/7201382"
},
"For hybrid mode, these would be only your page calls"
]
},
{
"type": "checkbox",
"label": "Include URL and Search as Page View properties",
"configKey": "extendPageViewParams",
"note": "Enabling this extends the set of properties automatically collected to include 'URL' and 'search'. Note that GA4 has a limit on the number of unique properties per event name",
"default": false
}
]
"fields": []
},
"consentSettingsTemplate": {
"title": "Consent settings",
Expand Down
124 changes: 75 additions & 49 deletions src/configurations/destinations/ga4_v2/ui-config.jt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,78 @@
]
}
]
},
{
"title": "Hybrid mode settings",
"note": "Configure additional settings for hybrid mode here",
"preRequisites": {
"fields": [
{
"configKey": "connectionMode.web",
"value": "hybrid"
}
]
},
"fields": [
{
"type": "singleSelect",
"label": "Choose how to capture pageviews",
"configKey": "capturePageView",
"note": [
"Choose whether you want to send page view events through the RudderStack JS SDK, or through automatic collection on each page load using GA4 Enhanced Measurement (gtag).",
{
"text": "Learn more here ",
"link": "https://developers.google.com/analytics/devguides/collection/ga4/views?client_type=gtag"
},
"about how GA4 measures pages and screens"
],
"options": [
{
"label": "RudderStack JS SDK",
"value": "rs"
},
{
"label": "gtag Automated Capture",
"value": "gtag"
}
],
"default": "rs"
},
{
"type": "checkbox",
"label": "Debug via DebugView",
"configKey": "debugView",
"default": false,
"note": [
"Enabling this allows you to monitor your device mode events in ",
{
"text": "DebugView.",
"link": "https://support.google.com/analytics/answer/7201382"
},
"For hybrid mode, these would be only your page calls"
]
},
{
"type": "checkbox",
"label": "Include URL and Search as Page View properties",
"configKey": "extendPageViewParams",
"note": "Enabling this extends the set of properties automatically collected to include 'URL' and 'search'. Note that GA4 has a limit on the number of unique properties per event name",
"default": false
},
{
"type": "checkbox",
"label": "Override gtag client ID & session ID",
"configKey": "overrideClientAndSessionId",
"note": [
"Override the gtag clientID & sessionID with RudderStack's to ensure attribution is properly unified across page and track events. We recommend turning on the override function. Otherwise, instrument your RudderStack SDK based on instructions ",
{
"text": "here",
"link": "https://www.rudderstack.com/docs/destinations/streaming-destinations/google-analytics-4/setting-up-google-analytics-4-in-rudderstack/#hybrid-mode"
}
],
"default": false
}
]
}
]
},
Expand Down Expand Up @@ -306,53 +378,7 @@
"sdkTemplate": {
"title": "Web SDK settings",
"note": "not visible in the ui",
"fields": [
{
"type": "singleSelect",
"label": "Choose how to capture pageviews",
"configKey": "capturePageView",
"note": [
"Choose whether you want to send page view events through the RudderStack JS SDK, or through automatic collection on each page load using GA4 Enhanced Measurement (gtag).",
{
"text": "Learn more here ",
"link": "https://developers.google.com/analytics/devguides/collection/ga4/views?client_type=gtag"
},
"about how GA4 measures pages and screens"
],
"options": [
{
"label": "RudderStack JS SDK",
"value": "rs"
},
{
"label": "gtag Automated Capture",
"value": "gtag"
}
],
"default": "rs"
},
{
"type": "checkbox",
"label": "Debug via DebugView",
"configKey": "debugView",
"default": true,
"note": [
"Enabling this allows you to monitor your device mode events in ",
{
"text": "DebugView.",
"link": "https://support.google.com/analytics/answer/7201382"
},
"For hybrid mode, these would be only your page calls"
]
},
{
"type": "checkbox",
"label": "Include URL and Search as Page View properties",
"configKey": "extendPageViewParams",
"note": "Enabling this extends the set of properties automatically collected to include 'URL' and 'search'. Note that GA4 has a limit on the number of unique properties per event name",
"default": false
}
]
"fields": []
},
"consentSettingsTemplate": {
"title": "Consent settings",
Expand Down Expand Up @@ -453,7 +479,7 @@
"placeholder": "properties.price"
},
{
"type": "dynamicDataSelect",
"type": "autoComplete",
"label": "GA4 parameter",
"key": "to",
"placeholder": "value"
Expand Down Expand Up @@ -504,7 +530,7 @@
"placeholder": "e.g $.properties.revenue"
},
{
"type": "dynamicDataSelect",
"type": "autoComplete",
"label": "GA4 parameter",
"key": "to",
"placeholder": "$.event[0].params.value"
Expand Down
6 changes: 6 additions & 0 deletions src/configurations/sources/cordial/db-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "cordial",
"category": "webhook",
"displayName": "Cordial",
"type": "cloud"
}
3 changes: 3 additions & 0 deletions src/configurations/sources/cordial/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"configSchema": null
}
Loading
Loading