Skip to content

Commit de7cdb5

Browse files
carsonipcarsonip
authored
Merge branch '9.2' into updatecli_9.2_updatecli-update-beats-9.2
2 parents 1877d13 + 9d95fa8 commit de7cdb5

File tree

8 files changed

+57
-57
lines changed

8 files changed

+57
-57
lines changed

‎NOTICE-fips.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,11 +3655,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
36553655

36563656
--------------------------------------------------------------------------------
36573657
Dependency : go.opentelemetry.io/collector/pdata
3658-
Version: v1.50.0
3658+
Version: v1.51.0
36593659
Licence type (autodetected): Apache-2.0
36603660
--------------------------------------------------------------------------------
36613661

3662-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.50.0/LICENSE:
3662+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.51.0/LICENSE:
36633663

36643664

36653665
Apache License
@@ -3867,11 +3867,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat
38673867

38683868
--------------------------------------------------------------------------------
38693869
Dependency : go.opentelemetry.io/otel
3870-
Version: v1.39.0
3870+
Version: v1.40.0
38713871
Licence type (autodetected): Apache-2.0
38723872
--------------------------------------------------------------------------------
38733873

3874-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.39.0/LICENSE:
3874+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.40.0/LICENSE:
38753875

38763876
Apache License
38773877
Version 2.0, January 2004
@@ -4107,11 +4107,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41074107

41084108
--------------------------------------------------------------------------------
41094109
Dependency : go.opentelemetry.io/otel/metric
4110-
Version: v1.39.0
4110+
Version: v1.40.0
41114111
Licence type (autodetected): Apache-2.0
41124112
--------------------------------------------------------------------------------
41134113

4114-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.39.0/LICENSE:
4114+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.40.0/LICENSE:
41154115

41164116
Apache License
41174117
Version 2.0, January 2004
@@ -4347,11 +4347,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43474347

43484348
--------------------------------------------------------------------------------
43494349
Dependency : go.opentelemetry.io/otel/sdk
4350-
Version: v1.39.0
4350+
Version: v1.40.0
43514351
Licence type (autodetected): Apache-2.0
43524352
--------------------------------------------------------------------------------
43534353

4354-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.39.0/LICENSE:
4354+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.40.0/LICENSE:
43554355

43564356
Apache License
43574357
Version 2.0, January 2004
@@ -4587,11 +4587,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
45874587

45884588
--------------------------------------------------------------------------------
45894589
Dependency : go.opentelemetry.io/otel/sdk/metric
4590-
Version: v1.39.0
4590+
Version: v1.40.0
45914591
Licence type (autodetected): Apache-2.0
45924592
--------------------------------------------------------------------------------
45934593

4594-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.39.0/LICENSE:
4594+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.40.0/LICENSE:
45954595

45964596
Apache License
45974597
Version 2.0, January 2004
@@ -4827,11 +4827,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
48274827

48284828
--------------------------------------------------------------------------------
48294829
Dependency : go.opentelemetry.io/otel/trace
4830-
Version: v1.39.0
4830+
Version: v1.40.0
48314831
Licence type (autodetected): Apache-2.0
48324832
--------------------------------------------------------------------------------
48334833

4834-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.39.0/LICENSE:
4834+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.40.0/LICENSE:
48354835

48364836
Apache License
48374837
Version 2.0, January 2004
@@ -13445,11 +13445,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
1344513445

1344613446
--------------------------------------------------------------------------------
1344713447
Dependency : go.opentelemetry.io/collector/featuregate
13448-
Version: v1.50.0
13448+
Version: v1.51.0
1344913449
Licence type (autodetected): Apache-2.0
1345013450
--------------------------------------------------------------------------------
1345113451

13452-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/featuregate@v1.50.0/LICENSE:
13452+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/featuregate@v1.51.0/LICENSE:
1345313453

1345413454

1345513455
Apache License

‎NOTICE.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,11 +3655,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
36553655

36563656
--------------------------------------------------------------------------------
36573657
Dependency : go.opentelemetry.io/collector/pdata
3658-
Version: v1.50.0
3658+
Version: v1.51.0
36593659
Licence type (autodetected): Apache-2.0
36603660
--------------------------------------------------------------------------------
36613661

3662-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.50.0/LICENSE:
3662+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.51.0/LICENSE:
36633663

36643664

36653665
Apache License
@@ -3867,11 +3867,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat
38673867

38683868
--------------------------------------------------------------------------------
38693869
Dependency : go.opentelemetry.io/otel
3870-
Version: v1.39.0
3870+
Version: v1.40.0
38713871
Licence type (autodetected): Apache-2.0
38723872
--------------------------------------------------------------------------------
38733873

3874-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.39.0/LICENSE:
3874+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.40.0/LICENSE:
38753875

38763876
Apache License
38773877
Version 2.0, January 2004
@@ -4107,11 +4107,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41074107

41084108
--------------------------------------------------------------------------------
41094109
Dependency : go.opentelemetry.io/otel/metric
4110-
Version: v1.39.0
4110+
Version: v1.40.0
41114111
Licence type (autodetected): Apache-2.0
41124112
--------------------------------------------------------------------------------
41134113

4114-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.39.0/LICENSE:
4114+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.40.0/LICENSE:
41154115

41164116
Apache License
41174117
Version 2.0, January 2004
@@ -4347,11 +4347,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43474347

43484348
--------------------------------------------------------------------------------
43494349
Dependency : go.opentelemetry.io/otel/sdk
4350-
Version: v1.39.0
4350+
Version: v1.40.0
43514351
Licence type (autodetected): Apache-2.0
43524352
--------------------------------------------------------------------------------
43534353

4354-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.39.0/LICENSE:
4354+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.40.0/LICENSE:
43554355

43564356
Apache License
43574357
Version 2.0, January 2004
@@ -4587,11 +4587,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
45874587

45884588
--------------------------------------------------------------------------------
45894589
Dependency : go.opentelemetry.io/otel/sdk/metric
4590-
Version: v1.39.0
4590+
Version: v1.40.0
45914591
Licence type (autodetected): Apache-2.0
45924592
--------------------------------------------------------------------------------
45934593

4594-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.39.0/LICENSE:
4594+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.40.0/LICENSE:
45954595

45964596
Apache License
45974597
Version 2.0, January 2004
@@ -4827,11 +4827,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
48274827

48284828
--------------------------------------------------------------------------------
48294829
Dependency : go.opentelemetry.io/otel/trace
4830-
Version: v1.39.0
4830+
Version: v1.40.0
48314831
Licence type (autodetected): Apache-2.0
48324832
--------------------------------------------------------------------------------
48334833

4834-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.39.0/LICENSE:
4834+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.40.0/LICENSE:
48354835

48364836
Apache License
48374837
Version 2.0, January 2004
@@ -16398,11 +16398,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
1639816398

1639916399
--------------------------------------------------------------------------------
1640016400
Dependency : go.opentelemetry.io/collector/featuregate
16401-
Version: v1.50.0
16401+
Version: v1.51.0
1640216402
Licence type (autodetected): Apache-2.0
1640316403
--------------------------------------------------------------------------------
1640416404

16405-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/featuregate@v1.50.0/LICENSE:
16405+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/featuregate@v1.51.0/LICENSE:
1640616406

1640716407

1640816408
Apache License

‎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-wolfi:9.2.5-7c994a99-SNAPSHOT
13+
image: docker.elastic.co/elasticsearch/elasticsearch-wolfi:9.2.5-25ea015d-SNAPSHOT
1414
ports:
1515
- 9200:9200
1616
healthcheck:
@@ -40,7 +40,7 @@ services:
4040
logging: *default-logging
4141

4242
kibana:
43-
image: docker.elastic.co/kibana/kibana-wolfi:9.2.5-7c994a99-SNAPSHOT
43+
image: docker.elastic.co/kibana/kibana-wolfi:9.2.5-25ea015d-SNAPSHOT
4444
ports:
4545
- 5601:5601
4646
healthcheck:
@@ -59,7 +59,7 @@ services:
5959
logging: *default-logging
6060

6161
metricbeat:
62-
image: docker.elastic.co/beats/metricbeat:9.2.5-7c994a99-SNAPSHOT
62+
image: docker.elastic.co/beats/metricbeat:9.2.5-25ea015d-SNAPSHOT
6363
environment:
6464
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
6565
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ require (
3333
go.elastic.co/apm/module/apmotel/v2 v2.7.2
3434
go.elastic.co/apm/v2 v2.7.2
3535
go.elastic.co/fastjson v1.5.1
36-
go.opentelemetry.io/collector/pdata v1.50.0
37-
go.opentelemetry.io/otel v1.39.0
38-
go.opentelemetry.io/otel/metric v1.39.0
39-
go.opentelemetry.io/otel/sdk v1.39.0
40-
go.opentelemetry.io/otel/sdk/metric v1.39.0
41-
go.opentelemetry.io/otel/trace v1.39.0
36+
go.opentelemetry.io/collector/pdata v1.51.0
37+
go.opentelemetry.io/otel v1.40.0
38+
go.opentelemetry.io/otel/metric v1.40.0
39+
go.opentelemetry.io/otel/sdk v1.40.0
40+
go.opentelemetry.io/otel/sdk/metric v1.40.0
41+
go.opentelemetry.io/otel/trace v1.40.0
4242
go.opentelemetry.io/proto/otlp v1.9.0
4343
go.uber.org/zap v1.27.1
4444
go.uber.org/zap/exp v0.3.0
@@ -230,7 +230,7 @@ require (
230230
go.elastic.co/go-licence-detector v0.7.0 // indirect
231231
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
232232
go.opentelemetry.io/collector/consumer v1.50.0 // indirect
233-
go.opentelemetry.io/collector/featuregate v1.50.0 // indirect
233+
go.opentelemetry.io/collector/featuregate v1.51.0 // indirect
234234
go.uber.org/multierr v1.11.0 // indirect
235235
go.yaml.in/yaml/v2 v2.4.3 // indirect
236236
go.yaml.in/yaml/v3 v3.0.4 // indirect

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -660,24 +660,24 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
660660
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
661661
go.opentelemetry.io/collector/consumer v1.50.0 h1:Sxbue3zNH3IJla+vUyMXEiomfRJaS6wemZd4qv5na48=
662662
go.opentelemetry.io/collector/consumer v1.50.0/go.mod h1:GB6gfWsZyeTBWn+Cb3ITkJaH4aA5NW0r2Dm+VLFnD/M=
663-
go.opentelemetry.io/collector/featuregate v1.50.0 h1:nROGw8VpLuc2/PExnL6ammUpr2y7pozpbwgae6zU4s0=
664-
go.opentelemetry.io/collector/featuregate v1.50.0/go.mod h1:/1bclXgP91pISaEeNulRxzzmzMTm4I5Xih2SnI4HRSo=
665-
go.opentelemetry.io/collector/internal/testutil v0.144.0 h1:lSI9FBQI21eAxJ/L52pAYxsvKhU5dm9HqXGnKp8XAes=
666-
go.opentelemetry.io/collector/internal/testutil v0.144.0/go.mod h1:YAD9EAkwh/l5asZNbEBEUCqEjoL1OKMjAMoPjPqH76c=
667-
go.opentelemetry.io/collector/pdata v1.50.0 h1:vES5c9jT9HzOhHEg1OIjPxk4qKIjA+Dao8dxU3oePU0=
668-
go.opentelemetry.io/collector/pdata v1.50.0/go.mod h1:G18lFpQYh4473PiEPqLd7BKfc8a/j+Fl4EfHWy1Ylx8=
663+
go.opentelemetry.io/collector/featuregate v1.51.0 h1:dxJuv/3T84dhNKp7fz5+8srHz1dhquGzDpLW4OZTFBw=
664+
go.opentelemetry.io/collector/featuregate v1.51.0/go.mod h1:/1bclXgP91pISaEeNulRxzzmzMTm4I5Xih2SnI4HRSo=
665+
go.opentelemetry.io/collector/internal/testutil v0.145.0 h1:H/KL0GH3kGqSMKxZvnQ0B0CulfO9xdTg4DZf28uV7fY=
666+
go.opentelemetry.io/collector/internal/testutil v0.145.0/go.mod h1:YAD9EAkwh/l5asZNbEBEUCqEjoL1OKMjAMoPjPqH76c=
667+
go.opentelemetry.io/collector/pdata v1.51.0 h1:DnDhSEuDXNdzGRB7f6oOfXpbDApwBX3tY+3K69oUrDA=
668+
go.opentelemetry.io/collector/pdata v1.51.0/go.mod h1:GoX1bjKDR++mgFKdT7Hynv9+mdgQ1DDXbjs7/Ww209Q=
669669
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y=
670670
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ=
671-
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
672-
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
673-
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
674-
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
675-
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
676-
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
677-
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
678-
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
679-
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
680-
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
671+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
672+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
673+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
674+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
675+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
676+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
677+
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
678+
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
679+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
680+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
681681
go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
682682
go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
683683
go.opentelemetry.io/proto/slim/otlp v1.9.0 h1:fPVMv8tP3TrsqlkH1HWYUpbCY9cAIemx184VGkS6vlE=

‎testing/infra/k8s/base/stack/apm-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: apm-server
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.2.5-7c994a99-SNAPSHOT
7+
version: 9.2.5-25ea015d-SNAPSHOT
88
count: 1
99
http:
1010
tls:

‎testing/infra/k8s/base/stack/elasticsearch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: elasticsearch
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.2.5-7c994a99-SNAPSHOT
7+
version: 9.2.5-25ea015d-SNAPSHOT
88
auth:
99
fileRealm:
1010
- secretName: elasticsearch-admin

‎testing/infra/k8s/base/stack/kibana.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: kibana
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.2.5-7c994a99-SNAPSHOT
7+
version: 9.2.5-25ea015d-SNAPSHOT
88
count: 1
99
elasticsearchRef:
1010
name: elasticsearch

0 commit comments

Comments
 (0)