Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions apm-lambda-extension/extension/process_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ import (
"bytes"
"compress/gzip"
"compress/zlib"
"errors"
"fmt"
"io/ioutil"
"strings"

"github.com/pkg/errors"
)

type MetadataContainer struct {
Expand All @@ -38,7 +37,7 @@ type MetadataContainer struct {
func ProcessMetadata(data AgentData) ([]byte, error) {
uncompressedData, err := GetUncompressedBytes(data.Data, data.ContentEncoding)
if err != nil {
return nil, errors.New(fmt.Sprintf("Error uncompressing agent data for metadata extraction : %v", err))
return nil, fmt.Errorf("Error uncompressing agent data for metadata extraction: %w", err)
}
scanner := bufio.NewScanner(strings.NewReader(string(uncompressedData)))
scanner.Scan()
Expand Down
2 changes: 1 addition & 1 deletion apm-lambda-extension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require (
github.com/google/uuid v1.3.0
github.com/joho/godotenv v1.4.0
github.com/magefile/mage v1.13.0 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
go.elastic.co/ecszap v1.0.1
go.uber.org/atomic v1.9.0 // indirect
Expand All @@ -33,6 +32,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 // indirect
github.com/aws/smithy-go v1.12.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
Expand Down
11 changes: 5 additions & 6 deletions apm-lambda-extension/logsapi/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ package logsapi
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net/http"

"github.com/pkg/errors"
)

const lambdaAgentIdentifierHeaderKey string = "Lambda-Extension-Identifier"
Expand Down Expand Up @@ -153,7 +152,7 @@ func (c *Client) Subscribe(types []EventType, destinationURI URI, extensionId st
Destination: destination,
})
if err != nil {
return nil, errors.WithMessage(err, "failed to marshal SubscribeRequest")
return nil, fmt.Errorf("failed to marshal SubscribeRequest: %w", err)
}

headers := make(map[string]string)
Expand All @@ -166,14 +165,14 @@ func (c *Client) Subscribe(types []EventType, destinationURI URI, extensionId st
defer resp.Body.Close()

if resp.StatusCode == http.StatusAccepted {
return nil, errors.Errorf("Logs API is not supported in this environment")
return nil, errors.New("Logs API is not supported in this environment")
} else if resp.StatusCode != http.StatusOK {
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, errors.Errorf("%s failed: %d[%s]", url, resp.StatusCode, resp.Status)
return nil, fmt.Errorf("%s failed: %d[%s]", url, resp.StatusCode, resp.Status)
}

return nil, errors.Errorf("%s failed: %d[%s] %s", url, resp.StatusCode, resp.Status, string(body))
return nil, fmt.Errorf("%s failed: %d[%s] %s", url, resp.StatusCode, resp.Status, string(body))
}

body, _ := ioutil.ReadAll(resp.Body)
Expand Down
3 changes: 1 addition & 2 deletions apm-lambda-extension/logsapi/subscribe.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ package logsapi

import (
"context"
"errors"
"fmt"
"net"
"net/http"
"os"
"time"

"elastic/apm-lambda-extension/extension"

"github.com/pkg/errors"
)

// TODO: Remove global variable and find another way to retrieve Logs Listener network info when testing main
Expand Down