Merge branch 'main' into updatecli_updatecli-bump-golang

elastic · Dec 15, 2023 · 05f8c61 · 05f8c61
2 parents e0e3866 + 8f10084
commit 05f8c61
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 43 deletions.
diff --git 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
@@ -3,10 +3,19 @@
 
 https://github.com/elastic/apm-server/compare/8.10\...8.11[View commits]
 
+* <<release-notes-8.11.3>>
 * <<release-notes-8.11.2>>
 * <<release-notes-8.11.1>>
 * <<release-notes-8.11.0>>
 
+[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
@@ -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]
+
+* <<release-notes-8.12.0>>
+
+[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
@@ -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
@@ -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
@@ -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
@@ -9,6 +9,7 @@ This section summarizes the changes in each release.
 
 **APM integration and APM Server**
 
+* <<release-notes-8.12>>
 * <<release-notes-8.11>>
 * <<release-notes-8.10>>
 * <<release-notes-8.9>>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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