Skip to content

Update lambda detector to use bytes instead of MB #7745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pellared merged 11 commits into from
Aug 28, 2025
Merged

Update lambda detector to use bytes instead of MB #7745

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6bd2bb
updated lambda detector to use bytes instead of MB
akats7 Aug 14, 2025
dd3bd71
updated lambda detector to use bytes instead of MB
akats7 Aug 14, 2025
8c28055
updated lambda instrumentation tests
akats7 Aug 14, 2025
466cef8
add chlog
akats7 Aug 14, 2025
ab83bd0
remove unnecessary const
akats7 Aug 14, 2025
145c85c
unexported miB
akats7 Aug 20, 2025
034a965
lint update
akats7 Aug 20, 2025
41eab11
Merge branch 'main' into lambdadetector-memory-bytes
akats7 Aug 26, 2025
6d99703
fixed test using lambda detector
akats7 Aug 26, 2025
9a1890a
chlog update
akats7 Aug 28, 2025
8374e55
Merge branch 'main' into lambdadetector-memory-bytes
pellared Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Changed

- Change the default span name to be `GET /path` so it complies with the HTTP semantic conventions in `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux`. (#7551)
- Change the faas.max_memory unit to be bytes instead of MB to comply with the semantic conventions in `"go.opentelemetry.io/contrib/detectors/aws/lambda`. (#7745)
Comment thread
dmathieu marked this conversation as resolved.
Outdated

### Deprecated

Expand Down
3 changes: 2 additions & 1 deletion detectors/aws/lambda/detector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const (
lambdaFunctionVersionEnvVar = "AWS_LAMBDA_FUNCTION_VERSION"
lambdaLogStreamNameEnvVar = "AWS_LAMBDA_LOG_STREAM_NAME"
lambdaMemoryLimitEnvVar = "AWS_LAMBDA_FUNCTION_MEMORY_SIZE"
miB = 1 << 20
)

var (
Expand Down Expand Up @@ -65,7 +66,7 @@ func (*resourceDetector) Detect(context.Context) (*resource.Resource, error) {
maxMemoryStr := os.Getenv(lambdaMemoryLimitEnvVar)
maxMemory, err := strconv.Atoi(maxMemoryStr)
if err == nil {
attrs = append(attrs, semconv.FaaSMaxMemory(maxMemory))
attrs = append(attrs, semconv.FaaSMaxMemory(maxMemory*miB))
}

return resource.NewWithAttributes(semconv.SchemaURL, attrs...), nil
Expand Down
2 changes: 1 addition & 1 deletion detectors/aws/lambda/detector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestDetectSuccess(t *testing.T) {
semconv.FaaSName("testFunction"),
semconv.FaaSVersion("$LATEST"),
semconv.FaaSInstance("2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
semconv.FaaSMaxMemory(128),
semconv.FaaSMaxMemory(128 * miB),
}
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, attributes...)
detector := resourceDetector{}
Expand Down
6 changes: 4 additions & 2 deletions instrumentation/github.com/aws/aws-lambda-go/otellambda/lambdatest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ import (
"go.opentelemetry.io/contrib/propagators/aws/xray"
)

const miB = 1 << 20

var errorLogger = log.New(log.Writer(), "OTel Lambda Test Error: ", 0)

type mockIDGenerator struct {
Expand Down Expand Up @@ -142,7 +144,7 @@ var (
attribute.String("faas.name", "testFunction"),
attribute.String("faas.version", "$LATEST"),
attribute.String("faas.instance", "2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
attribute.Int("faas.max_memory", 128)),
attribute.Int("faas.max_memory", 128*miB)),
InstrumentationScope: instrumentation.Scope{
Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda",
Version: otellambda.Version(),
Expand Down Expand Up @@ -337,7 +339,7 @@ var (
attribute.String("faas.name", "testFunction"),
attribute.String("faas.version", "$LATEST"),
attribute.String("faas.instance", "2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
attribute.Int("faas.max_memory", 128)),
attribute.Int("faas.max_memory", 128*miB)),
InstrumentationScope: instrumentation.Scope{
Name: "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda",
Version: otellambda.Version(),
Expand Down