Skip to content

Commit a484143

Browse files
astuyveastuyve
authored
feat: Clean build and copy handler.js (#307)
* feat: Clean build and copy handler.js * feat: bump yarn lock to try to break cache * feat: Clean run updated snapshots
1 parent 5d7862c commit a484143

10 files changed

+342
-13
lines changed

‎integration_tests/snapshots/logs/esm_node12.log

+228
Large diffs are not rendered by default.

‎integration_tests/snapshots/logs/process-input-traced_node12.log

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ START
3434
"resource": "GET /{proxy+}",
3535
"error": 0,
3636
"meta": {
37+
"_dd.p.dm": "-0",
3738
"runtime-id":"XXXX",
3839
"operation_name": "aws.apigateway",
3940
"resource_names": "GET /{proxy+}",
@@ -47,6 +48,7 @@ START
4748
},
4849
"metrics": {
4950
"_dd.agent_psr": 1,
51+
"_dd.top_level": 1,
5052
"_sampling_priority_v1": 1
5153
},
5254
"start":XXXX,
@@ -168,6 +170,7 @@ START
168170
"resource": "sns-lambda",
169171
"error": 0,
170172
"meta": {
173+
"_dd.p.dm": "-0",
171174
"service": "sns",
172175
"runtime-id":"XXXX",
173176
"operation_name": "aws.sns",
@@ -185,6 +188,7 @@ START
185188
},
186189
"metrics": {
187190
"_dd.agent_psr": 1,
191+
"_dd.top_level": 1,
188192
"_sampling_priority_v1": 1
189193
},
190194
"start":XXXX,
@@ -284,6 +288,7 @@ START
284288
"resource": "my-queue",
285289
"error": 0,
286290
"meta": {
291+
"_dd.p.dm": "-0",
287292
"service": "sqs",
288293
"runtime-id":"XXXX",
289294
"operation_name": "aws.sqs",
@@ -298,6 +303,7 @@ START
298303
},
299304
"metrics": {
300305
"_dd.agent_psr": 1,
306+
"_dd.top_level": 1,
301307
"retry_count": 1,
302308
"_sampling_priority_v1": 1
303309
},

‎integration_tests/snapshots/logs/process-input-traced_node14.log

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ START
3434
"resource": "GET /{proxy+}",
3535
"error": 0,
3636
"meta": {
37+
"_dd.p.dm": "-0",
3738
"runtime-id":"XXXX",
3839
"operation_name": "aws.apigateway",
3940
"resource_names": "GET /{proxy+}",
@@ -47,6 +48,7 @@ START
4748
},
4849
"metrics": {
4950
"_dd.agent_psr": 1,
51+
"_dd.top_level": 1,
5052
"_sampling_priority_v1": 1
5153
},
5254
"start":XXXX,
@@ -168,6 +170,7 @@ START
168170
"resource": "sns-lambda",
169171
"error": 0,
170172
"meta": {
173+
"_dd.p.dm": "-0",
171174
"service": "sns",
172175
"runtime-id":"XXXX",
173176
"operation_name": "aws.sns",
@@ -185,6 +188,7 @@ START
185188
},
186189
"metrics": {
187190
"_dd.agent_psr": 1,
191+
"_dd.top_level": 1,
188192
"_sampling_priority_v1": 1
189193
},
190194
"start":XXXX,
@@ -284,6 +288,7 @@ START
284288
"resource": "my-queue",
285289
"error": 0,
286290
"meta": {
291+
"_dd.p.dm": "-0",
287292
"service": "sqs",
288293
"runtime-id":"XXXX",
289294
"operation_name": "aws.sqs",
@@ -298,6 +303,7 @@ START
298303
},
299304
"metrics": {
300305
"_dd.agent_psr": 1,
306+
"_dd.top_level": 1,
301307
"retry_count": 1,
302308
"_sampling_priority_v1": 1
303309
},

‎integration_tests/snapshots/logs/process-input-traced_node16.log

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ START
3434
"resource": "GET /{proxy+}",
3535
"error": 0,
3636
"meta": {
37+
"_dd.p.dm": "-0",
3738
"version": "1.0.0",
3839
"runtime-id":"XXXX",
3940
"operation_name": "aws.apigateway",
@@ -48,6 +49,7 @@ START
4849
},
4950
"metrics": {
5051
"_dd.agent_psr": 1,
52+
"_dd.top_level": 1,
5153
"_sampling_priority_v1": 1
5254
},
5355
"start":XXXX,
@@ -172,6 +174,7 @@ START
172174
"resource": "sns-lambda",
173175
"error": 0,
174176
"meta": {
177+
"_dd.p.dm": "-0",
175178
"service": "sns",
176179
"version": "1.0.0",
177180
"runtime-id":"XXXX",
@@ -190,6 +193,7 @@ START
190193
},
191194
"metrics": {
192195
"_dd.agent_psr": 1,
196+
"_dd.top_level": 1,
193197
"_sampling_priority_v1": 1
194198
},
195199
"start":XXXX,
@@ -291,6 +295,7 @@ START
291295
"resource": "my-queue",
292296
"error": 0,
293297
"meta": {
298+
"_dd.p.dm": "-0",
294299
"service": "sqs",
295300
"version": "1.0.0",
296301
"runtime-id":"XXXX",
@@ -306,6 +311,7 @@ START
306311
},
307312
"metrics": {
308313
"_dd.agent_psr": 1,
314+
"_dd.top_level": 1,
309315
"retry_count": 1,
310316
"_sampling_priority_v1": 1
311317
},

‎integration_tests/snapshots/logs/status-code-500s_node12.log

+6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ START
4040
"resource": "GET /{proxy+}",
4141
"error": 0,
4242
"meta": {
43+
"_dd.p.dm": "-0",
4344
"runtime-id":"XXXX",
4445
"operation_name": "aws.apigateway",
4546
"resource_names": "GET /{proxy+}",
@@ -53,6 +54,7 @@ START
5354
},
5455
"metrics": {
5556
"_dd.agent_psr": 1,
57+
"_dd.top_level": 1,
5658
"_sampling_priority_v1": 1
5759
},
5860
"start":XXXX,
@@ -121,6 +123,7 @@ START
121123
"resource": "sns-lambda",
122124
"error": 0,
123125
"meta": {
126+
"_dd.p.dm": "-0",
124127
"service": "sns",
125128
"runtime-id":"XXXX",
126129
"operation_name": "aws.sns",
@@ -138,6 +141,7 @@ START
138141
},
139142
"metrics": {
140143
"_dd.agent_psr": 1,
144+
"_dd.top_level": 1,
141145
"_sampling_priority_v1": 1
142146
},
143147
"start":XXXX,
@@ -205,6 +209,7 @@ START
205209
"resource": "my-queue",
206210
"error": 0,
207211
"meta": {
212+
"_dd.p.dm": "-0",
208213
"service": "sqs",
209214
"runtime-id":"XXXX",
210215
"operation_name": "aws.sqs",
@@ -219,6 +224,7 @@ START
219224
},
220225
"metrics": {
221226
"_dd.agent_psr": 1,
227+
"_dd.top_level": 1,
222228
"retry_count": 1,
223229
"_sampling_priority_v1": 1
224230
},

‎integration_tests/snapshots/logs/status-code-500s_node14.log

+6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ START
4040
"resource": "GET /{proxy+}",
4141
"error": 0,
4242
"meta": {
43+
"_dd.p.dm": "-0",
4344
"runtime-id":"XXXX",
4445
"operation_name": "aws.apigateway",
4546
"resource_names": "GET /{proxy+}",
@@ -53,6 +54,7 @@ START
5354
},
5455
"metrics": {
5556
"_dd.agent_psr": 1,
57+
"_dd.top_level": 1,
5658
"_sampling_priority_v1": 1
5759
},
5860
"start":XXXX,
@@ -121,6 +123,7 @@ START
121123
"resource": "sns-lambda",
122124
"error": 0,
123125
"meta": {
126+
"_dd.p.dm": "-0",
124127
"service": "sns",
125128
"runtime-id":"XXXX",
126129
"operation_name": "aws.sns",
@@ -138,6 +141,7 @@ START
138141
},
139142
"metrics": {
140143
"_dd.agent_psr": 1,
144+
"_dd.top_level": 1,
141145
"_sampling_priority_v1": 1
142146
},
143147
"start":XXXX,
@@ -205,6 +209,7 @@ START
205209
"resource": "my-queue",
206210
"error": 0,
207211
"meta": {
212+
"_dd.p.dm": "-0",
208213
"service": "sqs",
209214
"runtime-id":"XXXX",
210215
"operation_name": "aws.sqs",
@@ -219,6 +224,7 @@ START
219224
},
220225
"metrics": {
221226
"_dd.agent_psr": 1,
227+
"_dd.top_level": 1,
222228
"retry_count": 1,
223229
"_sampling_priority_v1": 1
224230
},

‎integration_tests/snapshots/logs/status-code-500s_node16.log

+6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ START
4040
"resource": "GET /{proxy+}",
4141
"error": 0,
4242
"meta": {
43+
"_dd.p.dm": "-0",
4344
"version": "1.0.0",
4445
"runtime-id":"XXXX",
4546
"operation_name": "aws.apigateway",
@@ -54,6 +55,7 @@ START
5455
},
5556
"metrics": {
5657
"_dd.agent_psr": 1,
58+
"_dd.top_level": 1,
5759
"_sampling_priority_v1": 1
5860
},
5961
"start":XXXX,
@@ -123,6 +125,7 @@ START
123125
"resource": "sns-lambda",
124126
"error": 0,
125127
"meta": {
128+
"_dd.p.dm": "-0",
126129
"service": "sns",
127130
"version": "1.0.0",
128131
"runtime-id":"XXXX",
@@ -141,6 +144,7 @@ START
141144
},
142145
"metrics": {
143146
"_dd.agent_psr": 1,
147+
"_dd.top_level": 1,
144148
"_sampling_priority_v1": 1
145149
},
146150
"start":XXXX,
@@ -209,6 +213,7 @@ START
209213
"resource": "my-queue",
210214
"error": 0,
211215
"meta": {
216+
"_dd.p.dm": "-0",
212217
"service": "sqs",
213218
"version": "1.0.0",
214219
"runtime-id":"XXXX",
@@ -224,6 +229,7 @@ START
224229
},
225230
"metrics": {
226231
"_dd.agent_psr": 1,
232+
"_dd.top_level": 1,
227233
"retry_count": 1,
228234
"_sampling_priority_v1": 1
229235
},

‎integration_tests/snapshots/logs/throw-error-traced_node12.log

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ START
6565
XXXX-XX-XX XX:XX:XX.XXX ERROR [dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error {"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello"," at handle (/var/task/throw-error-traced.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/utils/handler.js:XXX:XXX"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at step (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at Object.next (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at new Promise (<anonymous>)"," at __awaiter (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"]}
6666
END Duration: XXXX ms Memory Used: XXXX MB
6767
START
68+
XXXX-XX-XX XX:XX:XX.XXX ERROR [dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error {"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello"," at handle (/var/task/throw-error-traced.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/utils/handler.js:XXX:XXX"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at step (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at Object.next (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at new Promise (<anonymous>)"," at __awaiter (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"]}
6869
{
6970
"e": XXXX,
7071
"m": "aws.lambda.enhanced.invocations",
@@ -95,5 +96,4 @@ START
9596
],
9697
"v": 1
9798
}
98-
XXXX-XX-XX XX:XX:XX.XXX ERROR [dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error {"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello"," at handle (/var/task/throw-error-traced.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/utils/handler.js:XXX:XXX"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at step (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at Object.next (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at new Promise (<anonymous>)"," at __awaiter (/opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX)"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"," at /opt/nodejs/node_modules/datadog-lambda-js/index.js:XXX:XXX"]}
9999
END Duration: XXXX ms Memory Used: XXXX MB

‎scripts/publish_prod.sh

+4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ if [ "$CONT" != "y" ]; then
7676
fi
7777

7878
echo 'Publishing to NPM'
79+
if [ -d "./dist" ]; then
80+
rm -rf ./dist
81+
fi
7982
yarn build
83+
cp ./dist/handler.cjs ./dist/handler.js
8084
yarn publish --new-version "$NEW_VERSION"
8185

8286
echo

0 commit comments

Comments
 (0)