Skip to content

Commit 55c2bce

Browse files
ericywlericywl
authored
Merge branch 'main' into functionaltests-migration-deprecations
2 parents 05f8903 + 7d53c02 commit 55c2bce

File tree

24 files changed

+496
-142
lines changed

24 files changed

+496
-142
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
- uses: actions/checkout@v4
145145
- name: Get changed files
146146
id: changed-files
147-
uses: tj-actions/changed-files@27ae6b33eaed7bf87272fdeb9f1c54f9facc9d99 # v45.0.7
147+
uses: tj-actions/changed-files@6f67ee9ac810f0192ea7b3d2086406f97847bcf9 # v45.0.7
148148
with:
149149
files: .go-version
150150

‎.github/workflows/docs-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
docs-preview:
12-
uses: elastic/docs-builder/.github/workflows/preview-build.yml@80c3e95a9f022c4926792758e902bac95160d6e5 # main
12+
uses: elastic/docs-builder/.github/workflows/preview-build.yml@4fd8e89dd8147ac5301c55a24f9dfce0bedb06cf # main
1313
with:
1414
path-pattern: docs/**
1515
permissions:

‎.github/workflows/docs-cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
docs-preview:
10-
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@80c3e95a9f022c4926792758e902bac95160d6e5 # main
10+
uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@4fd8e89dd8147ac5301c55a24f9dfce0bedb06cf # main
1111
permissions:
1212
contents: none
1313
id-token: write

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.1
1+
1.24.2

‎NOTICE-fips.txt‎

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -478,11 +478,11 @@ License Version 2.0.
478478

479479
--------------------------------------------------------------------------------
480480
Dependency : github.com/elastic/elastic-agent-client/v7
481-
Version: v7.17.1
481+
Version: v7.17.2
482482
Licence type (autodetected): Elastic
483483
--------------------------------------------------------------------------------
484484

485-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected].1/LICENSE.txt:
485+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected].2/LICENSE.txt:
486486

487487
ELASTIC LICENSE AGREEMENT
488488

@@ -922,11 +922,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
922922

923923
--------------------------------------------------------------------------------
924924
Dependency : github.com/elastic/elastic-agent-system-metrics
925-
Version: v0.11.10
925+
Version: v0.11.11
926926
Licence type (autodetected): Apache-2.0
927927
--------------------------------------------------------------------------------
928928

929-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].10/LICENSE.txt:
929+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].11/LICENSE.txt:
930930

931931
Apache License
932932
Version 2.0, January 2004
@@ -4384,11 +4384,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
43844384

43854385
--------------------------------------------------------------------------------
43864386
Dependency : go.opentelemetry.io/collector/pdata
4387-
Version: v1.28.1
4387+
Version: v1.29.0
43884388
Licence type (autodetected): Apache-2.0
43894389
--------------------------------------------------------------------------------
43904390

4391-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.28.1/LICENSE:
4391+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.29.0/LICENSE:
43924392

43934393

43944394
Apache License
@@ -5315,11 +5315,11 @@ THE SOFTWARE.
53155315

53165316
--------------------------------------------------------------------------------
53175317
Dependency : golang.org/x/net
5318-
Version: v0.37.0
5318+
Version: v0.38.0
53195319
Licence type (autodetected): BSD-3-Clause
53205320
--------------------------------------------------------------------------------
53215321

5322-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.37.0/LICENSE:
5322+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.38.0/LICENSE:
53235323

53245324
Copyright 2009 The Go Authors.
53255325

@@ -9416,44 +9416,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
94169416
SOFTWARE.
94179417

94189418

9419-
--------------------------------------------------------------------------------
9420-
Dependency : github.com/golang/protobuf
9421-
Version: v1.5.4
9422-
Licence type (autodetected): BSD-3-Clause
9423-
--------------------------------------------------------------------------------
9424-
9425-
Contents of probable licence file $GOMODCACHE/github.com/golang/[email protected]/LICENSE:
9426-
9427-
Copyright 2010 The Go Authors. All rights reserved.
9428-
9429-
Redistribution and use in source and binary forms, with or without
9430-
modification, are permitted provided that the following conditions are
9431-
met:
9432-
9433-
* Redistributions of source code must retain the above copyright
9434-
notice, this list of conditions and the following disclaimer.
9435-
* Redistributions in binary form must reproduce the above
9436-
copyright notice, this list of conditions and the following disclaimer
9437-
in the documentation and/or other materials provided with the
9438-
distribution.
9439-
* Neither the name of Google Inc. nor the names of its
9440-
contributors may be used to endorse or promote products derived from
9441-
this software without specific prior written permission.
9442-
9443-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9444-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9445-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9446-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9447-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9448-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9449-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9450-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9451-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9452-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9453-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9454-
9455-
9456-
94579419
--------------------------------------------------------------------------------
94589420
Dependency : github.com/golang/snappy
94599421
Version: v0.0.5-0.20231225225746-43d5d4cd4e0e

‎NOTICE.txt‎

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -478,11 +478,11 @@ License Version 2.0.
478478

479479
--------------------------------------------------------------------------------
480480
Dependency : github.com/elastic/elastic-agent-client/v7
481-
Version: v7.17.1
481+
Version: v7.17.2
482482
Licence type (autodetected): Elastic
483483
--------------------------------------------------------------------------------
484484

485-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected].1/LICENSE.txt:
485+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected].2/LICENSE.txt:
486486

487487
ELASTIC LICENSE AGREEMENT
488488

@@ -922,11 +922,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
922922

923923
--------------------------------------------------------------------------------
924924
Dependency : github.com/elastic/elastic-agent-system-metrics
925-
Version: v0.11.10
925+
Version: v0.11.11
926926
Licence type (autodetected): Apache-2.0
927927
--------------------------------------------------------------------------------
928928

929-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].10/LICENSE.txt:
929+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].11/LICENSE.txt:
930930

931931
Apache License
932932
Version 2.0, January 2004
@@ -4384,11 +4384,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
43844384

43854385
--------------------------------------------------------------------------------
43864386
Dependency : go.opentelemetry.io/collector/pdata
4387-
Version: v1.28.1
4387+
Version: v1.29.0
43884388
Licence type (autodetected): Apache-2.0
43894389
--------------------------------------------------------------------------------
43904390

4391-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.28.1/LICENSE:
4391+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.29.0/LICENSE:
43924392

43934393

43944394
Apache License
@@ -5315,11 +5315,11 @@ THE SOFTWARE.
53155315

53165316
--------------------------------------------------------------------------------
53175317
Dependency : golang.org/x/net
5318-
Version: v0.37.0
5318+
Version: v0.38.0
53195319
Licence type (autodetected): BSD-3-Clause
53205320
--------------------------------------------------------------------------------
53215321

5322-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.37.0/LICENSE:
5322+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.38.0/LICENSE:
53235323

53245324
Copyright 2009 The Go Authors.
53255325

@@ -9446,44 +9446,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
94469446
SOFTWARE.
94479447

94489448

9449-
--------------------------------------------------------------------------------
9450-
Dependency : github.com/golang/protobuf
9451-
Version: v1.5.4
9452-
Licence type (autodetected): BSD-3-Clause
9453-
--------------------------------------------------------------------------------
9454-
9455-
Contents of probable licence file $GOMODCACHE/github.com/golang/[email protected]/LICENSE:
9456-
9457-
Copyright 2010 The Go Authors. All rights reserved.
9458-
9459-
Redistribution and use in source and binary forms, with or without
9460-
modification, are permitted provided that the following conditions are
9461-
met:
9462-
9463-
* Redistributions of source code must retain the above copyright
9464-
notice, this list of conditions and the following disclaimer.
9465-
* Redistributions in binary form must reproduce the above
9466-
copyright notice, this list of conditions and the following disclaimer
9467-
in the documentation and/or other materials provided with the
9468-
distribution.
9469-
* Neither the name of Google Inc. nor the names of its
9470-
contributors may be used to endorse or promote products derived from
9471-
this software without specific prior written permission.
9472-
9473-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9474-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9475-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9476-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9477-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9478-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9479-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9480-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9481-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9482-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9483-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9484-
9485-
9486-
94879449
--------------------------------------------------------------------------------
94889450
Dependency : github.com/golang/snappy
94899451
Version: v0.0.5-0.20231225225746-43d5d4cd4e0e

‎cmd/intake-receiver/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/apm-server/cmd/intake-receiver
22

3-
go 1.24.1
3+
go 1.24.2
44

55
require (
66
github.com/stretchr/testify v1.6.1

‎docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ x-logging: &default-logging
1010
max-size: "1g"
1111
services:
1212
elasticsearch:
13-
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-1b31494f-SNAPSHOT
13+
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-0a06c833-SNAPSHOT
1414
ports:
1515
- 9200:9200
1616
healthcheck:
@@ -41,7 +41,7 @@ services:
4141
logging: *default-logging
4242

4343
kibana:
44-
image: docker.elastic.co/kibana/kibana:9.1.0-1b31494f-SNAPSHOT
44+
image: docker.elastic.co/kibana/kibana:9.1.0-0a06c833-SNAPSHOT
4545
ports:
4646
- 5601:5601
4747
healthcheck:
@@ -60,7 +60,7 @@ services:
6060
logging: *default-logging
6161

6262
metricbeat:
63-
image: docker.elastic.co/beats/metricbeat:9.1.0-1b31494f-SNAPSHOT
63+
image: docker.elastic.co/beats/metricbeat:9.1.0-0a06c833-SNAPSHOT
6464
environment:
6565
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
6666
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

‎functionaltests/8_16_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ import (
2323
"github.com/elastic/go-elasticsearch/v8/typedapi/types"
2424
)
2525

26+
// In 8.15, the data stream management was migrated from ILM to DSL.
27+
// However, a bug was introduced, causing data streams to be unmanaged.
28+
// See https://github.com/elastic/apm-server/issues/13898.
29+
//
30+
// It was fixed by defaulting data stream management to DSL, and eventually
31+
// reverted back to ILM in 8.17. Therefore, data streams created in 8.15 and
32+
// 8.16 are managed by DSL instead of ILM.
33+
2634
func TestUpgrade_8_15_to_8_16_Snapshot(t *testing.T) {
2735
t.Parallel()
2836

@@ -52,8 +60,8 @@ func TestUpgrade_8_15_to_8_16_BC(t *testing.T) {
5260
t.Parallel()
5361

5462
scenarios := basicUpgradeLazyRolloverDSLTestScenarios(
55-
getLatestVersion(t, "8.15"),
56-
getBCVersionOrSkip(t, "8.16"),
63+
getLatestVersionOrSkip(t, "8.15"),
64+
getLatestBCOrSkip(t, "8.16"),
5765
[]types.Query{
5866
tlsHandshakeError,
5967
esReturnedUnknown503,

0 commit comments

Comments
 (0)