Skip to content

Commit 9494d78

Browse files
kruskallaxw
andauthored
fix: update module name to use github url (#280)
* fix: update module name to use github url The previous module name was invalid and using a subfolder to store the source code was creating additional burden (e.g. you cannot 'git clone && make'. Update the module name to use the github url and flatten the directory structure. * ci: update jenkinsfile to use new source path * fix: update imports module name * docs: remove duplicate information from the readme * docs: add testing.md * docs: keep the readme minimal * docs: fix typos Co-authored-by: Andrew Wilkins <[email protected]> * docs: fix another typo Co-authored-by: Andrew Wilkins <[email protected]> Co-authored-by: Andrew Wilkins <[email protected]>
1 parent ef7cd2a commit 9494d78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+147
-158
lines changed

.ci/Jenkinsfile

+11-11
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pipeline {
4545
steps {
4646
withGithubNotify(context: "Lint") {
4747
withGoEnv(){
48-
dir("${BASE_DIR}/apm-lambda-extension"){
48+
dir("${BASE_DIR}"){
4949
sh(label: 'lint-prep', script: 'go mod tidy && git diff --exit-code')
5050
sh(label: 'lint-run', script: 'make lint')
5151
sh(label: 'Go vet', script: 'go vet')
@@ -54,7 +54,7 @@ pipeline {
5454
}
5555
withGithubNotify(context: "NOTICE.txt") {
5656
withGoEnv(){
57-
dir("${BASE_DIR}/apm-lambda-extension"){
57+
dir("${BASE_DIR}"){
5858
sh(label: 'notice', script: '''
5959
make NOTICE.txt
6060
git diff --exit-code --quiet && exit 0 || echo "regenerate NOTICE.txt" && exit 1
@@ -82,7 +82,7 @@ pipeline {
8282
deleteDir()
8383
unstash 'source'
8484
withGoEnv(){
85-
dir("${BASE_DIR}/apm-lambda-extension"){
85+
dir("${BASE_DIR}"){
8686
cmd(label: 'make build', script: 'make build')
8787
}
8888
}
@@ -93,7 +93,7 @@ pipeline {
9393
steps {
9494
withGithubNotify(context: "Test-${GO_VERSION}-${PLATFORM}") {
9595
withGoEnv(){
96-
dir("${BASE_DIR}/apm-lambda-extension"){
96+
dir("${BASE_DIR}"){
9797
goTestJUnit(options: '-v ./...', output: 'junit-report.xml')
9898
}
9999
}
@@ -135,7 +135,7 @@ pipeline {
135135
deleteDir()
136136
unstash 'source'
137137
withGoEnv(){
138-
dir("${BASE_DIR}/apm-lambda-extension"){
138+
dir("${BASE_DIR}"){
139139
cmd(label: 'make dist', script: 'make dist')
140140
}
141141
}
@@ -146,7 +146,7 @@ pipeline {
146146
steps {
147147
withGithubNotify(context: "Push-Docker-${PLATFORM}") {
148148
withGoEnv(){
149-
dir("${BASE_DIR}/apm-lambda-extension"){
149+
dir("${BASE_DIR}"){
150150
dockerLogin(secret: "${DOCKER_SECRET}", registry: "${DOCKER_REGISTRY}")
151151
cmd(label: 'make push-docker', script: 'make push-docker')
152152
}
@@ -159,7 +159,7 @@ pipeline {
159159
withGithubNotify(context: "Publish-Layer-${PLATFORM}") {
160160
withGoEnv(){
161161
withAWSEnv(secret: 'secret/observability-team/ci/service-account/apm-aws-lambda', forceInstallation: true, version: '2.4.10') {
162-
dir("${BASE_DIR}/apm-lambda-extension"){
162+
dir("${BASE_DIR}"){
163163
cmd(label: 'make publish-in-all-aws-regions', script: 'make publish-in-all-aws-regions')
164164
cmd(label: 'make create-arn-file', script: 'make create-arn-file')
165165
stash(includes: "*${SUFFIX_ARN_FILE}", name: "arn-${isArm() ? 'arm' : 'amd'}")
@@ -171,9 +171,9 @@ pipeline {
171171
}
172172
post {
173173
always {
174-
archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/apm-lambda-extension/.regions")
175-
archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/apm-lambda-extension/*${SUFFIX_ARN_FILE}")
176-
archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/apm-lambda-extension/.aws")
174+
archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/.regions")
175+
archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/*${SUFFIX_ARN_FILE}")
176+
archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/.aws")
177177
}
178178
}
179179
}
@@ -183,7 +183,7 @@ pipeline {
183183
stage('Release Notes') {
184184
steps {
185185
withGhEnv(forceInstallation: true, version: '2.4.0') {
186-
dir("${BASE_DIR}/apm-lambda-extension"){
186+
dir("${BASE_DIR}"){
187187
unstash "arn-arm"
188188
unstash "arn-amd"
189189
unstash "dist-arm"

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@
2323
# AWS regions file
2424
.regions
2525
.aws/
26+
27+
bin/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

README.md

+12-4

apm-lambda-extension/README.md renamed to TESTING.md

+4-23

apm-lambda-extension/.gitignore

-1
This file was deleted.
File renamed without changes.

apm-lambda-extension/apmproxy/apmserver_test.go renamed to apmproxy/apmserver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package apmproxy_test
2020
import (
2121
"compress/gzip"
2222
"context"
23-
"elastic/apm-lambda-extension/apmproxy"
23+
"github.com/elastic/apm-aws-lambda/apmproxy"
2424
"io"
2525
"net/http"
2626
"net/http/httptest"
File renamed without changes.

apm-lambda-extension/apmproxy/client_test.go renamed to apmproxy/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package apmproxy_test
1919

2020
import (
21-
"elastic/apm-lambda-extension/apmproxy"
21+
"github.com/elastic/apm-aws-lambda/apmproxy"
2222
"testing"
2323

2424
"github.com/stretchr/testify/require"
File renamed without changes.

apm-lambda-extension/apmproxy/metadata_test.go renamed to apmproxy/metadata_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"bytes"
2222
"compress/gzip"
2323
"compress/zlib"
24-
"elastic/apm-lambda-extension/apmproxy"
24+
"github.com/elastic/apm-aws-lambda/apmproxy"
2525
"io"
2626
"testing"
2727

File renamed without changes.
File renamed without changes.

apm-lambda-extension/apmproxy/receiver_test.go renamed to apmproxy/receiver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package apmproxy_test
1919

2020
import (
2121
"bytes"
22-
"elastic/apm-lambda-extension/apmproxy"
22+
"github.com/elastic/apm-aws-lambda/apmproxy"
2323
"io"
2424
"net"
2525
"net/http"
File renamed without changes.

apm-lambda-extension/app/app.go renamed to app/app.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
package app
1919

2020
import (
21-
"elastic/apm-lambda-extension/apmproxy"
22-
"elastic/apm-lambda-extension/extension"
23-
"elastic/apm-lambda-extension/logger"
24-
"elastic/apm-lambda-extension/logsapi"
21+
"github.com/elastic/apm-aws-lambda/apmproxy"
22+
"github.com/elastic/apm-aws-lambda/extension"
23+
"github.com/elastic/apm-aws-lambda/logger"
24+
"github.com/elastic/apm-aws-lambda/logsapi"
2525
"fmt"
2626
"os"
2727
"strconv"
File renamed without changes.

apm-lambda-extension/app/run.go renamed to app/run.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package app
1919

2020
import (
2121
"context"
22-
"elastic/apm-lambda-extension/apmproxy"
23-
"elastic/apm-lambda-extension/extension"
24-
"elastic/apm-lambda-extension/logsapi"
22+
"github.com/elastic/apm-aws-lambda/apmproxy"
23+
"github.com/elastic/apm-aws-lambda/extension"
24+
"github.com/elastic/apm-aws-lambda/logsapi"
2525
"fmt"
2626
"sync"
2727
"time"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

apm-lambda-extension/e2e-testing/e2e_test.go renamed to e2e-testing/e2e_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package e2eTesting
1919

2020
import (
21-
"elastic/apm-lambda-extension/logger"
21+
"github.com/elastic/apm-aws-lambda/logger"
2222
"flag"
2323
"fmt"
2424
"io"

apm-lambda-extension/e2e-testing/e2e_util.go renamed to e2e-testing/e2e_util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"path/filepath"
3030
"strings"
3131

32-
"elastic/apm-lambda-extension/apmproxy"
32+
"github.com/elastic/apm-aws-lambda/apmproxy"
3333

3434
"go.uber.org/zap"
3535
)

0 commit comments

Comments
 (0)