Skip to content

Commit 3126cd7

Browse files
AnkitUnthinkablerhall-twilioAnkitSegmentvaradarajan-tw
authored
[STAGE] Hgi 404 update our pinned version of sentry to v7.40 (#742)
* STRATCONN-1287 - Add support for DoubleClick Floodlight config in in Google Ads (GTag) (#730) * Google Ads (GTag): add support for doubleclick floodlight id * nit: add floodlightAccountId as an option to the initializer * bump package.json for google ads * Added product Id in Ordered Product track event of klaviyo (#736) * Added product Id in Ordered Product track event of klaviyo * Klaviyo unit test cases added * Change veriable name productId to ProductID as klaviyo description * HGI-394 Test case added --------- Co-authored-by: Ankit Gupta <[email protected]> * HGI-394 klaviyo package.json Version update (#738) * Added product Id in Ordered Product track event of klaviyo * Klaviyo unit test cases added * Change veriable name productId to ProductID as klaviyo description * HGI-394 Test case added * Klaviyo version update --------- Co-authored-by: Ankit Gupta <[email protected]> Co-authored-by: Varadarajan V <[email protected]> * HGI-404 version upgraded of sentry from 5.12.1 to 7.45.0 * HGI-404 change cdn settings --------- Co-authored-by: rhall-twilio <[email protected]> Co-authored-by: Ankit Gupta <[email protected]> Co-authored-by: Varadarajan V <[email protected]>
1 parent 09f410a commit 3126cd7

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

integrations/klaviyo/lib/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ function formatItems(track) {
217217
ProductCategories: [product.category()],
218218
ProductURL: product.proxy('properties.productUrl'),
219219
ImageURL: product.proxy('properties.imageUrl'),
220-
SKU: product.sku()
220+
SKU: product.sku(),
221+
ProductID: product.productId() || product.id()
221222
});
222223

223224
// ensure unique $event_id is associated with each Ordered Product event by combining Order Completed

integrations/klaviyo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@segment/analytics.js-integration-klaviyo",
33
"description": "The Klaviyo analytics.js integration.",
4-
"version": "2.2.4",
4+
"version": "2.2.5",
55
"keywords": [
66
"analytics.js",
77
"analytics.js-integration",

integrations/klaviyo/test/index.test.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,13 @@ describe('Klaviyo', function() {
322322
ProductCategories: ['Games'],
323323
ProductURL: 'http://www.example.com/path/to/product',
324324
ImageURL: 'http://www.example.com/path/to/product/image.png',
325-
SKU: '45790-32'
325+
SKU: '45790-32',
326+
ProductID: '507f1f77bcf86cd799439011'
326327
}
327328
]);
328329
});
329330

330-
it('should have the correct $event_id for Ordered Product if id passed as product_id', function() {
331+
it('should have correct $event_id for Ordered Product if id passed as product_id', function() {
331332
analytics.track('Completed Order', {
332333
order_id: '50314b8e9bcf000000000000',
333334
total: 30,
@@ -362,7 +363,8 @@ describe('Klaviyo', function() {
362363
ProductCategories: ['Games'],
363364
ProductURL: 'http://www.example.com/path/to/product',
364365
ImageURL: 'http://www.example.com/path/to/product/image.png',
365-
SKU: '45790-32'
366+
SKU: '45790-32',
367+
ProductID: '507f1f77bcf86cd799439011'
366368
}
367369
]);
368370
});

integrations/sentry/lib/index.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,22 @@ var Sentry = (module.exports = integration('Sentry')
1616
.global('Sentry')
1717
.option('config', '')
1818
.option('environment', null)
19-
.option('serverName', null)
2019
.option('release', null)
2120
.option('ignoreErrors', []) // still exists, but not documented on Sentry's website
2221
.option('ignoreUrls', [])
23-
.option('whitelistUrls', [])
22+
.option('allowUrls', [])
2423
.option('includePaths', []) // maps to Sentry.Integrations.RewriteFrames plugin
25-
.option('maxMessageLength', null) // deprecated
2624
.option('logger', null)
2725
.option('customVersionProperty', null)
2826
.option('debug', false)
2927
.tag(
3028
'sentry',
31-
'<script src="https://browser.sentry-cdn.com/5.12.1/bundle.min.js" integrity="sha384-y+an4eARFKvjzOivf/Z7JtMJhaN6b+lLQ5oFbBbUwZNNVir39cYtkjW1r6Xjbxg3" crossorigin="anonymous"></script>'
29+
'<script src="https://browser.sentry-cdn.com/7.45.0/bundle.min.js" integrity="sha384-eB2/mQAt3oY62hGYFXiPg18greyp8WT/GvKHlsvdYbvSxBRGEhBqEX8L7giHxzvp" crossorigin="anonymous"></script>'
3230
)
3331
// Sentry.Integrations.RewriteFrames plugin: https://docs.sentry.io/platforms/javascript/#rewriteframes
3432
.tag(
3533
'plugin',
36-
'<script src="https://browser.sentry-cdn.com/5.12.1/rewriteframes.min.js" crossorigin="anonymous"></script>'
34+
'<script src="https://browser.sentry-cdn.com/7.45.0/rewriteframes.min.js" integrity="sha384-m1kRQsSdJkB99lz+1ZvWWjrj0SPH0wXH8y7gvdjHAtKBP8lrLrcv9iF7fOQGL8I0" crossorigin="anonymous"></script>'
3735
));
3836

3937
/**
@@ -53,8 +51,8 @@ Sentry.prototype.initialize = function() {
5351
environment: this.options.environment,
5452
release: customRelease || this.options.release,
5553
serverName: this.options.serverName,
56-
whitelistUrls: this.options.whitelistUrls,
57-
blacklistUrls: this.options.ignoreUrls,
54+
allowUrls: this.options.allowUrls,
55+
denyUrls: this.options.ignoreUrls,
5856
// ignoreErrors still exists, but is not documented on Sentry's website
5957
// https://github.com/getsentry/sentry-javascript/blob/master/packages/core/src/integrations/inboundfilters.ts#L12
6058
ignoreErrors: this.options.ignoreErrors,

0 commit comments

Comments
 (0)