Skip to content

Commit

Permalink
Merge branch '8.11' into mergify/bp/8.11/pr-12196
Browse files Browse the repository at this point in the history
  • Loading branch information
carsonip authored Jan 3, 2024
2 parents e6315cd + 8222e01 commit cc33797
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 17 deletions.
6 changes: 3 additions & 3 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -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/).
Expand Down Expand Up @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20231227163551-6f7cd75cd72e
Version: v7.0.0-alpha2.0.20240102095809-5043c444b12f
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231227163551-6f7cd75cd72e/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].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
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-41fcbc39-SNAPSHOT
ports:
- 9200:9200
healthcheck:
Expand Down Expand Up @@ -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-41fcbc39-SNAPSHOT
ports:
- 5601:5601
healthcheck:
Expand All @@ -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-41fcbc39-SNAPSHOT
environment:
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"
Expand Down
2 changes: 2 additions & 0 deletions docs/integrations-index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,6 @@ include::upgrading.asciidoc[]

include::release-notes.asciidoc[leveloffset=+1]

include::known-issues.asciidoc[leveloffset=+1]

include::{docdir}/redirects.asciidoc[]
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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.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/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=
Expand Down
6 changes: 3 additions & 3 deletions internal/sourcemap/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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...)
}
Expand Down
2 changes: 1 addition & 1 deletion testing/infra/k8s/base/stack/apm-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ApmServer
metadata:
name: apm-server
spec:
version: 8.11.4-33860d30-SNAPSHOT
version: 8.11.4-41fcbc39-SNAPSHOT
count: 1
http:
tls:
Expand Down
2 changes: 1 addition & 1 deletion testing/infra/k8s/base/stack/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Elasticsearch
metadata:
name: elasticsearch
spec:
version: 8.11.4-33860d30-SNAPSHOT
version: 8.11.4-41fcbc39-SNAPSHOT
auth:
fileRealm:
- secretName: elasticsearch-admin
Expand Down
2 changes: 1 addition & 1 deletion testing/infra/k8s/base/stack/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kibana
metadata:
name: kibana
spec:
version: 8.11.4-33860d30-SNAPSHOT
version: 8.11.4-41fcbc39-SNAPSHOT
count: 1
elasticsearchRef:
name: elasticsearch
Expand Down

0 comments on commit cc33797

Please sign in to comment.