Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f117ea6

Browse filesBrowse files
mhartmhart
committed
Add XRay env vars to all builds
1 parent b8e66eb commit f117ea6
Copy full SHA for f117ea6

File tree

Expand file treeCollapse file tree

14 files changed

+122
-81
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

14 files changed

+122
-81
lines changed
Open diff view settings
Collapse file

‎base/Dockerfile‎

Copy file name to clipboardExpand all lines: base/Dockerfile
+13-1Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@ FROM lambci/lambda-base
22

33
ENV PATH=/usr/local/lib64/node-v4.3.x/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
44
LD_LIBRARY_PATH=/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
5-
LANG=en_US.UTF-8
5+
LANG=en_US.UTF-8 \
6+
LAMBDA_TASK_ROOT=/var/task \
7+
LAMBDA_RUNTIME_DIR=/var/runtime \
8+
_LAMBDA_CONTROL_SOCKET=14 \
9+
_LAMBDA_SHARED_MEM_FD=11 \
10+
_LAMBDA_LOG_FD=9 \
11+
_LAMBDA_CONSOLE_SOCKET=16 \
12+
_LAMBDA_RUNTIME_LOAD_TIME=1530232235231 \
13+
_AWS_XRAY_DAEMON_ADDRESS=169.254.79.2 \
14+
_AWS_XRAY_DAEMON_PORT=2000 \
15+
AWS_XRAY_DAEMON_ADDRESS=169.254.79.2:2000 \
16+
AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
17+
_X_AMZN_TRACE_ID=Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0
618

719
WORKDIR /var/task
820

Collapse file

‎base/dump-nodejs.js‎

Copy file name to clipboardExpand all lines: base/dump-nodejs.js
+8-6Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@ exports.handler = function(event, context) {
3636
console.log(process.cwd())
3737
console.log(__filename)
3838
console.log(process.env)
39-
childProcess.exec('ls -la /dev', {encoding: 'utf8'}, function(err, stdout, stderr) {
40-
if (stdout) console.log(stdout)
41-
if (stderr) console.error(stderr)
42-
context.done(err, data)
43-
})
39+
console.log(context)
4440

41+
context.done()
4542
})
4643
})
4744
}
@@ -64,6 +61,11 @@ exports.handler = function(event, context) {
6461
// AWS_LAMBDA_FUNCTION_NAME: 'dump-node010',
6562
// AWS_LAMBDA_FUNCTION_MEMORY_SIZE: '1536',
6663
// AWS_LAMBDA_FUNCTION_VERSION: '$LATEST',
64+
// _AWS_XRAY_DAEMON_ADDRESS: '169.254.79.2',
65+
// _AWS_XRAY_DAEMON_PORT: '2000',
66+
// AWS_XRAY_DAEMON_ADDRESS: '169.254.79.2:2000',
67+
// AWS_XRAY_CONTEXT_MISSING: 'LOG_ERROR',
68+
// _X_AMZN_TRACE_ID: 'Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0',
6769
// AWS_EXECUTION_ENV: 'AWS_Lambda_nodejs',
6870
// NODE_PATH: '/var/runtime:/var/task:/var/runtime/node_modules',
6971
// AWS_ACCESS_KEY_ID: 'ASIA...C37A',
@@ -78,7 +80,7 @@ exports.handler = function(event, context) {
7880
// functionName: 'dump-node010',
7981
// memoryLimitInMB: '1536',
8082
// functionVersion: '$LATEST',
81-
// invokedFunctionArn: 'arn:aws:lambda:us-east-1:553035198032:function:dump-node010',
83+
// invokedFunctionArn: 'arn:aws:lambda:us-east-1:879423879432:function:dump-node010',
8284
// getRemainingTimeInMillis: [Function],
8385
// succeed: [Function],
8486
// fail: [Function],
Collapse file

‎base/dump-nodejs43.js‎

Copy file name to clipboardExpand all lines: base/dump-nodejs43.js
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var s3 = new AWS.S3()
66
exports.handler = function(event, context, cb) {
77
var filename = 'nodejs4.3.tgz'
88
var cmd = 'tar -cpzf /tmp/' + filename + ' -C / ' +
9-
'--exclude=/proc --exclude=/sys --exclude=/tmp --exclude=/var/task/* ' +
9+
'--exclude=/proc --exclude=/sys --exclude=/dev --exclude=/tmp --exclude=/var/task/* ' +
1010
'--numeric-owner --ignore-failed-read /'
1111

1212
var child = childProcess.spawn('sh', ['-c', event.cmd || cmd])
@@ -37,7 +37,7 @@ exports.handler = function(event, context, cb) {
3737
console.log(process.cwd())
3838
console.log(__filename)
3939
console.log(process.env)
40-
console.log(childProcess.execSync('ls -la /dev', {encoding: 'utf8'}))
40+
console.log(context)
4141

4242
cb(null, data)
4343
})
@@ -62,6 +62,11 @@ exports.handler = function(event, context, cb) {
6262
// AWS_LAMBDA_FUNCTION_NAME: 'dump-node43',
6363
// AWS_LAMBDA_FUNCTION_MEMORY_SIZE: '1536',
6464
// AWS_LAMBDA_FUNCTION_VERSION: '$LATEST',
65+
// _AWS_XRAY_DAEMON_ADDRESS: '169.254.79.2',
66+
// _AWS_XRAY_DAEMON_PORT: '2000',
67+
// AWS_XRAY_DAEMON_ADDRESS: '169.254.79.2:2000',
68+
// AWS_XRAY_CONTEXT_MISSING: 'LOG_ERROR',
69+
// _X_AMZN_TRACE_ID: 'Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0',
6570
// AWS_EXECUTION_ENV: 'AWS_Lambda_nodejs4.3',
6671
// NODE_PATH: '/var/runtime:/var/task:/var/runtime/node_modules',
6772
// AWS_ACCESS_KEY_ID: 'ASIA...C37A',
Collapse file

‎base/dump-nodejs610.js‎

Copy file name to clipboardExpand all lines: base/dump-nodejs610.js
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ exports.handler = function(event, context, cb) {
3636
console.log(process.cwd())
3737
console.log(__filename)
3838
console.log(process.env)
39-
console.log(childProcess.execSync('ls -la /dev', {encoding: 'utf8'}))
39+
console.log(context)
4040

4141
cb(null, data)
4242
})
@@ -61,6 +61,11 @@ exports.handler = function(event, context, cb) {
6161
// AWS_LAMBDA_FUNCTION_NAME: 'dump-node610',
6262
// AWS_LAMBDA_FUNCTION_MEMORY_SIZE: '1536',
6363
// AWS_LAMBDA_FUNCTION_VERSION: '$LATEST',
64+
// _AWS_XRAY_DAEMON_ADDRESS: '169.254.79.2',
65+
// _AWS_XRAY_DAEMON_PORT: '2000',
66+
// AWS_XRAY_DAEMON_ADDRESS: '169.254.79.2:2000',
67+
// AWS_XRAY_CONTEXT_MISSING: 'LOG_ERROR',
68+
// _X_AMZN_TRACE_ID: 'Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0',
6469
// AWS_EXECUTION_ENV: 'AWS_Lambda_nodejs6.10',
6570
// NODE_PATH: '/var/runtime:/var/task:/var/runtime/node_modules',
6671
// AWS_ACCESS_KEY_ID: 'ASIA...C37A',
Collapse file

‎base/dump-python27.py‎

Copy file name to clipboardExpand all lines: base/dump-python27.py
+41-36Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,47 @@ def lambda_handler(event, context):
3030
print(os.getcwd())
3131
print(__file__)
3232
print(os.environ)
33+
print(context.__dict__)
3334

3435
return data
3536

36-
# /usr/bin/python2.7
37-
# ['/var/runtime/awslambda/bootstrap.py']
38-
# /var/task
39-
# /var/task/lambda_function.py
40-
# {
41-
# 'AWS_LAMBDA_FUNCTION_VERSION': '$LATEST',
42-
# 'LAMBDA_TASK_ROOT': '/var/task',
43-
# 'PATH': '/usr/local/bin:/usr/bin/:/bin',
44-
# 'LD_LIBRARY_PATH': '/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib',
45-
# 'LANG': 'en_US.UTF-8',
46-
# 'AWS_LAMBDA_FUNCTION_NAME': 'dump-python27',
47-
# 'AWS_REGION': 'us-east-1',
48-
# 'AWS_SESSION_TOKEN': 'FQoDYXdzEMb//////////...0oog7bzuQU=',
49-
# 'AWS_SECURITY_TOKEN': 'FQoDYXdzEMb//////////...0oog7bzuQU=',
50-
# 'LAMBDA_RUNTIME_DIR': '/var/runtime',
51-
# 'AWS_LAMBDA_FUNCTION_MEMORY_SIZE': '1536',
52-
# 'PYTHONPATH': '/var/runtime',
53-
# 'AWS_LAMBDA_LOG_GROUP_NAME': '/aws/lambda/dump-python27',
54-
# 'AWS_LAMBDA_LOG_STREAM_NAME': '2017/03/23/[$LATEST]c079a84d433534434534ef0ddc99d00f',
55-
# 'AWS_ACCESS_KEY_ID': 'ASIA...C37A',
56-
# 'AWS_DEFAULT_REGION': 'us-east-1',
57-
# 'AWS_SECRET_ACCESS_KEY': 'JZvD...BDZ4L',
58-
# 'AWS_EXECUTION_ENV': 'AWS_Lambda_python2.7'
59-
# }
60-
# {
61-
# 'aws_request_id': '1fcdc383-a9e8-4228-bc1c-8db17629e183',
62-
# 'log_stream_name': '2017/03/23/[$LATEST]c079a84d433534434534ef0ddc99d00f',
63-
# 'invoked_function_arn': 'arn:aws:lambda:us-east-1:879423879432:function:dump-python27',
64-
# 'xray_context': None,
65-
# 'client_context': None,
66-
# 'log_group_name': '/aws/lambda/dump-python27',
67-
# 'function_name': 'dump-python27',
68-
# 'function_version': '$LATEST',
69-
# 'identity': <__main__.CognitoIdentity object at 0x7fe86de3fd10>,
70-
# 'memory_limit_in_mb': '1536'
71-
# }
37+
# /usr/bin/python2.7
38+
# ['/var/runtime/awslambda/bootstrap.py']
39+
# /var/task
40+
# /var/task/lambda_function.py
41+
# {
42+
# 'AWS_LAMBDA_FUNCTION_VERSION': '$LATEST',
43+
# 'LAMBDA_TASK_ROOT': '/var/task',
44+
# 'PATH': '/usr/local/bin:/usr/bin/:/bin',
45+
# 'LD_LIBRARY_PATH': '/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib',
46+
# 'LANG': 'en_US.UTF-8',
47+
# 'AWS_LAMBDA_FUNCTION_NAME': 'dump-python27',
48+
# 'AWS_REGION': 'us-east-1',
49+
# 'AWS_XRAY_CONTEXT_MISSING': 'LOG_ERROR',
50+
# 'AWS_SESSION_TOKEN': 'FQoDYXdzEMb//////////...0oog7bzuQU=',
51+
# 'AWS_SECURITY_TOKEN': 'FQoDYXdzEMb//////////...0oog7bzuQU=',
52+
# 'LAMBDA_RUNTIME_DIR': '/var/runtime',
53+
# 'PYTHONPATH': '/var/runtime',
54+
# 'AWS_LAMBDA_FUNCTION_MEMORY_SIZE': '1536',
55+
# '_AWS_XRAY_DAEMON_PORT': '2000',
56+
# '_AWS_XRAY_DAEMON_ADDRESS': '169.254.79.2',
57+
# 'AWS_LAMBDA_LOG_GROUP_NAME': '/aws/lambda/dump-python27',
58+
# 'AWS_LAMBDA_LOG_STREAM_NAME': '2017/03/23/[$LATEST]c079a84d433534434534ef0ddc99d00f',
59+
# 'AWS_ACCESS_KEY_ID': 'ASIA...C37A',
60+
# '_X_AMZN_TRACE_ID': 'Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0',
61+
# 'AWS_DEFAULT_REGION': 'us-east-1',
62+
# 'AWS_SECRET_ACCESS_KEY': 'JZvD...BDZ4L',
63+
# 'AWS_EXECUTION_ENV': 'AWS_Lambda_python2.7',
64+
# 'AWS_XRAY_DAEMON_ADDRESS': '169.254.79.2:2000'
65+
# }
66+
# {
67+
# 'aws_request_id': '1fcdc383-a9e8-4228-bc1c-8db17629e183',
68+
# 'log_stream_name': '2017/03/23/[$LATEST]c079a84d433534434534ef0ddc99d00f',
69+
# 'invoked_function_arn': 'arn:aws:lambda:us-east-1:879423879432:function:dump-python27',
70+
# 'client_context': None,
71+
# 'log_group_name': '/aws/lambda/dump-python27',
72+
# 'function_name': 'dump-python27',
73+
# 'function_version': '$LATEST',
74+
# 'identity': <__main__.CognitoIdentity object at 0x7f5985a27fd0>,
75+
# 'memory_limit_in_mb': '1536'
76+
# }
Collapse file

‎nodejs/build/Dockerfile‎

Copy file name to clipboardExpand all lines: nodejs/build/Dockerfile
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ FROM lambci/lambda-base:build
22

33
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
44
LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
5-
LANG=en_US.UTF-8 \
65
AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
76
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \
87
npm_config_unsafe-perm=true
Collapse file

‎nodejs/run/Dockerfile‎

Copy file name to clipboardExpand all lines: nodejs/run/Dockerfile
+13-3Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,20 @@ FROM lambci/lambda-base
33
ENV PATH=/usr/local/bin:/usr/bin/:/bin \
44
LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
55
LANG=en_US.UTF-8 \
6-
AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
7-
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \
86
LAMBDA_TASK_ROOT=/var/task \
9-
LAMBDA_RUNTIME_DIR=/var/runtime
7+
LAMBDA_RUNTIME_DIR=/var/runtime \
8+
_LAMBDA_CONTROL_SOCKET=14 \
9+
_LAMBDA_SHARED_MEM_FD=11 \
10+
_LAMBDA_LOG_FD=9 \
11+
_LAMBDA_CONSOLE_SOCKET=16 \
12+
_LAMBDA_RUNTIME_LOAD_TIME=1530232235231 \
13+
_AWS_XRAY_DAEMON_ADDRESS=169.254.79.2 \
14+
_AWS_XRAY_DAEMON_PORT=2000 \
15+
AWS_XRAY_DAEMON_ADDRESS=169.254.79.2:2000 \
16+
AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
17+
_X_AMZN_TRACE_ID=Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0 \
18+
AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
19+
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules
1020

1121
RUN rm -rf /var/runtime /var/lang && mkdir /tmp && chown sbx_user1051:495 /tmp && chmod 700 /tmp && \
1222
curl https://lambci.s3.amazonaws.com/fs/nodejs.tgz | tar -zx -C /
Collapse file

‎nodejs4.3/build/Dockerfile‎

Copy file name to clipboardExpand all lines: nodejs4.3/build/Dockerfile
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ FROM lambci/lambda-base:build
22

33
ENV PATH=/usr/local/lib64/node-v4.3.x/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
44
LD_LIBRARY_PATH=/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
5-
LANG=en_US.UTF-8 \
65
AWS_EXECUTION_ENV=AWS_Lambda_nodejs4.3 \
76
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \
87
npm_config_unsafe-perm=true
Collapse file

‎nodejs4.3/run/Dockerfile‎

Copy file name to clipboardExpand all lines: nodejs4.3/run/Dockerfile
+13-3Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,20 @@ FROM lambci/lambda-base
33
ENV PATH=/usr/local/lib64/node-v4.3.x/bin:/usr/local/bin:/usr/bin/:/bin \
44
LD_LIBRARY_PATH=/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
55
LANG=en_US.UTF-8 \
6-
AWS_EXECUTION_ENV=AWS_Lambda_nodejs4.3 \
7-
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \
86
LAMBDA_TASK_ROOT=/var/task \
9-
LAMBDA_RUNTIME_DIR=/var/runtime
7+
LAMBDA_RUNTIME_DIR=/var/runtime \
8+
_LAMBDA_CONTROL_SOCKET=14 \
9+
_LAMBDA_SHARED_MEM_FD=11 \
10+
_LAMBDA_LOG_FD=9 \
11+
_LAMBDA_CONSOLE_SOCKET=16 \
12+
_LAMBDA_RUNTIME_LOAD_TIME=1530232235231 \
13+
_AWS_XRAY_DAEMON_ADDRESS=169.254.79.2 \
14+
_AWS_XRAY_DAEMON_PORT=2000 \
15+
AWS_XRAY_DAEMON_ADDRESS=169.254.79.2:2000 \
16+
AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
17+
_X_AMZN_TRACE_ID=Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0 \
18+
AWS_EXECUTION_ENV=AWS_Lambda_nodejs4.3 \
19+
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules
1020

1121
RUN mkdir /tmp && chown sbx_user1051:495 /tmp && chmod 700 /tmp
1222

Collapse file

‎nodejs4.3/run/index.js‎

Copy file name to clipboardExpand all lines: nodejs4.3/run/index.js
-19Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.