@sentry/serverless
Advanced tools
Comparing version 6.3.0-beta.3 to 6.3.0-beta.4
@@ -135,3 +135,3 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
let timeoutWarningTimer; | ||
// AWSLambda is like Express. It makes a distinction about handlers based on it's last argument | ||
// AWSLambda is like Express. It makes a distinction about handlers based on its last argument | ||
// async (event) => async handler | ||
@@ -159,2 +159,3 @@ // async (event, context) => async handler | ||
return async (event, context) => { | ||
var _a, _b; | ||
context.callbackWaitsForEmptyEventLoop = options.callbackWaitsForEmptyEventLoop; | ||
@@ -179,8 +180,11 @@ // In seconds. You cannot go any more granular than this in AWS Lambda. | ||
} | ||
// Applying `sentry-trace` to context | ||
let traceparentData; | ||
// Extract tracing data from headers | ||
let traceparentData, tracestateData; | ||
const eventWithHeaders = event; | ||
if (eventWithHeaders.headers && utils_1.isString(eventWithHeaders.headers['sentry-trace'])) { | ||
traceparentData = tracing_1.extractTraceparentData(eventWithHeaders.headers['sentry-trace']); | ||
if ((_a = eventWithHeaders.headers) === null || _a === void 0 ? void 0 : _a['sentry-trace']) { | ||
traceparentData = tracing_1.extractSentrytraceData(eventWithHeaders.headers['sentry-trace']); | ||
} | ||
if ((_b = eventWithHeaders.headers) === null || _b === void 0 ? void 0 : _b.tracestate) { | ||
tracestateData = tracing_1.extractTracestateData(eventWithHeaders.headers.tracestate); | ||
} | ||
const transaction = node_1.startTransaction({ | ||
@@ -190,2 +194,3 @@ name: context.functionName, | ||
...traceparentData, | ||
...(tracestateData && { metadata: { tracestate: tracestateData } }), | ||
}); | ||
@@ -192,0 +197,0 @@ const hub = node_1.getCurrentHub(); |
@@ -35,10 +35,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
return (req, res) => { | ||
var _a, _b; | ||
const reqMethod = (req.method || '').toUpperCase(); | ||
const reqUrl = utils_1.stripUrlQueryAndFragment(req.originalUrl || req.url || ''); | ||
// Applying `sentry-trace` to context | ||
let traceparentData; | ||
// Extract tracing data from headers | ||
let traceparentData, tracestateData; | ||
const reqWithHeaders = req; | ||
if (reqWithHeaders.headers && utils_1.isString(reqWithHeaders.headers['sentry-trace'])) { | ||
traceparentData = tracing_1.extractTraceparentData(reqWithHeaders.headers['sentry-trace']); | ||
if ((_a = reqWithHeaders.headers) === null || _a === void 0 ? void 0 : _a['sentry-trace']) { | ||
traceparentData = tracing_1.extractSentrytraceData(reqWithHeaders.headers['sentry-trace']); | ||
} | ||
if ((_b = reqWithHeaders.headers) === null || _b === void 0 ? void 0 : _b.tracestate) { | ||
tracestateData = tracing_1.extractTracestateData(reqWithHeaders.headers.tracestate); | ||
} | ||
const transaction = node_1.startTransaction({ | ||
@@ -48,2 +52,3 @@ name: `${reqMethod} ${reqUrl}`, | ||
...traceparentData, | ||
...(tracestateData && { metadata: { tracestate: tracestateData } }), | ||
}); | ||
@@ -50,0 +55,0 @@ // getCurrentHub() is expected to use current active domain as a carrier |
import { captureException, captureMessage, flush, getCurrentHub, Severity, startTransaction, withScope, } from '@sentry/node'; | ||
import * as Sentry from '@sentry/node'; | ||
import { extractTraceparentData } from '@sentry/tracing'; | ||
import { isString, logger } from '@sentry/utils'; | ||
import { extractSentrytraceData, extractTracestateData } from '@sentry/tracing'; | ||
import { logger } from '@sentry/utils'; | ||
import { existsSync } from 'fs'; | ||
@@ -131,3 +131,3 @@ import { hostname } from 'os'; | ||
let timeoutWarningTimer; | ||
// AWSLambda is like Express. It makes a distinction about handlers based on it's last argument | ||
// AWSLambda is like Express. It makes a distinction about handlers based on its last argument | ||
// async (event) => async handler | ||
@@ -155,2 +155,3 @@ // async (event, context) => async handler | ||
return async (event, context) => { | ||
var _a, _b; | ||
context.callbackWaitsForEmptyEventLoop = options.callbackWaitsForEmptyEventLoop; | ||
@@ -175,8 +176,11 @@ // In seconds. You cannot go any more granular than this in AWS Lambda. | ||
} | ||
// Applying `sentry-trace` to context | ||
let traceparentData; | ||
// Extract tracing data from headers | ||
let traceparentData, tracestateData; | ||
const eventWithHeaders = event; | ||
if (eventWithHeaders.headers && isString(eventWithHeaders.headers['sentry-trace'])) { | ||
traceparentData = extractTraceparentData(eventWithHeaders.headers['sentry-trace']); | ||
if ((_a = eventWithHeaders.headers) === null || _a === void 0 ? void 0 : _a['sentry-trace']) { | ||
traceparentData = extractSentrytraceData(eventWithHeaders.headers['sentry-trace']); | ||
} | ||
if ((_b = eventWithHeaders.headers) === null || _b === void 0 ? void 0 : _b.tracestate) { | ||
tracestateData = extractTracestateData(eventWithHeaders.headers.tracestate); | ||
} | ||
const transaction = startTransaction({ | ||
@@ -186,2 +190,3 @@ name: context.functionName, | ||
...traceparentData, | ||
...(tracestateData && { metadata: { tracestate: tracestateData } }), | ||
}); | ||
@@ -188,0 +193,0 @@ const hub = getCurrentHub(); |
import { captureException, flush, getCurrentHub, Handlers, startTransaction } from '@sentry/node'; | ||
import { extractTraceparentData } from '@sentry/tracing'; | ||
import { isString, logger, stripUrlQueryAndFragment } from '@sentry/utils'; | ||
import { extractSentrytraceData, extractTracestateData } from '@sentry/tracing'; | ||
import { logger, stripUrlQueryAndFragment } from '@sentry/utils'; | ||
import { domainify, getActiveDomain, proxyFunction } from './../utils'; | ||
@@ -33,10 +33,14 @@ const { parseRequest } = Handlers; | ||
return (req, res) => { | ||
var _a, _b; | ||
const reqMethod = (req.method || '').toUpperCase(); | ||
const reqUrl = stripUrlQueryAndFragment(req.originalUrl || req.url || ''); | ||
// Applying `sentry-trace` to context | ||
let traceparentData; | ||
// Extract tracing data from headers | ||
let traceparentData, tracestateData; | ||
const reqWithHeaders = req; | ||
if (reqWithHeaders.headers && isString(reqWithHeaders.headers['sentry-trace'])) { | ||
traceparentData = extractTraceparentData(reqWithHeaders.headers['sentry-trace']); | ||
if ((_a = reqWithHeaders.headers) === null || _a === void 0 ? void 0 : _a['sentry-trace']) { | ||
traceparentData = extractSentrytraceData(reqWithHeaders.headers['sentry-trace']); | ||
} | ||
if ((_b = reqWithHeaders.headers) === null || _b === void 0 ? void 0 : _b.tracestate) { | ||
tracestateData = extractTracestateData(reqWithHeaders.headers.tracestate); | ||
} | ||
const transaction = startTransaction({ | ||
@@ -46,2 +50,3 @@ name: `${reqMethod} ${reqUrl}`, | ||
...traceparentData, | ||
...(tracestateData && { metadata: { tracestate: tracestateData } }), | ||
}); | ||
@@ -48,0 +53,0 @@ // getCurrentHub() is expected to use current active domain as a carrier |
{ | ||
"name": "@sentry/serverless", | ||
"version": "6.3.0-beta.3", | ||
"version": "6.3.0-beta.4", | ||
"description": "Offical Sentry SDK for various serverless solutions", | ||
@@ -19,7 +19,7 @@ "repository": "git://github.com/getsentry/sentry-javascript.git", | ||
"dependencies": { | ||
"@sentry/minimal": "6.3.0-beta.3", | ||
"@sentry/node": "6.3.0-beta.3", | ||
"@sentry/tracing": "6.3.0-beta.3", | ||
"@sentry/types": "6.3.0-beta.3", | ||
"@sentry/utils": "6.3.0-beta.3", | ||
"@sentry/minimal": "6.3.0-beta.4", | ||
"@sentry/node": "6.3.0-beta.4", | ||
"@sentry/tracing": "6.3.0-beta.4", | ||
"@sentry/types": "6.3.0-beta.4", | ||
"@sentry/utils": "6.3.0-beta.4", | ||
"@types/aws-lambda": "^8.10.62", | ||
@@ -34,3 +34,3 @@ "@types/express": "^4.17.2", | ||
"@google-cloud/pubsub": "^2.5.0", | ||
"@sentry-internal/eslint-config-sdk": "6.3.0-beta.3", | ||
"@sentry-internal/eslint-config-sdk": "6.3.0-beta.4", | ||
"@types/node": "^14.6.4", | ||
@@ -37,0 +37,0 @@ "aws-sdk": "^2.765.0", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
213736
2029
+ Added@sentry/core@6.3.0-beta.4(transitive)
+ Added@sentry/hub@6.3.0-beta.4(transitive)
+ Added@sentry/minimal@6.3.0-beta.4(transitive)
+ Added@sentry/node@6.3.0-beta.4(transitive)
+ Added@sentry/tracing@6.3.0-beta.4(transitive)
+ Added@sentry/types@6.3.0-beta.4(transitive)
+ Added@sentry/utils@6.3.0-beta.4(transitive)
- Removed@sentry/core@6.3.0-beta.3(transitive)
- Removed@sentry/hub@6.3.0-beta.3(transitive)
- Removed@sentry/minimal@6.3.0-beta.3(transitive)
- Removed@sentry/node@6.3.0-beta.3(transitive)
- Removed@sentry/tracing@6.3.0-beta.3(transitive)
- Removed@sentry/types@6.3.0-beta.3(transitive)
- Removed@sentry/utils@6.3.0-beta.3(transitive)
Updated@sentry/minimal@6.3.0-beta.4
Updated@sentry/node@6.3.0-beta.4
Updated@sentry/tracing@6.3.0-beta.4
Updated@sentry/types@6.3.0-beta.4
Updated@sentry/utils@6.3.0-beta.4