Tracing capabilities for @sentry/serverless. - #2945

Merged
kamilogorek merged 3 commits into
getsentry:masterfrom
marshall-lee:serverless/tracing
Oct 12, 2020
Merged

Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom
marshall-lee:serverless/tracing

Conversation

@marshall-lee

@marshall-leemarshall-lee commented Sep 30, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Add tracing support for AWS Lambda & Google Cloud Functions.

Also I believe it fixes#2956.

@marshall-lee
marshall-lee marked this pull request as draft September 30, 2020 17:35
@kamilogorek

kamilogorek commented Oct 1, 2020

Copy link
Copy Markdown
Contributor

@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)

@marshall-lee
marshall-leeforce-pushed the serverless/tracing branch 3 times, most recently from bc19693 to a3620c9CompareOctober 5, 2020 16:52
@marshall-lee

marshall-lee commented Oct 5, 2020

Copy link
Copy Markdown
ContributorAuthor

@kamilogorek It's ready for review!

Few notes from me:

  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?

@marshall-lee
marshall-lee marked this pull request as ready for review October 5, 2020 17:10
@ghost

ghost commented Oct 5, 2020 via email

Copy link
Copy Markdown

@marshall-lee
marshall-leeforce-pushed the serverless/tracing branch 3 times, most recently from 7a9bb4d to 19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT requested changes Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts Outdated
Comment threadpackages/serverless/src/gcpfunction.ts Outdated
Comment threadpackages/serverless/src/gcpfunction.ts Outdated
Comment threadpackages/serverless/src/gcpfunction.ts Outdated
@marshall-leemarshall-lee mentioned this pull request Oct 8, 2020
Closed
2 tasks
@ajjindal
ajjindal requested a review from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed the serverless/tracing branch 5 times, most recently from 041b8b3 to fd57745CompareOctober 9, 2020 08:08
@HazAT

HazAT commented Oct 9, 2020

Copy link
Copy Markdown
Member

@marshall-lee Can I give it another pass?

@marshall-lee
marshall-leeforce-pushed the serverless/tracing branch 2 times, most recently from 69d33a4 to f928566CompareOctober 9, 2020 11:26
@marshall-lee

marshall-lee commented Oct 9, 2020

Copy link
Copy Markdown
ContributorAuthor

@HazAT

@marshall-lee Can I give it another pass?

yes

HazAT
HazAT approved these changes Oct 9, 2020
View reviewed changes

@HazATHazAT left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍
Awesome stuff, especially the tests.

The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?

@marshall-lee

marshall-lee commented Oct 9, 2020

Copy link
Copy Markdown
ContributorAuthor

@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.

@marshall-lee

marshall-lee commented Oct 9, 2020

Copy link
Copy Markdown
ContributorAuthor

Some demos:

  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE

  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8

  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5

  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL

  5. GCP Function error capture: https://imgur.com/a/amXdzoL

@HazATHazAT changed the title [WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed the serverless/tracing branch 3 times, most recently from 598aea5 to c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek reviewed Oct 12, 2020
View reviewed changes

@kamilogorekkamilogorek left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.

Comment threadpackages/serverless/README.md Outdated
If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option.

```javascript
import * as Sentry from '@sentry/serverless/awslambda';

@kamilogorekkamilogorekOct 12, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:

import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);

or

import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);

What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?

@marshall-leemarshall-leeOct 12, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:

import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);

As for tree-shaking, I need to check it.

Comment threadpackages/serverless/src/awslambda.ts Outdated
Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek

kamilogorek commented Oct 12, 2020

Copy link
Copy Markdown
Contributor

@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!

@kamilogorek
kamilogorek merged commit af71624 into getsentry:masterOct 12, 2020
@marshall-leemarshall-lee mentioned this pull request Oct 14, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes
+1 more reviewer
@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call

3 participants

@marshall-lee@kamilogorek@HazAT
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Tracing capabilities for @sentry/serverless. - #2945
Merged
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Oct 12, 2020
Merged
Tracing capabilities for @sentry/serverless.#2945
kamilogorek merged 3 commits into
getsentry:masterfrom 
marshall-lee:serverless/tracing
Conversation
@marshall-lee
@marshall-leemarshall-lee
commented
Sep 30, 2020•

edited

Loading

Copy link


Copy Markdown

Contributor
Add tracing support for AWS Lambda & Google Cloud Functions.
Also I believe it fixes#2956.
@marshall-lee
marshall-lee
marked this pull request as draft
September 30, 2020 17:35
@kamilogorek
kamilogorek
commented
Oct 1, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee ping me once it's done or just ready for a review (not sure how you personally use drafts)
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
bc19693 to
a3620c9CompareOctober 5, 2020 16:52
@marshall-lee
marshall-lee
commented
Oct 5, 2020

Copy link


Copy Markdown

ContributorAuthor
@kamilogorek It's ready for review!
Few notes from me:
  • Not sure where to put awsresources module. Now it resides in packages/serverless but in general it could be used anywhere, it's not strictly required to use it only with aws lambda.
  • I wanted to re-define defaultIntegrations() for @sentry/serverless and put new AWSResources() there but @sentry/serverless is not just for aws lambda. What do you think about making @sentry/serverless/awslambda export all the @sentry/node stuff but with overridden defaultIntegrations()?
@marshall-lee
marshall-lee
marked this pull request as ready for review
October 5, 2020 17:10
@ghost
ghost
commented
Oct 5, 2020
via email 

Copy link


Copy Markdown

@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
7a9bb4d to
19b6573CompareOctober 7, 2020 14:34
HazAT
HazAT
requested changes
Oct 7, 2020
View reviewed changes
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction.ts
Outdated

@marshall-leemarshall-lee
mentioned this pull request
Oct 8, 2020
 Closed

2 tasks
@ajjindal
ajjindal
requested a review
from HazATOctober 8, 2020 21:54
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
5 times, most recently
from
041b8b3 to
fd57745CompareOctober 9, 2020 08:08
@HazAT
HazAT
commented
Oct 9, 2020

Copy link


Copy Markdown

Member
@marshall-lee Can I give it another pass?
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
2 times, most recently
from
69d33a4 to
f928566CompareOctober 9, 2020 11:26
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT
@marshall-lee Can I give it another pass?
yes
HazAT
HazAT
approved these changes
Oct 9, 2020
View reviewed changes
@HazATHazAT
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

Awesome stuff, especially the tests.
The only thing I would ask (since I don't have a test-setup now), could you provide screenshots of Transactions in Sentry to see this in action and how it looks like?
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
@HazAT Thanks! I will provide a series of screencasts later, I'm working on it.
@marshall-lee
marshall-lee
commented
Oct 9, 2020

Copy link


Copy Markdown

ContributorAuthor
Some demos:
  1. Simple transaction in AWS Lambda: https://imgur.com/a/pEubxuE
  2. Transaction in AWS Lambda with two sequentials nested spans: https://imgur.com/a/2MRNNW8
  3. Transaction in AWS Lambda with two concurrent nested spans: https://imgur.com/fvcCCk5
  4. GCP Function transaction: https://imgur.com/a/Lf9uLwL
  5. GCP Function error capture: https://imgur.com/a/amXdzoL
@HazATHazAT
changed the title
[WIP] Tracing capabilities for @sentry/serverless.Tracing capabilities for @sentry/serverless.Oct 12, 2020
@marshall-lee
marshall-leeforce-pushed
the
serverless/tracing
branch
3 times, most recently
from
598aea5 to
c8a90f0CompareOctober 12, 2020 10:03
kamilogorek
kamilogorek
reviewed
Oct 12, 2020
View reviewed changes
@kamilogorekkamilogorek
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work, thank you! My questions are just nitpicking, so other than that this PR should be good to go.
Comment threadpackages/serverless/README.md
Outdated

If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option. 

```javascript
import * as Sentry from '@sentry/serverless/awslambda';
@kamilogorekkamilogorekOct 12, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it should either say:
import*asSentryfrom'@sentry/serverless/awslambda';Sentry.init(...);
or
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
What about tree-shaking? If one is using AWSLambda, will it strip the GCPFunction code down?
@marshall-leemarshall-leeOct 12, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import * as Sentry from '@sentry/serverless/awslambda' was a typo. It was intended to be:
import*asSentryfrom'@sentry/serverless';Sentry.AWSLambda.init(...);
As for tree-shaking, I need to check it.
Comment threadpackages/serverless/src/awslambda.ts
Outdated

Comment threadpackages/serverless/src/gcpfunction/http.ts
@kamilogorek
kamilogorek
commented
Oct 12, 2020

Copy link


Copy Markdown

Contributor
@marshall-lee it tree-shakes perfectly, you don't need to verify it anymore. Thanks!
@kamilogorek
kamilogorek
merged commit af71624
into
getsentry:masterOct 12, 2020
@marshall-leemarshall-lee
mentioned this pull request
Oct 14, 2020
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@HazATHazATHazAT approved these changes

+1 more reviewer

@kamilogorekkamilogorekkamilogorek left review comments
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Synchronous Lambda callback causes undesirable second captureException call


3 participants

@marshall-lee@kamilogorek@HazAT