Skip to content

Commit aa84018

Browse files
authored
Renaming to otel-instrument and default configs (#956)
1 parent 015c6db commit aa84018

File tree

3 files changed

+39
-25
lines changed

3 files changed

+39
-25
lines changed

lambda-layer/build-layer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ popd
4545

4646
## Copy ADOT Java Agent downloaded using Gradle task and bundle it with the Lambda handler script
4747
cp "$SOURCEDIR"/build/javaagent/aws-opentelemetry-agent*.jar ./opentelemetry-javaagent.jar
48-
zip -qr opentelemetry-javaagent-layer.zip opentelemetry-javaagent.jar otel-handler
48+
zip -qr opentelemetry-javaagent-layer.zip opentelemetry-javaagent.jar otel-instrument

lambda-layer/otel-handler

Lines changed: 0 additions & 24 deletions
This file was deleted.

lambda-layer/otel-instrument

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
3+
export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
4+
5+
export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
6+
7+
export OTEL_SERVICE_NAME=${OTEL_SERVICE_NAME:-${AWS_LAMBDA_FUNCTION_NAME}}
8+
9+
export JAVA_TOOL_OPTIONS="-javaagent:/opt/opentelemetry-javaagent.jar ${JAVA_TOOL_OPTIONS}"
10+
11+
if [[ $OTEL_RESOURCE_ATTRIBUTES != *"service.name="* ]]; then
12+
export OTEL_RESOURCE_ATTRIBUTES="service.name=${AWS_LAMBDA_FUNCTION_NAME},${OTEL_RESOURCE_ATTRIBUTES}"
13+
fi
14+
15+
export OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT=10000
16+
17+
# Disable the Application Signals runtime metrics since we are on Lambda
18+
export OTEL_AWS_APPLICATION_SIGNALS_RUNTIME_ENABLED=false
19+
20+
# Use OTLP traces exporter if not specified
21+
export OTEL_TRACES_EXPORTER=${OTEL_TRACES_EXPORTER:-"otlp"}
22+
23+
# Disable metrics and logs export by default if not specified
24+
export OTEL_METRICS_EXPORTER=${OTEL_METRICS_EXPORTER:-"none"}
25+
export OTEL_LOGS_EXPORTER=${OTEL_LOGS_EXPORTER:-"none"}
26+
27+
# Enable Application Signals by default if not specified
28+
export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=${OTEL_AWS_APPLICATION_SIGNALS_ENABLED:-"true"}
29+
30+
# Append Lambda Resource Attributes to OTel Resource Attribute List
31+
LAMBDA_RESOURCE_ATTRIBUTES="cloud.region=$AWS_REGION,cloud.provider=aws,faas.name=$AWS_LAMBDA_FUNCTION_NAME,faas.version=$AWS_LAMBDA_FUNCTION_VERSION,faas.instance=$AWS_LAMBDA_LOG_STREAM_NAME,aws.log.group.names=$AWS_LAMBDA_LOG_GROUP_NAME";
32+
if [ -z "${OTEL_RESOURCE_ATTRIBUTES}" ]; then
33+
export OTEL_RESOURCE_ATTRIBUTES=$LAMBDA_RESOURCE_ATTRIBUTES;
34+
else
35+
export OTEL_RESOURCE_ATTRIBUTES="$LAMBDA_RESOURCE_ATTRIBUTES,$OTEL_RESOURCE_ATTRIBUTES";
36+
fi
37+
38+
exec "$@"

0 commit comments

Comments
 (0)