From 38aa4bb9023776799ba1a1e9d4526c0bc6456144 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 29 Dec 2023 12:59:12 -0500 Subject: [PATCH 1/6] chore: Update to elastic/beats@ea5e055ea1b1 (#12317) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 6e55c158e26..60535178f5c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20231227163551-6f7cd75cd72e +Version: v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231227163551-6f7cd75cd72e/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 673d5c8d5e6..7ddb27c2c8b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231227163551-6f7cd75cd72e + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.8.2 diff --git a/go.sum b/go.sum index 085d96d8cc9..2d29f5a77dc 100644 --- a/go.sum +++ b/go.sum @@ -136,8 +136,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7 h1:QcfCHAh1bHj9WN6y75bD6mBlIIlz9dJVKJSJVXCu4TM= github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231227163551-6f7cd75cd72e h1:cL0tJW3s9rM5FjJiuC+Jq4wQLsuAQuyHFre9lzJoPZI= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231227163551-6f7cd75cd72e/go.mod h1:tyPnUi2tTvUlfby7/yBWoDvibj5DKidutSS2GItT6qM= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1 h1:1kescDbGTCpBzy4wWXfs7jSbMuODYRPcjGs8NVX38pA= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1/go.mod h1:tyPnUi2tTvUlfby7/yBWoDvibj5DKidutSS2GItT6qM= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From f78e7d112d1d4dfbd1bd9fd9806347613a6e9bb0 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:15:54 -0500 Subject: [PATCH 2/6] [updatecli] Bump elastic stack version to 8.11.4-c3b12837 (#12314) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bca6a85231e..a061113ab3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4-33860d30-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4-c3b12837-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.11.4-33860d30-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.11.4-c3b12837-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.11.4-33860d30-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.11.4-c3b12837-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index af558ef0823..b9b569a21c3 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.11.4-33860d30-SNAPSHOT + version: 8.11.4-c3b12837-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index ccb16bd0dc5..4059c569eed 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.11.4-33860d30-SNAPSHOT + version: 8.11.4-c3b12837-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 24586ea81ea..305615f3195 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.11.4-33860d30-SNAPSHOT + version: 8.11.4-c3b12837-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 0e22deabb7a7f0cfe912e260c9d251bde68534e4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:12:34 -0500 Subject: [PATCH 3/6] [updatecli] Update to elastic/beats@5043c444b12f (#12328) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@54c0506947fe Made with ❤️️ by updatecli * chore: Update to elastic/beats@5043c444b12f Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- NOTICE.txt | 6 +++--- go.mod | 2 +- go.sum | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 60535178f5c..8ddb57e6e41 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Elastic APM Server -Copyright 2014-2023 Elasticsearch BV +Copyright 2014-2024 Elasticsearch BV This product includes software developed by The Apache Software Foundation (http://www.apache.org/). @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1 +Version: v7.0.0-alpha2.0.20240102095809-5043c444b12f Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240102095809-5043c444b12f/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 7ddb27c2c8b..d6563e2bb1a 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240102095809-5043c444b12f github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.8.2 diff --git a/go.sum b/go.sum index 2d29f5a77dc..8d5d74c92c4 100644 --- a/go.sum +++ b/go.sum @@ -136,10 +136,10 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7 h1:QcfCHAh1bHj9WN6y75bD6mBlIIlz9dJVKJSJVXCu4TM= github.com/elastic/apm-data v0.1.1-0.20230928144734-40b63726f3b7/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1 h1:1kescDbGTCpBzy4wWXfs7jSbMuODYRPcjGs8NVX38pA= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231228163316-ea5e055ea1b1/go.mod h1:tyPnUi2tTvUlfby7/yBWoDvibj5DKidutSS2GItT6qM= -github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= -github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240102095809-5043c444b12f h1:PfpK+5Smeu+JwY3iEm6vjo959WEBYrncL7V3WefwHDg= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240102095809-5043c444b12f/go.mod h1:c3P62ncp1rK5uVSTcWHTUJ3W9BJgepaNBxltQyeTR7M= +github.com/elastic/elastic-agent-autodiscover v0.6.6 h1:P1y0dDpbhJc7Uw/xe85irPEad4Vljygc+y4iSxtqW7A= +github.com/elastic/elastic-agent-autodiscover v0.6.6/go.mod h1:chulyCAyZb/njMHgzkhC/yWnt8v/Y6eCRUhmFVnsA5o= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= github.com/elastic/elastic-agent-client/v7 v7.4.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0= github.com/elastic/elastic-agent-libs v0.6.2 h1:tE5pFK4y7xm1FtXm+r+63G7STjJAaWh3+oKIQDzdPDo= From b75e6832c134dcf756cea25a0bd229d1010537ad Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 18:03:43 +0000 Subject: [PATCH 4/6] docs: Add "Known issues" page (#11608) (#12330) (cherry picked from commit 667d5fc77727eeff117c8540a3df70af4d89ef40) Co-authored-by: Colleen McGinnis Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docs/integrations-index.asciidoc | 2 ++ docs/known-issues.asciidoc | 48 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 docs/known-issues.asciidoc diff --git a/docs/integrations-index.asciidoc b/docs/integrations-index.asciidoc index b375bf1c621..9a5596a8ea7 100644 --- a/docs/integrations-index.asciidoc +++ b/docs/integrations-index.asciidoc @@ -86,4 +86,6 @@ include::upgrading.asciidoc[] include::release-notes.asciidoc[leveloffset=+1] +include::known-issues.asciidoc[leveloffset=+1] + include::{docdir}/redirects.asciidoc[] diff --git a/docs/known-issues.asciidoc b/docs/known-issues.asciidoc new file mode 100644 index 00000000000..15e798763ac --- /dev/null +++ b/docs/known-issues.asciidoc @@ -0,0 +1,48 @@ +[[known-issues]] += Known issues + +APM has the following known issues: + +*Ingesting new JVM metrics in 8.9 and 8.10 breaks upgrade to 8.11 and stops ingestion* + +_APM Server versions: 8.11.0, 8.11.1_ + +_Elastic APM Java Agent versions: 1.39.0+_ + +// Describe the conditions in which this issue occurs +If you're using the Elastic APM Java Agent v1.39.0+ to send new JVM metrics to APM Server v8.9.x and v8.10.x, +// Describe the behavior of the issue +upgrading to 8.11.0 or 8.11.1 will silently fail and stop ingesting APM metrics. +// Describe why it happens +// This happens because... + +// Include exact error messages linked to this issue +// so users searching for the error message end up here. +After upgrading, you will see the following errors: + +* APM Server error logs: ++ +[source,txt] +---- +failed to index document in 'metrics-apm.internal-default' (fail_processor_exception): Document produced by APM Server v8.11.1, which is newer than the installed APM integration (v8.10.3-preview-1695284222). The APM integration must be upgraded. +---- + +* Fleet error on integration package upgrade: ++ +[source,txt] +---- +Failed installing package [apm] due to error: [ResponseError: mapper_parsing_exception + Root causes: + mapper_parsing_exception: Field [jvm.memory.non_heap.pool.committed] attempted to shadow a time_series_metric] +---- + +// Link to fix? +A fix for this issue is in progress: https://github.com/elastic/kibana/pull/171712[elastic/kibana#171712]. + + +// TEMPLATE + +//// +*Brief description* + +_Versions: XX.XX.XX, YY.YY.YY, ZZ.ZZ.ZZ_ + +Detailed description. +//// From db730dd66cde7c06c4642abbba3d5f887817f4ba Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:55:22 -0500 Subject: [PATCH 5/6] [updatecli] Bump elastic stack version to 8.11.4-41fcbc39 (#12326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a061113ab3b..00a0ad31503 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4-c3b12837-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4-41fcbc39-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.11.4-c3b12837-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.11.4-41fcbc39-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.11.4-c3b12837-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.11.4-41fcbc39-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index b9b569a21c3..a0c9daadc0b 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.11.4-c3b12837-SNAPSHOT + version: 8.11.4-41fcbc39-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 4059c569eed..9762f4a34ed 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.11.4-c3b12837-SNAPSHOT + version: 8.11.4-41fcbc39-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 305615f3195..e14faf13ad9 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.11.4-c3b12837-SNAPSHOT + version: 8.11.4-41fcbc39-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 8222e019d4df7bf9fa329feac5b285486dcec63e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 08:03:23 +0000 Subject: [PATCH 6/6] fix: always try to remap both span and error stacktraces (#12221) (#12331) When an event contains both a span and an error, the error is ignored by the sourcemap processor leading to stacktraces not being remapped. (cherry picked from commit 8f1008427981a7bca6ad420e3edce964c170242d) Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- internal/sourcemap/processor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/sourcemap/processor.go b/internal/sourcemap/processor.go index 6b2174da390..003ce3f30d1 100644 --- a/internal/sourcemap/processor.go +++ b/internal/sourcemap/processor.go @@ -57,10 +57,10 @@ func (p BatchProcessor) ProcessBatch(ctx context.Context, batch *modelpb.Batch) if event.GetService().GetName() == "" || event.GetService().GetVersion() == "" { continue } - switch { - case event.Span != nil: + if event.Span != nil { p.processStacktraceFrames(ctx, event.Service, event.Span.Stacktrace...) - case event.Error != nil: + } + if event.Error != nil { if event.Error.Log != nil { p.processStacktraceFrames(ctx, event.Service, event.Error.Log.Stacktrace...) }