From 90a5963fffa929a331a48cd4e6b834003d55e548 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 13 Jul 2023 04:20:06 +0200 Subject: [PATCH 1/6] docs: update doc with go support policy (#1488) * docs: update doc with go support policy * docs: remove go.mod comment the doc doesn't actually mention specific versions --- CHANGELOG.asciidoc | 3 +++ README.md | 9 ++++----- docs/set-up.asciidoc | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 7c17ed731..1c1830105 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -30,6 +30,9 @@ https://github.com/elastic/apm-agent-go/compare/v2.4.3...main[View commits] ==== 2.4.3 - 2023/06/22 - Fixed a data race in HTTP client instrumentation {pull}1472[#1472] +- Bumped minimum Go version to 1.19 {pull}1453[#1453] +- Fixed mixing of OTel and Elastic APM instrumentation {pull}1450[#1450] +- Updated to stable OTel metrics API {pull}1448[#1448] [[release-notes-2.4.2]] ==== 2.4.2 - 2023/05/22 diff --git a/README.md b/README.md index 6392ea6c0..b17767731 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,7 @@ This is the official Go package for [Elastic APM](https://www.elastic.co/solutions/apm). The Go agent enables you to trace the execution of operations in your application, -sending performance metrics and errors to the Elastic APM server. You can find a -list of the supported frameworks and other technologies in the [documentation](https://www.elastic.co/guide/en/apm/agent/go/current/supported-tech.html). +sending performance metrics and errors to the Elastic APM server. ## Installation @@ -19,11 +18,11 @@ go get go.elastic.co/apm/v2 ## Requirements -We support and test against the two latest major releases of Go, -as described by the [Go release policy](https://go.dev/doc/devel/release#policy), on Linux, Windows and MacOS. - Requires [APM Server](https://github.com/elastic/apm-server) v6.5 or newer. +You can find a list of the supported frameworks and other technologies in the +[documentation](https://www.elastic.co/guide/en/apm/agent/go/current/supported-tech.html). + ## License Apache 2.0. diff --git a/docs/set-up.asciidoc b/docs/set-up.asciidoc index 98bfcc59a..34263af97 100644 --- a/docs/set-up.asciidoc +++ b/docs/set-up.asciidoc @@ -21,7 +21,8 @@ go get -u go.elastic.co/apm/v2 [float] === Requirements -The Go agent is tested with Go 1.8+ on Linux, Windows, and MacOS. +You can find a list of the supported frameworks and other technologies in the +<> section. [float] [[instrumenting-source]] @@ -46,4 +47,4 @@ See <> to learn about all available options. include::./instrumenting.asciidoc[] include::./custom-instrumentation.asciidoc[] -include::./context-propagation.asciidoc[] \ No newline at end of file +include::./context-propagation.asciidoc[] From 0470de914fdefc9d532cbd7ec41cee09d1a7a6a8 Mon Sep 17 00:00:00 2001 From: Silvia Mitter Date: Tue, 18 Jul 2023 08:08:51 +0200 Subject: [PATCH 2/6] ci: update json spec files (#1491) --- .ci/updatecli.d/update-json-specs.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/updatecli.d/update-json-specs.yml b/.ci/updatecli.d/update-json-specs.yml index 8ae6b9b45..cb103f1b3 100644 --- a/.ci/updatecli.d/update-json-specs.yml +++ b/.ci/updatecli.d/update-json-specs.yml @@ -24,10 +24,10 @@ sources: - findsubmatch: pattern: "[0-9a-f]{40}" - cgroup_parsing.json: + container_metadata_discovery.json: kind: file spec: - file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/cgroup_parsing.json + file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/container_metadata_discovery.json service_resource_inference.json: kind: file spec: @@ -71,13 +71,13 @@ actions: * https://github.com/elastic/apm/commit/{{ source "sha" }} targets: - cgroup_parsing.json: - name: cgroup_parsing.json + container_metadata_discovery.json: + name: container_metadata_discovery.json scmid: default - sourceid: cgroup_parsing.json + sourceid: container_metadata_discovery.json kind: file spec: - file: internal/testdata/json-specs/cgroup_parsing.json + file: internal/testdata/json-specs/container_metadata_discovery.json service_resource_inference.json: name: service_resource_inference.json scmid: default From 2d13c783384c222bad2a7b6d92569236d2656df6 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Tue, 18 Jul 2023 17:44:08 +0800 Subject: [PATCH 3/6] Add CODEOWNERS (#1493) --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..8de78e67f --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @elastic/apm-agent-go From dd28415662126a51df87c37a0e40922bc7ca0d9c Mon Sep 17 00:00:00 2001 From: yw Date: Thu, 20 Jul 2023 14:31:31 +0900 Subject: [PATCH 4/6] update default value of ELASTIC_APM_CLOUD_PROVIDER in doc (#1495) --- docs/configuration.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc index 800010c4d..643c371f8 100644 --- a/docs/configuration.asciidoc +++ b/docs/configuration.asciidoc @@ -655,7 +655,7 @@ for backwards compatibility with older versions of Elastic APM agents. [options="header"] |============ | Environment | Default | Example -| `ELASTIC_APM_CLOUD_PROVIDER` | `"none"` | `"aws"` +| `ELASTIC_APM_CLOUD_PROVIDER` | `"auto"` | `"aws"` |============ This config value allows you to specify which cloud provider should be assumed From 490789f9a5958519206f5114d85582907bc0cac3 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 24 Jul 2023 02:49:30 +0200 Subject: [PATCH 5/6] docs: remove SECURITY.md to fallback to org-wide security policy (#1496) * docs: mention public bug bounty program in security policy * docs: remove SECURITY.md to fallback to org-wide security policy --- SECURITY.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 4ff826c5b..000000000 --- a/SECURITY.md +++ /dev/null @@ -1,7 +0,0 @@ -# Security Policy - -Thanks for your interest in the security of our products. -Our security policy can be found at [https://www.elastic.co/community/security](https://www.elastic.co/community/security). - -## Reporting a Vulnerability -Please send security vulnerability reports to security@elastic.co. From ded2651a6135aaeec40798dd24abde70a88805f7 Mon Sep 17 00:00:00 2001 From: Silvia Mitter Date: Wed, 26 Jul 2023 08:23:36 +0200 Subject: [PATCH 6/6] Remove container_metadata_discovery from tests (#1497) --- .ci/updatecli.d/update-json-specs.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.ci/updatecli.d/update-json-specs.yml b/.ci/updatecli.d/update-json-specs.yml index cb103f1b3..5ad1d3864 100644 --- a/.ci/updatecli.d/update-json-specs.yml +++ b/.ci/updatecli.d/update-json-specs.yml @@ -24,10 +24,6 @@ sources: - findsubmatch: pattern: "[0-9a-f]{40}" - container_metadata_discovery.json: - kind: file - spec: - file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/container_metadata_discovery.json service_resource_inference.json: kind: file spec: @@ -71,13 +67,6 @@ actions: * https://github.com/elastic/apm/commit/{{ source "sha" }} targets: - container_metadata_discovery.json: - name: container_metadata_discovery.json - scmid: default - sourceid: container_metadata_discovery.json - kind: file - spec: - file: internal/testdata/json-specs/container_metadata_discovery.json service_resource_inference.json: name: service_resource_inference.json scmid: default