From eddd65ae3df07243ad466e2a6bf81bc5897c91c0 Mon Sep 17 00:00:00 2001 From: Dan Zatloukal <43817853+zatlodan@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:21:14 +0200 Subject: [PATCH 1/4] chore: compatibility with AWS lambda new runtime --- cmd/tempo-serverless/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/tempo-serverless/Makefile b/cmd/tempo-serverless/Makefile index 86b419e09c0..78ddcd78c54 100644 --- a/cmd/tempo-serverless/Makefile +++ b/cmd/tempo-serverless/Makefile @@ -33,13 +33,14 @@ build-docker-lambda-test: $(IN_LAMBDA) CGO_ENABLED=0 go build -o ./lambda $(IN_LAMBDA) docker build -f ./Dockerfile -t tempo-serverless-lambda . -# lambda zips expect a compiled executable in root. the filename "main" is important -# as that should the handler config option in aws +# Lambda zips expect a compiled executable in the root. The filename "bootstrap" is important here. +# The new AWS Lambda runtime expects an executable with the name "bootstrap" to be provided, the "handler" configuration is ignored when using the new runtime. +# See https://aws.amazon.com/blogs/compute/migrating-aws-lambda-functions-from-the-go1-x-runtime-to-the-custom-runtime-on-amazon-linux-2/ for more info. .PHONY: build-lambda-zip build-lambda-zip: - $(IN_LAMBDA) CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o main - $(IN_LAMBDA) zip tempo-serverless-$(VERSION).zip main - $(IN_LAMBDA) rm main + $(IN_LAMBDA) CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bootstrap + $(IN_LAMBDA) zip tempo-serverless-$(VERSION).zip bootstrap + $(IN_LAMBDA) rm bootstrap .PHONY: test test: From 1f499b1a38c1d40b91116b34063f6998f4c51841 Mon Sep 17 00:00:00 2001 From: Dan Zatloukal <43817853+zatlodan@users.noreply.github.com> Date: Tue, 16 Jul 2024 00:05:45 +0200 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ae84741500..3c428f8df34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## main / unreleased +* [CHANGE] Change the AWS Lambda serverless build tooling output from "main" to "bootstrap" [#3852](https://github.com/grafana/tempo/pull/3852) (@zatlodan) * [CHANGE] **BREAKING CHANGE** Remove `autocomplete_filtering_enabled` feature flag [#3729](https://github.com/grafana/tempo/pull/3729) (@mapno) * [CHANGE] Bump opentelemetry-collector to 0.102.1 [#3784](https://github.com/grafana/tempo/pull/3784) (@debasishbsws) * [CHANGE] Bump Jaeger query docker image to 1.57.0 [#3652](https://github.com/grafana/tempo/issues/3652) (@iblancasa) From 6632f217137be3a40fb6b3c4433151a8a084beb2 Mon Sep 17 00:00:00 2001 From: Dan Zatloukal <43817853+zatlodan@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:19:21 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md Co-authored-by: Mario --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fb6233ef8d..2a68cd580d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## main / unreleased -* [CHANGE] Change the AWS Lambda serverless build tooling output from "main" to "bootstrap" [#3852](https://github.com/grafana/tempo/pull/3852) (@zatlodan) +* [CHANGE] **BREAKING CHANGE** Change the AWS Lambda serverless build tooling output from "main" to "bootstrap". Refer to https://aws.amazon.com/blogs/compute/migrating-aws-lambda-functions-from-the-go1-x-runtime-to-the-custom-runtime-on-amazon-linux-2/ for migration steps [#3852](https://github.com/grafana/tempo/pull/3852) (@zatlodan) * [BUGFIX] Replace hedged requests roundtrips total with a counter. [#4063](https://github.com/grafana/tempo/pull/4063) [#4078](https://github.com/grafana/tempo/pull/4078) (@galalen) * [CHANGE] TraceByID: don't allow concurrent_shards greater than query_shards. [#4074](https://github.com/grafana/tempo/pull/4074) (@electron0zero) * **BREAKING CHANGE** tempo-query is no longer a jaeger instance with grpcPlugin. Its now a standalone server. Serving a grpc api for jaeger on `0.0.0.0:7777` by default. [#3840](https://github.com/grafana/tempo/issues/3840) (@frzifus) From 628083cefaad14317713cd87c469fe635e0fa39a Mon Sep 17 00:00:00 2001 From: Dan Zatloukal <43817853+zatlodan@users.noreply.github.com> Date: Mon, 28 Oct 2024 05:04:12 +0100 Subject: [PATCH 4/4] doc: remove additional newline --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffd8ec237c8..0d4c8d1b9e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,4 @@ ## main / unreleased - * [CHANGE] **BREAKING CHANGE** Change the AWS Lambda serverless build tooling output from "main" to "bootstrap". Refer to https://aws.amazon.com/blogs/compute/migrating-aws-lambda-functions-from-the-go1-x-runtime-to-the-custom-runtime-on-amazon-linux-2/ for migration steps [#3852](https://github.com/grafana/tempo/pull/3852) (@zatlodan) * [ENHANCEMENT] The span multiplier now also sources its value from the resource attributes. [#4210](https://github.com/grafana/tempo/pull/4210) * [FEATURE] Export cost attribution usage metrics from distributor [#4162](https://github.com/grafana/tempo/pull/4162) (@mdisibio)