Skip to content

Commit

Permalink
Merge branch 'develop' into fix.email-mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
koladilip authored Apr 3, 2024
2 parents 5d654b3 + 13e7fd4 commit 679a318
Show file tree
Hide file tree
Showing 10 changed files with 171 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
channel-id: ${{ secrets.SLACK_RELEASE_CHANNEL_ID }}
payload: |
{
"text": "*<${{env.RELEASES_URL}}v${{ steps.extract-version.outputs.release_version }}|v${{ steps.extract-version.outputs.release_version }}>*\nCC: <@U03KG4BK1L1> <@U02AE5GMMHV> <@U01LVJ30QEB>",
"text": "*<${{env.RELEASES_URL}}v${{ steps.extract-version.outputs.release_version }}|v${{ steps.extract-version.outputs.release_version }}>*\nCC: <@U03KG4BK1L1> <@U024YF8CR53> <@U01LVJ30QEB>",
"blocks": [
{
"type": "header",
Expand All @@ -115,7 +115,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*<${{env.RELEASES_URL}}v${{ steps.extract-version.outputs.release_version }}|v${{ steps.extract-version.outputs.release_version }}>*\nCC: <@U03KG4BK1L1> <@U02AE5GMMHV> <@U01LVJ30QEB>"
"text": "*<${{env.RELEASES_URL}}v${{ steps.extract-version.outputs.release_version }}|v${{ steps.extract-version.outputs.release_version }}>*\nCC: <@U03KG4BK1L1> <@U024YF8CR53> <@U01LVJ30QEB>"
}
}
]
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@

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.61.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.61.0...v1.61.1) (2024-04-03)

## [1.61.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.60.0...v1.61.0) (2024-04-02)


### Features

* consent field support for ga4 ([#3213](https://github.com/rudderlabs/rudder-transformer/issues/3213)) ([92515a5](https://github.com/rudderlabs/rudder-transformer/commit/92515a5fd8a2798c48010078f62b360ec6a49979))
* consent field support for gaoc and upgrade the api version from v14 to v16 ([#3121](https://github.com/rudderlabs/rudder-transformer/issues/3121)) ([2aac2a6](https://github.com/rudderlabs/rudder-transformer/commit/2aac2a62547b7a7c617735fc3d6e88e0a1bed76e)), closes [#3190](https://github.com/rudderlabs/rudder-transformer/issues/3190)
* onboard new destination bloomreach ([#3185](https://github.com/rudderlabs/rudder-transformer/issues/3185)) ([d9b7e1f](https://github.com/rudderlabs/rudder-transformer/commit/d9b7e1f70565d59979aee3e62f60e39edb9a23c7))
* onboarding linkedin conversion api ([#3194](https://github.com/rudderlabs/rudder-transformer/issues/3194)) ([eb7b197](https://github.com/rudderlabs/rudder-transformer/commit/eb7b197322c617b14c2579de8cb4d4dacf8e1df3))
* update movable ink batch size ([#3223](https://github.com/rudderlabs/rudder-transformer/issues/3223)) ([667095f](https://github.com/rudderlabs/rudder-transformer/commit/667095fa8316cd95a066f15b848ad503c6b4af80))


### Bug Fixes

* fixed userId mapping, now mapping to uid instead of id ([#3192](https://github.com/rudderlabs/rudder-transformer/issues/3192)) ([70a468b](https://github.com/rudderlabs/rudder-transformer/commit/70a468bf16ecd5ee0b6fecee4b837895d19c525f))
* ninetailed: remove page support ([#3218](https://github.com/rudderlabs/rudder-transformer/issues/3218)) ([2f30c56](https://github.com/rudderlabs/rudder-transformer/commit/2f30c56af62e983d09b5d4f2da9a0ba22f5c1612))
* shopify invalid_event metric prometheus label ([#3200](https://github.com/rudderlabs/rudder-transformer/issues/3200)) ([345c87d](https://github.com/rudderlabs/rudder-transformer/commit/345c87d7c530c621ae3fd6c504d64e5a14e31f22))
* fix: snapchat conversion: add event level_complete ([#3231](https://github.com/rudderlabs/rudder-transformer/issues/3231)) ([39368a0](https://github.com/rudderlabs/rudder-transformer/commit/39368a09e48acc324faa855186bc623e5c347881))

## [1.60.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.57.1...v1.60.0) (2024-03-20)


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.60.0",
"version": "1.61.1",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/v2/destinations/fullstory/procWorkflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ steps:
"use_most_recent": .message.properties.useMostRecent,
};
$.context.payload.user = {
"uid": .message.properties.userId ?? .message.userId,
"id": .message.properties.userId ?? .message.userId,
}
- name: cleanPayload
Expand Down
13 changes: 5 additions & 8 deletions src/cdk/v2/destinations/linkedin_ads/rtWorkflow.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
bindings:
- path: ./utils
- path: ./config
- name: handleRtTfSingleEventError
path: ../../../../v0/util/index

steps:
- name: validateInput
Expand All @@ -23,14 +25,9 @@ steps:
})[]
- name: failedEvents
template: |
$.outputs.transform#idx.error.({
"metadata": ^[idx].metadata[],
"destination": ^[idx].destination,
"batched": false,
"statusCode": .status,
"error": .message,
"statTags": .originalError.statTags
})[]
$.outputs.transform#idx.error.(
$.handleRtTfSingleEventError(^[idx], .originalError ?? ., {})
)[]
- name: batchSuccessfulEvents
description: Batches the successfulEvents
Expand Down
3 changes: 3 additions & 0 deletions src/cdk/v2/destinations/linkedin_ads/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ const fetchAndVerifyConversionHappenedAt = (message) => {
};

function batchResponseBuilder(successfulEvents) {
if (successfulEvents.length === 0) {
return [];
}
const constants = {
version: successfulEvents[0].message[0].version,
type: successfulEvents[0].message[0].type,
Expand Down
1 change: 1 addition & 0 deletions src/v0/destinations/snapchat_conversion/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const eventNameMapping = {
save: 'SAVE',
subscribe: 'SUBSCRIBE',
complete_tutorial: 'COMPLETE_TUTORIAL',
level_complete: 'LEVEL_COMPLETE',
invite: 'INVITE',
login: 'LOGIN',
share: 'SHARE',
Expand Down
2 changes: 1 addition & 1 deletion test/integrations/destinations/fullstory/processor/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const data = [
id: 's001',
},
user: {
uid: 'u001',
id: 'u001',
},
},
JSON_ARRAY: {},
Expand Down
134 changes: 134 additions & 0 deletions test/integrations/destinations/snapchat_conversion/processor/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4600,6 +4600,140 @@ export const data = [
},
},
},
{
name: 'snapchat_conversion',
description: 'test event mapping from destination config',
feature: 'processor',
module: 'destination',
version: 'v0',
input: {
request: {
body: [
{
message: {
messageId: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
originalTimestamp: '2022-04-22T10:57:58Z',
anonymousId: 'ea5cfab2-3961-4d8a-8187-3d1858c99090',
context: {
traits: {
email: '[email protected]',
phone: '+91 2111111 ',
},
app: {
build: '1.0.0',
name: 'RudderLabs JavaScript SDK',
namespace: 'com.rudderlabs.javascript',
version: '1.0.0',
},
device: {
advertisingId: 'T0T0T072-5e28-45a1-9eda-ce22a3e36d1a',
id: '3f034872-5e28-45a1-9eda-ce22a3e36d1a',
manufacturer: 'Google',
name: 'generic_x86_arm',
type: 'ios',
attTrackingStatus: 3,
},
library: {
name: 'RudderLabs JavaScript SDK',
version: '1.0.0',
},
locale: 'en-US',
os: {
name: 'iOS',
version: '14.4.1',
},
screen: {
density: 2,
},
userAgent:
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36',
},
type: 'track',
event: 'Custom Event',
properties: {
query: 't-shirts',
event_conversion_type: 'web',
},
integrations: {
All: true,
},
sentAt: '2022-04-22T10:57:58Z',
},
destination: {
DestinationDefinition: {
Config: {
cdkV2Enabled: false,
},
},
Config: {
pixelId: 'dummyPixelId',
apiKey: 'dummyApiKey',
rudderEventsToSnapEvents: [
{
from: 'Custom Event',
to: 'level_complete',
},
],
},
},
metadata: {
jobId: 47,
destinationId: 'd2',
workspaceId: 'w2',
},
},
],
method: 'POST',
},
},
output: {
response: {
status: 200,
body: [
{
metadata: {
jobId: 47,
destinationId: 'd2',
workspaceId: 'w2',
},
output: {
version: '1',
type: 'REST',
userId: '',
method: 'POST',
endpoint: 'https://tr.snapchat.com/v2/conversion',
headers: {
Authorization: 'Bearer dummyApiKey',
'Content-Type': 'application/json',
},
params: {},
body: {
JSON: {
event_type: 'LEVEL_COMPLETE',
hashed_email: '73062d872926c2a556f17b36f50e328ddf9bff9d403939bd14b6c3b7f5a33fc2',
hashed_phone_number:
'bc77d64d7045fe44795ed926df37231a0cfb6ec6b74588c512790e9f143cc492',
hashed_mobile_ad_id:
'f9779d734aaee50f16ee0011260bae7048f1d9a128c62b6a661077875701edd2',
hashed_idfv: '54bd0b26a3d39dad90f5149db49b9fd9ba885f8e35d1d94cae69273f5e657b9f',
user_agent:
'mozilla/5.0 (macintosh; intel mac os x 10_15_2) applewebkit/537.36 (khtml, like gecko) chrome/79.0.3945.88 safari/537.36',
timestamp: '1650625078',
event_conversion_type: 'OFFLINE',
pixel_id: 'dummyPixelId',
},
JSON_ARRAY: {},
XML: {},
FORM: {},
},
files: {},
},
statusCode: 200,
},
],
},
},
},
].map((tc) => ({
...tc,
mockFns: (_) => {
Expand Down

0 comments on commit 679a318

Please sign in to comment.