Skip to content

Commit 9e199b9

Browse files
authored
Fastify sdk contrib (#523)
* Add fastify plugin skeleton * Add fastify x-ray plugin * Add test for request types * Add test for request types * Use the middleware configuration within the plugin * Complete test plugin assertion * Add test for setup section * Add mandatory segment name * Remove unused next value * Export plugin as default * Split plugin to use a hook and configure * Update test to use request segment * Add test to split headers * Add test for resolveName * Add test to create a new segment * Add test for http property * Add on response and error hooks * Add test for error statuses * Add test for ok status response * Remove unused variable * Fix hook segment assert * Verify whether http is defined * Update copy for fastify readme * Restore lockversion to version 1 * Remove unused files * Update to version 3.3.7 * Remove unused variable * Update notice.txt * Move dev dependency from package * Update package lock * Update package lock using lerna bootstrap * Revert package-lock * Update peer dependency * Fix package-lock
1 parent f432b2d commit 9e199b9

21 files changed

+1238
-0
lines changed

package-lock.json

Lines changed: 285 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
"eslint-plugin-promise": "^4.2.1",
3535
"eslint-plugin-standard": "^4.0.1",
3636
"express": "^4.16.4",
37+
"fastify": "^3.29.0",
38+
"fastify-plugin": "^4.2.0",
3739
"grunt": "^1.0.4",
3840
"grunt-contrib-clean": "^1.0.0",
3941
"grunt-jsdoc": "^2.4.0",
@@ -58,6 +60,7 @@
5860
"aws-xray-sdk": "file:packages/full_sdk",
5961
"aws-xray-sdk-core": "file:packages/core",
6062
"aws-xray-sdk-express": "file:packages/express",
63+
"aws-xray-sdk-fastify": "file:sdk_contrib/fastify",
6164
"aws-xray-sdk-hapi": "file:sdk_contrib/hapi",
6265
"aws-xray-sdk-koa2": "file:sdk_contrib/koa",
6366
"aws-xray-sdk-mysql": "file:packages/mysql",

sdk_contrib/fastify/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
index.*

sdk_contrib/fastify/.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../../.eslintrc.json"
3+
}

sdk_contrib/fastify/LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

sdk_contrib/fastify/NOTICE.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
AWS X-Ray SDK Fastify for JavaScript
2+
Copyright 2012-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
4+
This product includes software developed at
5+
Amazon Web Services, Inc. (http://aws.amazon.com/).

sdk_contrib/fastify/README.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# fastify-xray
2+
3+
A Fastify plugin to log requests and subsegments through AWSXray.
4+
5+
## Setup
6+
7+
The plugin relies on the AWS credentials being set before being registered, or it will pull them from
8+
`~/.aws/credentials` as per the SDK default.
9+
10+
For more details on using X-Ray, see the [docs](https://docs.aws.amazon.com/xray-sdk-for-nodejs/latest/reference)
11+
12+
## Usage
13+
14+
Simply register as a normal Fastify plugin
15+
16+
```js
17+
const AWSXRay = require('aws-xray-sdk');
18+
19+
await server.register(require('aws-xray-sdk-fastify'), {
20+
segmentName: 'test segment',
21+
captureAWS: true,
22+
plugins: [AWSXRay.plugins.ECSPlugin],
23+
});
24+
```
25+
26+
In automatic mode, you can access the X-Ray segment at any time via the AWSXRay SDK:
27+
28+
```js
29+
const AWSXRay = require('aws-xray-sdk-core');
30+
31+
const segment = AWSXRay.getSegment();
32+
segment.addAnnotation('hitController', 'true');
33+
```
34+
35+
In manual mode, you can access the current X-Ray segment from the request object:
36+
37+
```js
38+
server.route({
39+
method: 'GET',
40+
path: '/items',
41+
handler: async (request, reply) => {
42+
const segment = request.segment;
43+
segment.addAnnotation('hitController', 'true');
44+
45+
return {};
46+
},
47+
});
48+
```
49+
50+
### Options
51+
52+
- `segmentName` Segment name to use in place of default segment name generator (**required**)
53+
- `automaticMode` Specifies that X-Ray automatic mode is in use (default true)
54+
- `plugins` An array of AWS plugins to use (i.e. `[AWSXRay.plugins.EC2Plugin]`)
55+
- `captureAWS` Enables AWS X-Ray to capture AWS calls. This requires having `aws-sdk` installed as a peer dependency
56+
- `captureHTTP` Enables AWS X-Ray to capture all http calls
57+
- `capturePromises` Enables AWS X-Ray to capture all promises
58+
- `logger` Bind AWS X-Ray to compatible logging interface `({ trace, debug, info })`
59+
60+
## Sample App
61+
62+
A naive Fastify server with X-Ray enabled is available in the "sample" directory.
63+
The sample can be started from the sdk_contrib/fastify directory with: `npm run sample`
64+
65+
Once running, a "hello world" GET endpoint will be available at `http://localhost:3010/`
66+
67+
The sample will run but throw errors connecting to X-Ray if a local X-Ray daemon is not running.
68+
69+
For more information on running the XRay daemon locally:
70+
https://docs.aws.amazon.com/xray/latest/devguide/xray-daemon-local.html
71+
72+
## Thanks
73+
74+
Based on the hard work @[AWS X-Ray Express Middleware](https://github.com/aws/aws-xray-sdk-node/tree/master/packages/express) and heavily inspired by [X-Ray Hapi](https://github.com/aws/aws-xray-sdk-node/tree/master/sdk_contrib/hapi)
75+
76+
## Contributors
77+
78+
- [Jorge Vargas](https://github.com/jorgevrgs)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
const AWSXRay = require('aws-xray-sdk-core');
2+
const { middleware: mwUtils } = AWSXRay;
3+
4+
/** @type {import('fastify').onErrorHookHandler} */
5+
module.exports = function onErrorHook(request, reply, error, done) {
6+
const { segment } = request;
7+
8+
if (segment) {
9+
segment.addError(error);
10+
mwUtils.middlewareLog(
11+
'Fastify XRay segment encountered an error',
12+
request.url,
13+
segment
14+
);
15+
}
16+
17+
done();
18+
};
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// @ts-check
2+
const AWSXRay = require('aws-xray-sdk-core');
3+
const { middleware: mwUtils } = AWSXRay;
4+
5+
/** @type {import('fastify').onRequestHookHandler} */
6+
module.exports = function onRequestHook(request, reply, done) {
7+
const req = request.raw;
8+
const res = reply.raw;
9+
10+
const segment = mwUtils.traceRequestResponseCycle(req, res);
11+
12+
if (AWSXRay.isAutomaticMode()) {
13+
const ns = AWSXRay.getNamespace();
14+
ns.bindEmitter(req);
15+
ns.bindEmitter(res);
16+
17+
ns.run(() => {
18+
AWSXRay.setSegment(segment);
19+
});
20+
} else {
21+
request.log.info('Manual mode, skipping segment');
22+
23+
if (!request.segment) {
24+
request.segment = segment;
25+
} else {
26+
request.log.warn('Request already has a segment, skipping');
27+
}
28+
}
29+
30+
done();
31+
};

0 commit comments

Comments
 (0)