From 537fc4c8ee8f95386ff4ffbb5d769f41a94168e7 Mon Sep 17 00:00:00 2001 From: liustve Date: Tue, 7 Jan 2025 22:54:04 +0000 Subject: [PATCH 1/5] enabled http instrumentation and otel propagation --- .../packages/layer/scripts/otel-instrument | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lambda-layer/packages/layer/scripts/otel-instrument b/lambda-layer/packages/layer/scripts/otel-instrument index cdd55dd..83e21dd 100644 --- a/lambda-layer/packages/layer/scripts/otel-instrument +++ b/lambda-layer/packages/layer/scripts/otel-instrument @@ -44,19 +44,19 @@ if [ -z "${OTEL_EXPORTER_OTLP_PROTOCOL}" ]; then fi # If both OTEL_NODE_ENABLED_INSTRUMENTATIONS and OTEL_NODE_DISABLED_INSTRUMENTATIONS are not configured, -# set OTEL_NODE_ENABLED_INSTRUMENTATIONS="aws-sdk,aws-lambda" +# set OTEL_NODE_ENABLED_INSTRUMENTATIONS="aws-sdk,aws-lambda,http" if [ -z "${OTEL_NODE_ENABLED_INSTRUMENTATIONS}" ] && [ -z "${OTEL_NODE_DISABLED_INSTRUMENTATIONS}" ]; then - export OTEL_NODE_ENABLED_INSTRUMENTATIONS="aws-sdk,aws-lambda" + export OTEL_NODE_ENABLED_INSTRUMENTATIONS="aws-sdk,aws-lambda,http" # Else if OTEL_NODE_ENABLED_INSTRUMENTATIONS is configured and OTEL_NODE_DISABLED_INSTRUMENTATIONS is not, -# append OTEL_NODE_ENABLED_INSTRUMENTATIONS with "aws-lambda" +# append OTEL_NODE_ENABLED_INSTRUMENTATIONS with "aws-lambda,http" elif [ -n "${OTEL_NODE_ENABLED_INSTRUMENTATIONS}" ] && [ -z "${OTEL_NODE_DISABLED_INSTRUMENTATIONS}" ]; then - export OTEL_NODE_ENABLED_INSTRUMENTATIONS="${OTEL_NODE_ENABLED_INSTRUMENTATIONS},aws-lambda" + export OTEL_NODE_ENABLED_INSTRUMENTATIONS="${OTEL_NODE_ENABLED_INSTRUMENTATIONS},aws-lambda,http" # Else if both OTEL_NODE_ENABLED_INSTRUMENTATIONS and OTEL_NODE_DISABLED_INSTRUMENTATIONS are configured, -# append OTEL_NODE_ENABLED_INSTRUMENTATIONS with "aws-lambda" +# append OTEL_NODE_ENABLED_INSTRUMENTATIONS with "aws-lambda,http" elif [ -n "${OTEL_NODE_ENABLED_INSTRUMENTATIONS}" ] && [ -n "${OTEL_NODE_DISABLED_INSTRUMENTATIONS}" ]; then - export OTEL_NODE_ENABLED_INSTRUMENTATIONS="${OTEL_NODE_ENABLED_INSTRUMENTATIONS},aws-lambda" + export OTEL_NODE_ENABLED_INSTRUMENTATIONS="${OTEL_NODE_ENABLED_INSTRUMENTATIONS},aws-lambda,http" # Else do nothing fi @@ -68,7 +68,7 @@ fi # - Set the propagators if [[ -z "$OTEL_PROPAGATORS" ]]; then - export OTEL_PROPAGATORS="tracecontext,baggage,xray" + export OTEL_PROPAGATORS="tracecontext,baggage,xray,b3,b3multi" fi # - Set Application Signals configuration From 038cff3e12130a0dace4facad0a9bc61f194c1ef Mon Sep 17 00:00:00 2001 From: liustve Date: Tue, 7 Jan 2025 23:09:28 +0000 Subject: [PATCH 2/5] updated order --- lambda-layer/packages/layer/scripts/otel-instrument | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda-layer/packages/layer/scripts/otel-instrument b/lambda-layer/packages/layer/scripts/otel-instrument index 83e21dd..609e887 100644 --- a/lambda-layer/packages/layer/scripts/otel-instrument +++ b/lambda-layer/packages/layer/scripts/otel-instrument @@ -68,7 +68,7 @@ fi # - Set the propagators if [[ -z "$OTEL_PROPAGATORS" ]]; then - export OTEL_PROPAGATORS="tracecontext,baggage,xray,b3,b3multi" + export OTEL_PROPAGATORS="xray,tracecontext,b3,b3multi" fi # - Set Application Signals configuration From 4bb552c45c08d411ea031add5bf2faeae06b8ce2 Mon Sep 17 00:00:00 2001 From: liustve Date: Tue, 7 Jan 2025 23:10:07 +0000 Subject: [PATCH 3/5] updated order --- lambda-layer/packages/layer/scripts/otel-instrument | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda-layer/packages/layer/scripts/otel-instrument b/lambda-layer/packages/layer/scripts/otel-instrument index 609e887..db092d2 100644 --- a/lambda-layer/packages/layer/scripts/otel-instrument +++ b/lambda-layer/packages/layer/scripts/otel-instrument @@ -68,7 +68,7 @@ fi # - Set the propagators if [[ -z "$OTEL_PROPAGATORS" ]]; then - export OTEL_PROPAGATORS="xray,tracecontext,b3,b3multi" + export OTEL_PROPAGATORS="xray,baggage,tracecontext,b3,b3multi" fi # - Set Application Signals configuration From 0c8c4cc6be76fc76c6e690f14325e82063470187 Mon Sep 17 00:00:00 2001 From: liustve Date: Tue, 7 Jan 2025 23:11:26 +0000 Subject: [PATCH 4/5] updated order --- lambda-layer/packages/layer/scripts/otel-instrument | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda-layer/packages/layer/scripts/otel-instrument b/lambda-layer/packages/layer/scripts/otel-instrument index db092d2..609e887 100644 --- a/lambda-layer/packages/layer/scripts/otel-instrument +++ b/lambda-layer/packages/layer/scripts/otel-instrument @@ -68,7 +68,7 @@ fi # - Set the propagators if [[ -z "$OTEL_PROPAGATORS" ]]; then - export OTEL_PROPAGATORS="xray,baggage,tracecontext,b3,b3multi" + export OTEL_PROPAGATORS="xray,tracecontext,b3,b3multi" fi # - Set Application Signals configuration From bd623c89bf7567ee092fa66cd1b90bbd3da80cd1 Mon Sep 17 00:00:00 2001 From: liustve Date: Tue, 7 Jan 2025 23:14:43 +0000 Subject: [PATCH 5/5] added propagator --- lambda-layer/packages/layer/scripts/otel-instrument | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda-layer/packages/layer/scripts/otel-instrument b/lambda-layer/packages/layer/scripts/otel-instrument index 609e887..4bd4104 100644 --- a/lambda-layer/packages/layer/scripts/otel-instrument +++ b/lambda-layer/packages/layer/scripts/otel-instrument @@ -68,7 +68,7 @@ fi # - Set the propagators if [[ -z "$OTEL_PROPAGATORS" ]]; then - export OTEL_PROPAGATORS="xray,tracecontext,b3,b3multi" + export OTEL_PROPAGATORS="xray,tracecontext,baggage,b3,b3multi" fi # - Set Application Signals configuration