Skip to content

Use the Init and Exit error signals provided by the Extension API #145

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
merged 6 commits into from
Mar 31, 2022
Merged

Use the Init and Exit error signals provided by the Extension API #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
851c825
Use Init and Exit error codes (incl. demo code)
jlvoiseux Mar 10, 2022
fefa4c4
Remove APM example
jlvoiseux Mar 10, 2022
79f7b7b
Increase the range of valid StatusCodes
jlvoiseux Mar 10, 2022
77b6022
Remove demonstration code
jlvoiseux Mar 10, 2022
8d34deb
Merge branch 'main' into init-exit-errors
jlvoiseux Mar 22, 2022
ccdc8c1
Quick fix : make changes compatible with logger
jlvoiseux Mar 31, 2022
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
4 changes: 2 additions & 2 deletions apm-lambda-extension/extension/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func (e *Client) InitError(ctx context.Context, errorType string) (*StatusRespon
}
defer httpRes.Body.Close()

if httpRes.StatusCode != 200 {
if httpRes.StatusCode > 299 {
return nil, fmt.Errorf("initialization error request failed with status %s", httpRes.Status)
}
res := StatusResponse{}
Expand All @@ -187,7 +187,7 @@ func (e *Client) ExitError(ctx context.Context, errorType string) (*StatusRespon
}
defer httpRes.Body.Close()

if httpRes.StatusCode != 200 {
if httpRes.StatusCode > 299 {
return nil, fmt.Errorf("exit error request failed with status %s", httpRes.Status)
}
res := StatusResponse{}
Expand Down
18 changes: 16 additions & 2 deletions apm-lambda-extension/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var (
/* --- elastic vars --- */

func main() {

ctx, cancel := context.WithCancel(context.Background())

// Trigger ctx.Done() in all relevant goroutines when main ends
Expand All @@ -59,7 +60,14 @@ func main() {
// register extension with AWS Extension API
res, err := extensionClient.Register(ctx, extensionName)
if err != nil {
panic(err)
status, errRuntime := extensionClient.InitError(ctx, err.Error())
if errRuntime != nil {
panic(errRuntime)
}
extension.Log.Errorf("Error: %s", err)
extension.Log.Infof("Init error signal sent to runtime : %s", status)
extension.Log.Infof("Exiting")
return
}
extension.Log.Debugf("Register response: %v", extension.PrettyPrint(res))

Expand Down Expand Up @@ -104,7 +112,13 @@ func main() {
extension.Log.Infof("Waiting for next event...")
event, err := extensionClient.NextEvent(ctx)
if err != nil {
extension.Log.Errorf("Error: %v\n. Exiting.", err)
status, err := extensionClient.ExitError(ctx, err.Error())
if err != nil {
panic(err)
}
extension.Log.Errorf("Error: %s", err)
extension.Log.Infof("Exit signal sent to runtime : %s", status)
extension.Log.Infof("Exiting")
return
}
extension.Log.Debug("Received event.")
Expand Down