Skip to content

Commit

Permalink
chore(release): pull release/v1.46.0 into main (#2741)
Browse files Browse the repository at this point in the history
  • Loading branch information
mihir-4116 authored Oct 18, 2023
2 parents c9e8bdb + be4c410 commit 15c51ca
Show file tree
Hide file tree
Showing 54 changed files with 4,210 additions and 791 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-hotfix-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

# Only allow these users to create new hotfix branch from 'main'
if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823')
if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116')
steps:
- name: Create Branch
uses: peterjgrainger/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

# Only allow release stakeholders to initiate releases
if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823')
if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116')
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
git commit -m "chore: upgrade shared transformers to $TAG_NAME"
git push -u origin shared-transformer-$TAG_NAME
hub pull-request -m "chore: upgrade shared transformers to $TAG_NAME"
gh pr create --fill
- name: Update Helm Chart and Raise Pull Request For Hosted Transformer
env:
Expand All @@ -143,4 +143,4 @@ jobs:
git commit -m "chore: upgrade hosted transformer to $TAG_NAME"
git push -u origin hosted-transformer-$TAG_NAME
hub pull-request -m "chore: upgrade hosted transformer to $TAG_NAME"
gh pr create --fill
4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-rollback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

# Only allow to be deployed from tags and main branch
# Only allow specific actors to trigger
if: (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/main')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs')
if: (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/main')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'chandumlg') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'chandumlg')

steps:
- name: Get Target Version
Expand Down Expand Up @@ -56,4 +56,4 @@ jobs:
git commit -m "chore: rollback shared transformers to ${{ steps.target-version.outputs.tag_name }}"
git push -u origin shared-transformer-rollback-${{ steps.target-version.outputs.tag_name }}
hub pull-request -m "chore: rollback shared transformers to ${{ steps.target-version.outputs.tag_name }}"
gh pr create --fill
4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-ut-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
git commit -m "chore: upgrade shared user-transformers to $UT_TAG_NAME"
git push -u origin shared-user-transformer-$UT_TAG_NAME
hub pull-request -m "chore: upgrade shared user-transformers to $UT_TAG_NAME"
gh pr create --fill
- name: Update Helm Chart and Raise Pull Request For Hosted Transformer
env:
Expand All @@ -128,4 +128,4 @@ jobs:
git commit -m "chore: upgrade hosted user-transformer to $UT_TAG_NAME"
git push -u origin hosted-user-transformer-$UT_TAG_NAME
hub pull-request -m "chore: upgrade hosted user-transformer to $UT_TAG_NAME"
gh pr create --fill
2 changes: 1 addition & 1 deletion .github/workflows/prepare-for-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,5 @@ jobs:
git commit -m "chore: upgrade staging env transformers to \"$TAG_NAME\""
git push -u origin $BRANCH_NAME
hub pull-request -m "chore: upgrade staging env transformers to \"$TAG_NAME\""
gh pr create --fill
fi
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

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.46.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.45.3...v1.46.0) (2023-10-18)


### Features

* enhancement: snapchat_conversion add new fields ([#2721](https://github.com/rudderlabs/rudder-transformer/issues/2721)) ([45da19d](https://github.com/rudderlabs/rudder-transformer/commit/45da19db1e583d80f9fc5b508316f7a8bdd415b6))
* facebook pixel audit refactor ([#2713](https://github.com/rudderlabs/rudder-transformer/issues/2713)) ([43e1a61](https://github.com/rudderlabs/rudder-transformer/commit/43e1a61e19ad8b9c0fb999fe900b91347acb7ef8))
* mixpanel gzip support for import endpoint ([#2667](https://github.com/rudderlabs/rudder-transformer/issues/2667)) ([6b6bb66](https://github.com/rudderlabs/rudder-transformer/commit/6b6bb6633ed26d466bd80d04ae2c008d1435faca))
* onboard facebook_conversions destination ([#2720](https://github.com/rudderlabs/rudder-transformer/issues/2720)) ([5269af4](https://github.com/rudderlabs/rudder-transformer/commit/5269af47cdbceefec16be3b44910ca27aea35c35))
* onboard source ortto ([#2693](https://github.com/rudderlabs/rudder-transformer/issues/2693)) ([4682268](https://github.com/rudderlabs/rudder-transformer/commit/4682268d8396a40685a343a5c4f3978e7316d2d3))


### Bug Fixes

* fix getFbGenderVal function ([#2724](https://github.com/rudderlabs/rudder-transformer/issues/2724)) ([3aabe81](https://github.com/rudderlabs/rudder-transformer/commit/3aabe81252a09010d2b2e54e44c32e2c6302c057))

### [1.45.3](https://github.com/rudderlabs/rudder-transformer/compare/v1.45.2...v1.45.3) (2023-10-17)


Expand Down
5 changes: 0 additions & 5 deletions github-release.config.js

This file was deleted.

4 changes: 2 additions & 2 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.45.3",
"version": "1.46.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down Expand Up @@ -46,7 +46,7 @@
"commit-msg": "commitlint --edit",
"prepare": "node ./scripts/skipPrepareScript.js || husky install",
"release": "npx standard-version",
"release:github": "DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular --config github-release.config.js",
"release:github": "DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular -v",
"clean:node": "modclean",
"check:lint": "eslint . -f json -o reports/eslint.json || exit 0"
},
Expand Down
8 changes: 8 additions & 0 deletions src/constants/destinationCanonicalNames.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ const DestHandlerMap = {
};

const DestCanonicalNames = {
facebook_conversions: [
'fb_conversions',
'fb conversions',
'FacebookConversions',
'Facebook Conversions',
'FB Conversions',
'Facebook_Conversions',
],
fb_pixel: [
'fb_pixel',
'fb pixel',
Expand Down
126 changes: 126 additions & 0 deletions src/v0/destinations/facebook_conversions/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
const { getMappingConfig } = require('../../util');

const ENDPOINT = (datasetId, accessToken) =>
`https://graph.facebook.com/v17.0/${datasetId}/events?access_token=${accessToken}`;

const CONFIG_CATEGORIES = {
USERDATA: {
standard: false,
type: 'identify',
name: 'FBCUserDataConfig',
},
COMMON: { name: 'FBCCommonConfig' },
APPDATA: { name: 'FBCAppEventsConfig' },
SIMPLE_TRACK: {
standard: false,
type: 'simple track',
name: 'FBCSimpleCustomConfig',
},
PRODUCT_LIST_VIEWED: {
standard: true,
type: 'product list viewed',
eventName: 'ViewContent',
name: 'FBCProductListViewedCustomData',
},
PRODUCT_VIEWED: {
standard: true,
type: 'product viewed',
eventName: 'ViewContent',
name: 'FBCProductViewedCustomData',
},
PRODUCT_ADDED: {
standard: true,
type: 'product added',
eventName: 'AddToCart',
name: 'FBCProductAddedCustomData',
},
ORDER_COMPLETED: {
standard: true,
type: 'order completed',
eventName: 'Purchase',
name: 'FBCOrderCompletedCustomData',
},
PRODUCTS_SEARCHED: {
standard: true,
type: 'products searched',
eventName: 'Search',
name: 'FBCProductSearchedCustomData',
},
CHECKOUT_STARTED: {
standard: true,
type: 'checkout started',
eventName: 'InitiateCheckout',
name: 'FBCCheckoutStartedCustomData',
},
PAYMENT_INFO_ENTERED: {
standard: true,
type: 'payment info entered',
eventName: 'AddPaymentInfo',
name: 'FBCPaymentInfoEnteredCustomData',
},
PRODUCT_ADDED_TO_WISHLIST: {
standard: true,
type: 'product added to wishlist',
eventName: 'AddToWishlist',
name: 'FBCProductAddedToWishlistCustomData',
},
OTHER_STANDARD: {
standard: true,
type: 'otherStandard',
name: 'FBCSimpleCustomConfig',
},
PAGE_VIEW: {
standard: true,
type: 'page_view',
eventName: 'PageView',
name: 'FBCSimpleCustomConfig',
},
};

const MAPPING_CONFIG = getMappingConfig(CONFIG_CATEGORIES, __dirname);
const ACTION_SOURCES_VALUES = [
'email',
'website',
'app',
'phone_call',
'chat',
'physical_store',
'system_generated',
'other',
];

const OTHER_STANDARD_EVENTS = [
'Lead',
'CompleteRegistration',
'Contact',
'CustomizeProduct',
'Donate',
'FindLocation',
'Schedule',
'StartTrial',
'SubmitApplication',
'Subscribe',
];

const FB_CONVERSIONS_DEFAULT_EXCLUSION = ['opt_out', 'event_id', 'action_source'];
const STANDARD_ECOMM_EVENTS_CATEGORIES = [
CONFIG_CATEGORIES.PRODUCT_LIST_VIEWED,
CONFIG_CATEGORIES.PRODUCT_VIEWED,
CONFIG_CATEGORIES.PRODUCT_ADDED,
CONFIG_CATEGORIES.ORDER_COMPLETED,
CONFIG_CATEGORIES.PRODUCTS_SEARCHED,
CONFIG_CATEGORIES.CHECKOUT_STARTED,
CONFIG_CATEGORIES.PAYMENT_INFO_ENTERED,
CONFIG_CATEGORIES.PRODUCT_ADDED_TO_WISHLIST,
];

module.exports = {
ENDPOINT,
MAPPING_CONFIG,
CONFIG_CATEGORIES,
ACTION_SOURCES_VALUES,
FB_CONVERSIONS_DEFAULT_EXCLUSION,
STANDARD_ECOMM_EVENTS_CATEGORIES,
OTHER_STANDARD_EVENTS,
DESTINATION: 'FACEBOOK_CONVERSIONS',
};
101 changes: 101 additions & 0 deletions src/v0/destinations/facebook_conversions/data/FBCAppEventsConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
[
{
"destKey": "advertiser_tracking_enabled",
"sourceKeys": "context.device.adTrackingEnabled",
"required": true
},
{
"destKey": "application_tracking_enabled",
"sourceKeys": "properties.application_tracking_enabled",
"required": true
},
{
"destKey": "extinfo.0",
"sourceKeys": "context.device.type",
"required": true,
"metadata": {
"type": "toLower"
}
},
{
"destKey": "extinfo.1",
"sourceKeys": "context.app.namespace"
},
{
"destKey": "extinfo.2",
"sourceKeys": "context.app.build"
},
{
"destKey": "extinfo.3",
"sourceKeys": "context.app.version"
},
{
"destKey": "extinfo.4",
"sourceKeys": "context.os.version",
"required": true
},
{
"destKey": "extinfo.5",
"sourceKeys": "context.device.model"
},
{
"destKey": "extinfo.6",
"sourceKeys": "context.locale"
},
{
"destKey": "extinfo.7",
"sourceKeys": "context.abv_timezone"
},
{
"destKey": "extinfo.8",
"sourceKeys": "context.network.carrier"
},
{
"destKey": "extinfo.9",
"sourceKeys": "context.screen.width"
},
{
"destKey": "extinfo.10",
"sourceKeys": "context.screen.height"
},
{
"destKey": "extinfo.11",
"sourceKeys": "context.screen.density"
},
{
"destKey": "extinfo.12",
"sourceKeys": "context.cpu_cores"
},
{
"destKey": "extinfo.13",
"sourceKeys": "context.ext_storage_size"
},
{
"destKey": "extinfo.14",
"sourceKeys": "context.avl_storage_size"
},
{
"destKey": "extinfo.15",
"sourceKeys": "context.timezone"
},
{
"destKey": "campaign_ids",
"sourceKeys": ["properties.campaignId", "context.traits.campaignId", "context.campaign.name"]
},
{
"destKey": "install_referrer",
"sourceKeys": "properties.install_referrer"
},
{
"destKey": "installer_package",
"sourceKeys": "properties.installer_package"
},
{
"destKey": "url_schemes",
"sourceKeys": "properties.url_schemes"
},
{
"destKey": "windows_attribution_id",
"sourceKeys": "properties.windows_attribution_id"
}
]
Loading

0 comments on commit 15c51ca

Please sign in to comment.