diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index ea8a6729f14..2ce78ec26dd 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,5 @@ include::./changelogs/head.asciidoc[] +include::./changelogs/8.12.asciidoc[] include::./changelogs/8.11.asciidoc[] include::./changelogs/8.10.asciidoc[] include::./changelogs/8.9.asciidoc[] diff --git a/changelogs/8.11.asciidoc b/changelogs/8.11.asciidoc index 3fe1ab463d7..92e7df1cea9 100644 --- a/changelogs/8.11.asciidoc +++ b/changelogs/8.11.asciidoc @@ -3,10 +3,19 @@ https://github.com/elastic/apm-server/compare/8.10\...8.11[View commits] +* <> * <> * <> * <> +[float] +[[release-notes-8.11.3]] +=== APM version 8.11.3 + +https://github.com/elastic/apm-server/compare/v8.11.2\...v8.11.3[View commits] + +No significant changes. + [float] [[release-notes-8.11.2]] === APM version 8.11.2 diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc new file mode 100644 index 00000000000..ea2d8013de7 --- /dev/null +++ b/changelogs/8.12.asciidoc @@ -0,0 +1,27 @@ +[[release-notes-8.12]] +== APM version 8.12 + +https://github.com/elastic/apm-server/compare/8.11\...8.12[View commits] + +* <> + +[float] +[[release-notes-8.12.0]] +=== APM version 8.12.0 + +[float] +==== Breaking Changes +- The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102]. +- "publish_ready" is always false in the "GET /" response until events are received by apm-server {pull}12150[12150] + +[float] +==== Bug fixes +- Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729]. + +[float] +==== Added +- Update container base image to Ubuntu 22.04 {pull}11778[11778] +- Add support for returning partial success response in OTLP input {pull}11883[11883] +- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935] +- Field mappings have been added for various formerly unindexed fields {pull}12102[12102] +- We now assert that index templates are installed by attempting to create data streams {pull}12150[12150] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 37ff7d0ef18..55aa3eb326f 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -1,17 +1,14 @@ [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/8.11\...main[View commits] +https://github.com/elastic/apm-server/compare/8.12\...main[View commits] [float] ==== Breaking Changes -- The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102]. -- "publish_ready" is always false in the "GET /" response until events are received by apm-server {pull}12150[12150] - Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176] [float] ==== Bug fixes -- Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729]. [float] ==== Deprecations @@ -21,8 +18,3 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits] [float] ==== Added -- Update container base image to Ubuntu 22.04 {pull}11778[11778] -- Add support for returning partial success response in OTLP input {pull}11883[11883] -- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935] -- Field mappings have been added for various formerly unindexed fields {pull}12102[12102] -- We now assert that index templates are installed by attempting to create data streams {pull}12150[12150] diff --git a/docker-compose.yml b/docker-compose.yml index db60d601737..24dd21884ed 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.12.0-33e8d7e1-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-6av99u5d-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-33e8d7e1-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.13.0-6av99u5d-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-33e8d7e1-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.13.0-6av99u5d-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/docs/otel-direct.asciidoc b/docs/otel-direct.asciidoc index 734178e0066..bfc77cf1a1e 100644 --- a/docs/otel-direct.asciidoc +++ b/docs/otel-direct.asciidoc @@ -54,7 +54,7 @@ service: exporters: [logging, otlp/elastic] ---- <1> The receivers, like the -https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver[OTLP receiver], that forward data emitted by APM agents, or the https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/hostmetricsreceiver[host metrics receiver]. +https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver[OTLP receiver], that forward data emitted by APM agents, or the https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver[host metrics receiver]. <2> We recommend using the https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/batchprocessor/README.md[Batch processor] and the https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md[memory limiter processor]. For more information, see https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/README.md#recommended-processors[recommended processors]. <3> The https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/loggingexporter[logging exporter] is helpful for troubleshooting and supports various logging levels, like `debug`, `info`, `warn`, and `error`. <4> Elastic {observability} endpoint configuration. diff --git a/docs/release-notes.asciidoc b/docs/release-notes.asciidoc index 95a488319fe..62fe33a3474 100644 --- a/docs/release-notes.asciidoc +++ b/docs/release-notes.asciidoc @@ -9,6 +9,7 @@ This section summarizes the changes in each release. **APM integration and APM Server** +* <> * <> * <> * <> 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...) } diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index 95efbeba3f6..466be37c138 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -27,12 +27,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index 01730dcfb7b..e03a5c1f8ea 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -791,12 +791,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index 83281a6eb7b..a3df939ae5d 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -445,12 +445,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index 6507c06df7b..c3b48460971 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -24,12 +24,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 7815c07e525..449c18c0114 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.12.0-33e8d7e1-SNAPSHOT + version: 8.13.0-6av99u5d-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 88ae897326f..20e902ab72b 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.12.0-33e8d7e1-SNAPSHOT + version: 8.13.0-6av99u5d-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 233a7cd492a..c28af055490 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.12.0-33e8d7e1-SNAPSHOT + version: 8.13.0-6av99u5d-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch