Skip to content

Commit

Permalink
Merge branch 'main' into changelog-8.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@kruskall
kruskall authored Dec 7, 2023
2 parents 78adb19 + a56c605 commit 29111cb
Show file tree
Hide file tree
Showing 21 changed files with 170 additions and 102 deletions.
14 changes: 14 additions & 0 deletions .mergify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,17 @@ pull_request_rules:
labels:
- "backport"
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
- name: backport patches to 8.12 branch
conditions:
- merged
- base=main
- label=backport-8.12
actions:
backport:
assignees:
- "{{ author }}"
branches:
- "8.12"
labels:
- "backport"
title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
64 changes: 32 additions & 32 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1462,11 +1462,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LIC

--------------------------------------------------------------------------------
Dependency : github.com/elastic/go-docappender
Version: v0.2.1-0.20230829163624-c69a1cf8ce35
Version: v0.2.1-0.20231207080152-44217001fa53
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20230829163624-c69a1cf8ce35/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231207080152-44217001fa53/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -1673,11 +1673,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@

--------------------------------------------------------------------------------
Dependency : github.com/elastic/go-elasticsearch/v8
Version: v8.10.0
Version: v8.11.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.10.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.11.1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4227,11 +4227,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
Version: v2.4.4
Version: v2.4.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/[email protected].4/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/[email protected].7/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4438,11 +4438,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmgorilla/v2
Version: v2.4.4
Version: v2.4.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/[email protected].4/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/[email protected].7/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4649,11 +4649,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorill

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmgrpc/v2
Version: v2.4.4
Version: v2.4.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/[email protected].4/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/[email protected].7/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4860,11 +4860,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmhttp/v2
Version: v2.4.4
Version: v2.4.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/[email protected].4/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/[email protected].7/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -5071,11 +5071,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmotel/v2
Version: v2.4.4
Version: v2.4.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/[email protected].4/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/[email protected].7/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -5950,11 +5950,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel
Version: v1.19.0
Version: v1.21.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.19.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.21.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -6161,11 +6161,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/[email protected]/L

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel/metric
Version: v1.19.0
Version: v1.21.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.19.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.21.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -6372,11 +6372,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel/sdk/metric
Version: v1.19.0
Version: v1.21.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.19.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.21.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -6677,11 +6677,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sync
Version: v0.4.0
Version: v0.5.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.4.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.5.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -10377,11 +10377,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/go-logr/logr
Version: v1.2.4
Version: v1.3.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/go-logr/logr@v1.2.4/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/go-logr/logr@v1.3.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -17218,11 +17218,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmzap/v2
Version: v2.4.4
Version: v2.4.7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/[email protected].4/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/[email protected].7/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -17852,11 +17852,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semc

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel/sdk
Version: v1.19.0
Version: v1.21.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.19.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.21.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -18063,11 +18063,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/[email protected]

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/otel/trace
Version: v1.19.0
Version: v1.21.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.19.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.21.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -18406,11 +18406,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.13.0
Version: v0.14.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.13.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.14.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down
10 changes: 3 additions & 7 deletions apm-server.docker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,10 @@ apm-server:
# Note that values configured without a time unit will be interpreted as seconds.
#cache.expiration: 5m

# Source maps may be fetched from Elasticsearch by using the output.elasticsearch configuration,
# and running apm-server standalone.
# Source map retrieval location.
#
# Note: fetching source maps from Elasticsearch is not supported if apm-server is being managed by
# Fleet. This configuration is only applicable to standalone apm-servers, for backwards compatibility
# with source maps stored in Elasticsearch by older versions of apm-server. New source maps must now
# be uploaded via Kibana, and `apm-server.kibana` configured in standalone apm-servers for fetching
# them.
# If using an output other than Elasticsearch that is writing to Elasticsearch, you must
# set this option. If not set, the standard output elasticsearch configuration is used.
#elasticsearch:
# Array of hosts to connect to.
# Scheme and port can be left out and will be set to the default (`http` and `9200`).
Expand Down
5 changes: 5 additions & 0 deletions apmpackage/apm/changelog.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
- version: generated
changes:
- description: Placeholder
type: enhancement
link: https://github.com/elastic/apm-server/pull/123
- version: 8.12.0
changes:
- description: Add missing mappings for various fields
type: enhancement
Expand Down
4 changes: 4 additions & 0 deletions changelogs/head.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits]

[float]
==== Breaking Changes
- Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176]

[float]
==== Bug fixes

[float]
==== Deprecations
Expand Down
2 changes: 1 addition & 1 deletion cmd/intake-receiver/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
package main

// version matches the APM Server's version
const version = "8.12.0"
const version = "8.13.0"
32 changes: 16 additions & 16 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ require (
github.com/elastic/elastic-agent-libs v0.7.2
github.com/elastic/elastic-agent-system-metrics v0.9.0
github.com/elastic/gmux v0.3.1
github.com/elastic/go-docappender v0.2.1-0.20230829163624-c69a1cf8ce35
github.com/elastic/go-elasticsearch/v8 v8.10.0
github.com/elastic/go-docappender v0.2.1-0.20231207080152-44217001fa53
github.com/elastic/go-elasticsearch/v8 v8.11.1
github.com/elastic/go-sysinfo v1.11.1
github.com/elastic/go-ucfg v0.8.6
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
Expand All @@ -37,22 +37,22 @@ require (
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.4
go.elastic.co/apm/module/apmgorilla/v2 v2.4.4
go.elastic.co/apm/module/apmgrpc/v2 v2.4.4
go.elastic.co/apm/module/apmhttp/v2 v2.4.4
go.elastic.co/apm/module/apmotel/v2 v2.4.4
go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.7
go.elastic.co/apm/module/apmgorilla/v2 v2.4.7
go.elastic.co/apm/module/apmgrpc/v2 v2.4.7
go.elastic.co/apm/module/apmhttp/v2 v2.4.7
go.elastic.co/apm/module/apmotel/v2 v2.4.7
go.elastic.co/apm/v2 v2.4.7
go.elastic.co/fastjson v1.3.0
go.opentelemetry.io/collector/consumer v0.87.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0016
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel/metric v1.19.0
go.opentelemetry.io/otel/sdk/metric v1.19.0
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/metric v1.21.0
go.opentelemetry.io/otel/sdk/metric v1.21.0
go.uber.org/automaxprocs v1.5.2
go.uber.org/zap v1.26.0
golang.org/x/net v0.17.0
golang.org/x/sync v0.4.0
golang.org/x/sync v0.5.0
golang.org/x/term v0.13.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.58.3
Expand Down Expand Up @@ -96,7 +96,7 @@ require (
github.com/elastic/gosigar v0.14.2 // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/frankban/quicktest v1.14.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
Expand Down Expand Up @@ -150,17 +150,17 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.elastic.co/apm/module/apmzap/v2 v2.4.4 // indirect
go.elastic.co/apm/module/apmzap/v2 v2.4.7 // indirect
go.elastic.co/ecszap v1.0.2 // indirect
go.opentelemetry.io/collector/semconv v0.87.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
Expand Down
Loading

0 comments on commit 29111cb

Please sign in to comment.