Merge branch '8.15' into mergify/bp/8.15/pr-13958

elastic · Sep 9, 2024 · 6c3affc · 6c3affc
2 parents d8a4671 + 61b27f4
commit 6c3affc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/changelogs/8.15.asciidoc b/changelogs/8.15.asciidoc
@@ -15,6 +15,10 @@ https://github.com/elastic/apm-server/compare/v8.15.0\...v8.15.1[View commits]
 
 - Fix fallback memory limit check conversion from Bytes to Gigabytes {pull}13838[13838]
 - Fix Elasticsearch apm-data plugin to fallback to ILM policy for data streams using default APM integration and not explicitly migrated to data stream lifecycle. More details are available in the https://www.elastic.co/guide/en/observability/current/apm-known-issues.html[APM known issues page] {pull}13918[13918]
+- Remove from logs the error reason returned by Elasticsearch for `x_content_parse_exception` error {pull}13853[13853]
+- Fix ingestion failure when `ip` resource attribute has value `0.0.0.0` in OpenTelemetry events from Jaeger {pull}13852[13852]
+- Fix possible nil pointer dereference when parsing stacktraces in OpenTelemetry events {pull}13852[13852]
+- Fix missing tracking in instrumentation metrics for certain request-level status codes from Elasticsearch bulk responses {pull}13853[13853]
 
 [float]
 ==== Breaking Changes
@@ -28,6 +32,8 @@ https://github.com/elastic/apm-server/compare/v8.15.0\...v8.15.1[View commits]
 [float]
 ==== Added
 
+- Support OpenTelemetry Java agent inferred span links {pull}13852[13852]
+
 [float]
 [[apm-release-notes-8.15.0]]
 === APM version 8.15.0

diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
@@ -18,4 +18,4 @@
 package main
 
 // version matches the APM Server's version
-const version = "8.15.1"
+const version = "8.15.2"
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.15.1-e010ad04-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.1-67154674-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.15.1-e010ad04-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.15.1-67154674-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.15.1-e010ad04-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.15.1-67154674-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

diff --git a/internal/version/version.go b/internal/version/version.go
@@ -18,4 +18,4 @@
 package version
 
 // Version holds the APM Server version.
-const Version = "8.15.1"
+const Version = "8.15.2"
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.15.1-e010ad04-SNAPSHOT
+  version: 8.15.1-67154674-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.15.1-e010ad04-SNAPSHOT
+  version: 8.15.1-67154674-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.15.1-e010ad04-SNAPSHOT
+  version: 8.15.1-67154674-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch