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
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'
#scripts to include the integration and end to end tests should be added here
- name: Run Test Cases and Coverage
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-lambda-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'

- name: Build and Package Go executable
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-template-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'

- name: Install AWS SAM CLI
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run-e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'

- name: Install AWS SAM CLI
run: |
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'

- name: Install AWS SAM CLI
run: |
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'

- name: Install AWS SAM CLI
run: |
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.24.4'
go-version: '1.26.0'

- name: Install AWS SAM CLI
run: |
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.26.0'

- name: Install AWS SAM CLI
run: |
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/common-scripts/entity_synthesis_param.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Entity synthesis Parameters , aws related params are dropped in pipeline.
instrumentation_provider=aws
instrumentation_name=lambda
instrumentation_version=1.1.1
instrumentation_version=1.1.2
2 changes: 1 addition & 1 deletion integration-tests/common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const (
// LambdaHandler name of the lambda handler
LambdaHandler = "main"
// LambdaRuntime type of lambda runtime
LambdaRuntime = "go1.x"
LambdaRuntime = "provided.al2023"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this work?

// QueryEndpoint query endpoint to fetch logs from new relic
QueryEndpoint = "https://api.newrelic.com/graphql"
// ZipFileName executable zip file name
Expand Down
18 changes: 9 additions & 9 deletions integration-tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
module github.com/newrelic/aws-unified-lambda/integration-tests

go 1.26.0

require (
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go v1.55.8
github.com/joho/godotenv v1.5.1
github.com/newrelic/newrelic-client-go/v2 v2.51.3
github.com/stretchr/testify v1.9.0
github.com/newrelic/newrelic-client-go/v2 v2.79.0
github.com/stretchr/testify v1.11.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
golang.org/x/sys v0.20.0 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
golang.org/x/sys v0.41.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

module github.com/newrelic/aws-unified-lambda-logging

go 1.24.4
10 changes: 10 additions & 0 deletions integration-tests/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -13,19 +15,27 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/newrelic/newrelic-client-go/v2 v2.51.3 h1:Bu/cUs6nfMjQMPBcxxHt4Xm30tKDT7ttYy/XRDsWP6Y=
github.com/newrelic/newrelic-client-go/v2 v2.51.3/go.mod h1:+RRjI3nDGWT3kLm9Oi3QxpBm70uu8q1upEHBVWCZFpo=
github.com/newrelic/newrelic-client-go/v2 v2.79.0 h1:SNkjPjN8qpqrD/AmwHlHCTmN1oc4d5gMkXmbLOwOIro=
github.com/newrelic/newrelic-client-go/v2 v2.79.0/go.mod h1:kROngr/zeNyxbdOI3zPK4Al+ze32XjLEVUDzjxsKW9g=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
17 changes: 9 additions & 8 deletions integration-tests/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ package integrationtests

import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"strings"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/endpoints"
Expand All @@ -11,15 +18,9 @@ import (
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/secretsmanager"
"github.com/aws/aws-sdk-go/service/sqs"
integrationtests "github.com/newrelic/aws-unified-lambda-logging/common"
"github.com/newrelic/aws-unified-lambda-logging/helpers"
integrationtests "github.com/newrelic/aws-unified-lambda/integration-tests/common"
"github.com/newrelic/aws-unified-lambda/integration-tests/helpers"
"github.com/newrelic/newrelic-client-go/v2/pkg/testhelpers"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"strings"
"time"
)

// CreateAWSSession function to create AWS session
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/helpers/lambdaHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/lambda"
integrationtests "github.com/newrelic/aws-unified-lambda-logging/common"
integrationtests "github.com/newrelic/aws-unified-lambda/integration-tests/common"
"log"
)

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/helpers/newRelicLogsFetcherHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"strconv"

integrationtests "github.com/newrelic/aws-unified-lambda-logging/common"
integrationtests "github.com/newrelic/aws-unified-lambda/integration-tests/common"
)

// FetchLogsFromNewRelic function to fetch logs
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/helpers/secretManagerHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/secretsmanager"
integrationtests "github.com/newrelic/aws-unified-lambda-logging/common"
integrationtests "github.com/newrelic/aws-unified-lambda/integration-tests/common"
"log"
)

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/joho/godotenv"
"github.com/newrelic/aws-unified-lambda-logging/common"
"github.com/newrelic/aws-unified-lambda-logging/helpers"
"github.com/newrelic/aws-unified-lambda/integration-tests/common"
"github.com/newrelic/aws-unified-lambda/integration-tests/helpers"
"github.com/stretchr/testify/assert"
"os"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion lambda-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging

AWS::CloudFormation::Interface:
Expand Down
2 changes: 1 addition & 1 deletion logging-firehose-metric-polling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging

AWS::CloudFormation::Interface:
Expand Down
2 changes: 1 addition & 1 deletion logging-firehose-metric-stream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down
2 changes: 1 addition & 1 deletion logging-lambda-firehose-metric-polling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down
2 changes: 1 addition & 1 deletion logging-lambda-firehose-metric-stream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging

AWS::CloudFormation::Interface:
Expand Down
2 changes: 1 addition & 1 deletion logging-lambda-firehose-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging

AWS::CloudFormation::Interface:
Expand Down
2 changes: 1 addition & 1 deletion logging-lambda-metric-polling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging

AWS::CloudFormation::Interface:
Expand Down
2 changes: 1 addition & 1 deletion logging-lambda-metric-stream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Metadata:
LicenseUrl: LICENSE.txt
ReadmeUrl: README.md
HomePageUrl: https://github.com/newrelic/aws-unified-logging
SemanticVersion: 1.1.1
SemanticVersion: 1.1.2
SourceCodeUrl: https://github.com/newrelic/aws-unified-logging

AWS::CloudFormation::Interface:
Expand Down
6 changes: 3 additions & 3 deletions src/cloudwatch/cloudwatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"

"github.com/aws/aws-lambda-go/events"
"github.com/newrelic/aws-unified-lambda-logging/common"
"github.com/newrelic/aws-unified-lambda-logging/logger"
"github.com/newrelic/aws-unified-lambda-logging/util"
"github.com/newrelic/aws-unified-lambda/src/common"
"github.com/newrelic/aws-unified-lambda/src/logger"
"github.com/newrelic/aws-unified-lambda/src/util"
)

// log is a logger instance used for logging messages.
Expand Down
4 changes: 2 additions & 2 deletions src/cloudwatch/cloudwatch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/aws/aws-lambda-go/events"
"github.com/newrelic/aws-unified-lambda-logging/common"
"github.com/newrelic/aws-unified-lambda-logging/util"
"github.com/newrelic/aws-unified-lambda/src/common"
"github.com/newrelic/aws-unified-lambda/src/util"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion src/common/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
package common

// InstrumentationVersion is a parameter necessary for Entity Synthesis at New Relic.
const InstrumentationVersion = "1.1.1"
const InstrumentationVersion = "1.1.2"
Loading
Loading