Skip to content

Commit

Permalink
Merge branch 'develop' into fb_content_type_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sandeepdsvs authored Feb 21, 2024
2 parents 175dfa1 + 6b44fe4 commit 37b2e1e
Show file tree
Hide file tree
Showing 7 changed files with 323 additions and 5 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 == 'koladilip' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'ujjwal-ab') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'koladilip' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'sanpj2292')
if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'koladilip' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'utsabc') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'koladilip' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'utsabc')
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 == 'koladilip' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'yashasvibajpai' || github.actor == 'sanpj2292' || github.actor == 'ujjwal-ab') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'koladilip' || 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' || github.triggering_actor == 'yashasvibajpai' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'ujjwal-ab')
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 == 'koladilip' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'yashasvibajpai' || github.actor == 'sanpj2292' || github.actor == 'utsabc') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'koladilip' || 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' || github.triggering_actor == 'yashasvibajpai' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'utsabc')
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@

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.56.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.55.0...v1.56.0) (2024-02-19)


### Features

* **hs:** chunking data based on batch limit ([#2907](https://github.com/rudderlabs/rudder-transformer/issues/2907)) ([a60694c](https://github.com/rudderlabs/rudder-transformer/commit/a60694cef1da31d27a5cf90264548cad793f556f))
* onboard bluecore integration ([#3061](https://github.com/rudderlabs/rudder-transformer/issues/3061)) ([aef5f8e](https://github.com/rudderlabs/rudder-transformer/commit/aef5f8e5f267262e0f9e10229f14f2bcc8ad29e2))
* tiktok_offline_events added support for all Standard events ([#3094](https://github.com/rudderlabs/rudder-transformer/issues/3094)) ([b5cdccb](https://github.com/rudderlabs/rudder-transformer/commit/b5cdccb75fe68150816140174087fddad677db10))


### Bug Fixes

* add support of placing properties at root in af ([#3082](https://github.com/rudderlabs/rudder-transformer/issues/3082)) ([0f01524](https://github.com/rudderlabs/rudder-transformer/commit/0f01524b6f4f2f82efc21f88f8c97cb6fdaf91ea))
* amplitude batch output metadata ([#3077](https://github.com/rudderlabs/rudder-transformer/issues/3077)) ([69c8348](https://github.com/rudderlabs/rudder-transformer/commit/69c83489c85486c9b2aed4a1292bd9f0aae9ca44))
* amplitude: Error handling for missing event type ([#3079](https://github.com/rudderlabs/rudder-transformer/issues/3079)) ([f7ec0a1](https://github.com/rudderlabs/rudder-transformer/commit/f7ec0a1244a7b97e6b40de5ed9881c63300866dc))
* custify user-regulation logic ([#3076](https://github.com/rudderlabs/rudder-transformer/issues/3076)) ([9683161](https://github.com/rudderlabs/rudder-transformer/commit/9683161612c7e3b9c2be95a2728f68ec7dcf69f4))
* error handling for auth0 source ([#3038](https://github.com/rudderlabs/rudder-transformer/issues/3038)) ([2a21274](https://github.com/rudderlabs/rudder-transformer/commit/2a21274333350c615991f7b56b81b766502d5bf4))
* **ga4:** failures not considered with 200 status in events tab ([#3089](https://github.com/rudderlabs/rudder-transformer/issues/3089)) ([6a364fb](https://github.com/rudderlabs/rudder-transformer/commit/6a364fba34c46b15c0fe4b06ecfa6f4b81b6f436))
* gaoc batching order ([#3064](https://github.com/rudderlabs/rudder-transformer/issues/3064)) ([a98cabd](https://github.com/rudderlabs/rudder-transformer/commit/a98cabdfe7781ada12baf742df4a3a439fc5fecd))
* resolve bugsnag issue caused due to undefined properties ([#3086](https://github.com/rudderlabs/rudder-transformer/issues/3086)) ([d522b35](https://github.com/rudderlabs/rudder-transformer/commit/d522b35c908a9f262ba3ba27dda0ea5d9ac5bc6b))
* tiktok ads v2 error handling ([#3084](https://github.com/rudderlabs/rudder-transformer/issues/3084)) ([b6edff4](https://github.com/rudderlabs/rudder-transformer/commit/b6edff46fa0e0e210e82206fea46a064e3fbe00f))

## [1.55.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.54.4...v1.55.0) (2024-02-05)


Expand Down
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.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.55.0",
"version": "1.56.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down
177 changes: 177 additions & 0 deletions test/integrations/destinations/ga4/dataDelivery/data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
export const data = [
{
name: 'ga4',
description: 'Successful data delivery',
feature: 'dataDelivery',
module: 'destination',
version: 'v0',
input: {
request: {
body: {
version: '1',
type: 'REST',
method: 'POST',
endpoint: 'https://www.google-analytics.com/mp/collect',
headers: {
HOST: 'www.google-analytics.com',
'Content-Type': 'application/json',
},
params: {
api_secret: 'dummyApiSecret',
measurement_id: 'dummyMeasurementId',
},
body: {
JSON: {
client_id: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
timestamp_micros: 1650950229000000,
non_personalized_ads: true,
events: [
{
name: 'view_item_list',
params: {
item_list_id: 'related_products',
item_list_name: 'Related_products',
items: [
{
item_id: '507f1f77bcf86cd799439011',
item_name: 'Monopoly: 3rd Edition',
coupon: 'SUMMER_FUN',
item_category: 'Apparel',
item_brand: 'Google',
item_variant: 'green',
price: 19,
quantity: 2,
index: 1,
affiliation: 'Google Merchandise Store',
currency: 'USD',
discount: 2.22,
item_category2: 'Adult',
item_category3: 'Shirts',
item_category4: 'Crew',
item_category5: 'Short sleeve',
item_list_id: 'related_products',
item_list_name: 'Related Products',
location_id: 'L_12345',
},
],
engagement_time_msec: 1,
},
},
],
},
JSON_ARRAY: {},
XML: {},
FORM: {},
},
files: {},
userId: '',
},
},
},
output: {
response: {
status: 200,
body: {
output: {
destinationResponse: {
response: {
validationMessages: [],
},
status: 200,
},
message: '[GA4 Response Handler] - Request Processed Successfully',
status: 200,
},
},
},
},
},
{
name: 'ga4',
description: 'Data delivery failure',
feature: 'dataDelivery',
module: 'destination',
version: 'v0',
input: {
request: {
body: {
version: '1',
type: 'REST',
method: 'POST',
endpoint: 'https://www.google-analytics.com/debug/mp/collect',
headers: {
HOST: 'www.google-analytics.com',
'Content-Type': 'application/json',
},
params: {
api_secret: 'dummyApiSecret',
measurement_id: 'dummyMeasurementId',
},
body: {
JSON: {
client_id: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
timestamp_micros: 1650950229000000,
non_personalized_ads: true,
events: [
{
name: 'view_item',
params: {
category: 'Electronics',
productID: 'ABC123',
productName: 'Example Product',
customer_name: 'Sample User',
link_imageURL: 'https://example.com/images/product.jpg',
customer_email: '[email protected]',
link_productURL: 'https://example.com/products/ABC123',
stockAvailability: true,
details_features_0: 'wireless charging',
details_features_1: 'water-resistant',
engagement_time_msec: 1,
transaction_currency: 'USD',
customer_loyaltyPoints: 500,
transaction_totalAmount: 150.99,
transaction_discountApplied: 20.5,
details_specifications_color: 'blue',
details_specifications_specifications_specifications_specifications_color:
'blue',
details_specifications_specifications_specifications_specifications_weight:
'1.5kg',
},
},
],
},
JSON_ARRAY: {},
XML: {},
FORM: {},
},
files: {},
userId: '',
},
},
},
output: {
response: {
status: 400,
body: {
output: {
destinationResponse:
'The event param [string_value: "1.5kg"] has a duplicate name [details_specifications_specifications_specifications_specifications_weight].',
message:
'Validation Server Response Handler:: Validation Error for ga4 of field path :events.params | NAME_DUPLICATED-The event param [string_value: "1.5kg"] has a duplicate name [details_specifications_specifications_specifications_specifications_weight].',
statTags: {
destType: 'GA4',
destinationId: 'Non-determininable',
errorCategory: 'network',
errorType: 'aborted',
feature: 'dataDelivery',
implementation: 'native',
module: 'destination',
workspaceId: 'Non-determininable',
},
status: 400,
},
},
},
},
},
];
119 changes: 119 additions & 0 deletions test/integrations/destinations/ga4/network.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
export const networkCallsData = [
{
httpReq: {
url: 'https://www.google-analytics.com/mp/collect',
headers: {
HOST: 'www.google-analytics.com',
'Content-Type': 'application/json',
'User-Agent': 'RudderLabs',
},
params: {
api_secret: 'dummyApiSecret',
measurement_id: 'dummyMeasurementId',
},
data: {
client_id: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
timestamp_micros: 1650950229000000,
non_personalized_ads: true,
events: [
{
name: 'view_item_list',
params: {
item_list_id: 'related_products',
item_list_name: 'Related_products',
items: [
{
item_id: '507f1f77bcf86cd799439011',
item_name: 'Monopoly: 3rd Edition',
coupon: 'SUMMER_FUN',
item_category: 'Apparel',
item_brand: 'Google',
item_variant: 'green',
price: 19,
quantity: 2,
index: 1,
affiliation: 'Google Merchandise Store',
currency: 'USD',
discount: 2.22,
item_category2: 'Adult',
item_category3: 'Shirts',
item_category4: 'Crew',
item_category5: 'Short sleeve',
item_list_id: 'related_products',
item_list_name: 'Related Products',
location_id: 'L_12345',
},
],
engagement_time_msec: 1,
},
},
],
},
method: 'POST',
},
httpRes: {
data: {
validationMessages: [],
},
status: 200,
},
},
{
httpReq: {
url: 'https://www.google-analytics.com/debug/mp/collect',
headers: {
HOST: 'www.google-analytics.com',
'Content-Type': 'application/json',
'User-Agent': 'RudderLabs',
},
params: {
api_secret: 'dummyApiSecret',
measurement_id: 'dummyMeasurementId',
},
data: {
client_id: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
timestamp_micros: 1650950229000000,
non_personalized_ads: true,
events: [
{
name: 'view_item',
params: {
category: 'Electronics',
productID: 'ABC123',
productName: 'Example Product',
customer_name: 'Sample User',
link_imageURL: 'https://example.com/images/product.jpg',
customer_email: '[email protected]',
link_productURL: 'https://example.com/products/ABC123',
stockAvailability: true,
details_features_0: 'wireless charging',
details_features_1: 'water-resistant',
engagement_time_msec: 1,
transaction_currency: 'USD',
customer_loyaltyPoints: 500,
transaction_totalAmount: 150.99,
transaction_discountApplied: 20.5,
details_specifications_color: 'blue',
details_specifications_specifications_specifications_specifications_color: 'blue',
details_specifications_specifications_specifications_specifications_weight: '1.5kg',
},
},
],
},
method: 'POST',
},
httpRes: {
data: {
validationMessages: [
{
fieldPath: 'events.params',
description:
'The event param [string_value: "1.5kg"] has a duplicate name [details_specifications_specifications_specifications_specifications_weight].',
validationCode: 'NAME_DUPLICATED',
},
],
},
status: 200,
},
},
];

0 comments on commit 37b2e1e

Please sign in to comment.