Skip to content

Commit 79f9379

Browse files
kruskallkruskall
authored
Merge branch 'main' into feat/automemlimit
2 parents 958665c + 6b12e56 commit 79f9379

File tree

11 files changed

+52
-42
lines changed

11 files changed

+52
-42
lines changed

‎NOTICE.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -604,11 +604,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].
604604

605605
--------------------------------------------------------------------------------
606606
Dependency : github.com/elastic/beats/v7
607-
Version: v7.0.0-alpha2.0.20241209155817-da6822b047ab
607+
Version: v7.0.0-alpha2.0.20241210120922-dbeb9cda9362
608608
Licence type (autodetected): Elastic
609609
--------------------------------------------------------------------------------
610610

611-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20241209155817-da6822b047ab/LICENSE.txt:
611+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20241210120922-dbeb9cda9362/LICENSE.txt:
612612

613613
Source code in this repository is variously licensed under the Apache License
614614
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -1493,11 +1493,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LIC
14931493

14941494
--------------------------------------------------------------------------------
14951495
Dependency : github.com/elastic/go-docappender/v2
1496-
Version: v2.3.1
1496+
Version: v2.3.2
14971497
Licence type (autodetected): Apache-2.0
14981498
--------------------------------------------------------------------------------
14991499

1500-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/[email protected].1/LICENSE:
1500+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/[email protected].2/LICENSE:
15011501

15021502
Apache License
15031503
Version 2.0, January 2004

‎dev_docs/RELEASES.md

+15-10
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ For patch releases, only the version on the existing major and minor version bra
1717

1818
* Trigger release workflow manually
1919
* For **patch releases**: run the [`run-patch-release`](https://github.com/elastic/apm-server/actions/workflows/run-patch-release.yml) workflow (In "Use workflow from", select `main` branch. Then in "The version", specify the **upcoming** patch release version - es: on `8.14.2` feature freeze you will use `8.14.2`).
20-
This workflow will: create the release branch; update version across codebase; commit and create PR targeting the release branch.
21-
Release notes for patch releases **must be manually added** (PR should target `main` branch and backported to the release branch):
20+
This workflow will: create the `update-<VERSION>` branch, update version constants across the codebase and create a PR targeting the release branch.
21+
Release notes for patch releases **must be manually added** at least one day before release.
22+
Create a PR targeting the `main` branch and add the backport label for the release branch.
23+
To add release notes:
2224
* Add a new section to the existing release notes file ([Sample PR](https://github.com/elastic/apm-server/pull/12680)).
2325
* Review the [changelogs/head](https://github.com/elastic/apm-server/tree/main/changelogs/head.asciidoc) file and move relevant changelog entries from `head.asciidoc` to `release_version.asciidoc` if the change is backported to release_version. If changes do not apply to the version being released, keep them in the `head.asciidoc` file.
2426
* Review the commits in the release to ensure all changes are reflected in the release notes. Check for backported changes without release notes in `release_version.asciidoc`.
25-
* Add your PR to the documentation release issue ([Sample Issue](https://github.com/elastic/dev/issues/2485)).
27+
* Add your PR to the documentation release issue in the [`elastic/dev`](https://github.com/elastic/dev/issues?q=is%3Aissue%20state%3Aopen%20label%3Adocs) repo ([Sample Issue](https://github.com/elastic/dev/issues/2485)).
2628
* The PR should be merged the day before release.
27-
* For **minor releases**: run the [`run-minor-release`](https://github.com/elastic/apm-server/actions/workflows/run-minor-release.yml) workflow (In "Use workflow from", select `main` branch. Then in "The version", specify the minor release version the release is for).
28-
This workflow will: create the release branch; update the changelog for the release branch and open a PR targeting the release branch titled `<major>.<minor>: update docs`; create a PR on `main` titled `<major>.<minor>: update docs, mergify, versions and changelogs`. Before merging them compare commits between latest minor and the new minor versions and ensure all relevant PRs have been included in the Changelog. If not, amend it in both PRs. Request and wait a PR review from the team before merging.
29+
* For **minor releases**: run the [`run-minor-release`](https://github.com/elastic/apm-server/actions/workflows/run-minor-release.yml) workflow (In "Use workflow from", select `main` branch. Then in "The version", specify the minor release version the release is for).
30+
This workflow will: create a new release branch using the stack version (X.Y); update the changelog for the release branch and open a PR targeting the release branch titled `<major>.<minor>: update docs`; create a PR on `main` titled `<major>.<minor>: update docs, mergify, versions and changelogs`. Before merging them compare commits between latest minor and the new minor versions and ensure all relevant PRs have been included in the Changelog. If not, amend it in both PRs. Request and wait a PR review from the team before merging.
2931
* The Release Manager will ping the team to align the release process
3032

3133
* Update dependencies
@@ -49,8 +51,8 @@ For patch releases, only the version on the existing major and minor version bra
4951
* A link to all PRs in the APM Server repository that need to be tested manually to create an overview over the PRs that need testing.
5052
Use the `test-plan` label and the version label (create it if it does not exist). For example, [this was 8.13.0 test plan](https://github.com/elastic/apm-server/issues/12822)
5153
and here you can find [all previous test plans](https://github.com/elastic/apm-server/issues?q=label%3Atest-plan+is%3Aclosed).
52-
What we aim for is testing all functional changes applied to the new version. Review any PR updating `elastic/go-docappender` and `elastic/apm-data` dependencies, as some functional changes happens through these dependencies.
53-
Any non-functional change or any change that is already covered by automated tests must not be included.
54+
What we aim for is testing all functional changes applied to the new version. Review any PR updating `elastic/go-docappender` and `elastic/apm-data` dependencies, as some functional changes happens through these dependencies.
55+
Any non-functional change or any change already covered by automated tests must not be included.
5456
* Add other test cases that require manual testing, such as test scenarios on ESS, that are not covered by automated tests or OS compatibility smoke tests for supporting new operating systems.
5557

5658
## Between feature freeze and release
@@ -68,11 +70,14 @@ For patch releases, only the version on the existing major and minor version bra
6870

6971
## On release day
7072

71-
* New branches need to be added to `conf.yml` in the `elastic/docs` repo. [Example](https://github.com/elastic/docs/pull/893/files#diff-4a701a5adb4359c6abf9b8e1cb38819fR925). **This is handled by the docs release manager.**
73+
* For **minor releases**: new branches need to be added to `conf.yml` in the `elastic/docs` repo. [Example](https://github.com/elastic/docs/pull/893/files#diff-4a701a5adb4359c6abf9b8e1cb38819fR925). **This is handled by the docs release manager.**
7274

73-
* A new [tag](https://github.com/elastic/apm-server/releases) will automatically be created on GitHub.
75+
* For **patch releases**: if there is an open PR that bumps the version, merge the PR (it may have been created by the GitHub workflow as part of the steps in the ["Day after feature freeze"](#day-after-feature-freeze) section).
76+
If there is no PR, create one.
77+
> [!IMPORTANT]
78+
> Only merge the PRs once pinged on Slack by the Release Manager on release date in the #mission-control channel
7479
75-
* Bump the version in anticipation of the next release, e.g. [after 8.13.3 release](https://github.com/elastic/apm-server/pull/13066) bump to 8.13.4. **Prepare this PR ahead of time** but only merge it once pinged by the Release Manager on release date.
80+
* A new [tag](https://github.com/elastic/apm-server/releases) will automatically be created on GitHub.
7681

7782
## When compatibility between Agents & Server changes
7883

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ require (
99
github.com/dustin/go-humanize v1.0.1
1010
github.com/elastic/apm-aggregation v1.1.0
1111
github.com/elastic/apm-data v1.14.3
12-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209155817-da6822b047ab
12+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241210120922-dbeb9cda9362
1313
github.com/elastic/elastic-agent-client/v7 v7.17.0
1414
github.com/elastic/elastic-agent-libs v0.17.4
1515
github.com/elastic/elastic-agent-system-metrics v0.11.4
1616
github.com/elastic/gmux v0.3.2
17-
github.com/elastic/go-docappender/v2 v2.3.1
17+
github.com/elastic/go-docappender/v2 v2.3.2
1818
github.com/elastic/go-elasticsearch/v8 v8.16.0
1919
github.com/elastic/go-sysinfo v1.15.0
2020
github.com/elastic/go-ucfg v0.8.8

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ github.com/elastic/apm-aggregation v1.1.0 h1:eTHGd5w99JoRFJ763MJP6nUX4hkkeSil3KW
136136
github.com/elastic/apm-aggregation v1.1.0/go.mod h1:YBQ77Jt7vOy2/7w4q5SsEifhc0V02dJxRcyyeC6HsvQ=
137137
github.com/elastic/apm-data v1.14.3 h1:06Doyv3pvR5ErjEcANJ1s3Mui+poo8qWFCICtb+UKM0=
138138
github.com/elastic/apm-data v1.14.3/go.mod h1:E9ivkvpT7z4jT5F8LTQIRllfK1GqN3qqpnLkcdXwX0c=
139-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209155817-da6822b047ab h1:7MYZNb2otoOobLtUnE1GXrqR4kFS645OWTIsFM6FUn4=
140-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241209155817-da6822b047ab/go.mod h1:FyVoWNdi9A85gOud6qreNDz0P8dUKNZhklLeLIw1STg=
139+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241210120922-dbeb9cda9362 h1:o4NmNjy0ktNmMAYmVgRXHE96d7kBEfimD07cGFy/N7s=
140+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241210120922-dbeb9cda9362/go.mod h1:FyVoWNdi9A85gOud6qreNDz0P8dUKNZhklLeLIw1STg=
141141
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
142142
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
143143
github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo=
@@ -150,8 +150,8 @@ github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHo
150150
github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
151151
github.com/elastic/gmux v0.3.2 h1:cb721R+fe/rt/jVNyBP5HDQsEwLD2wSKfPD2Sk6adDk=
152152
github.com/elastic/gmux v0.3.2/go.mod h1:OD6oYrno+SV3pyl1ArdWCjlExZ+FJOfoSaFqnFeldBQ=
153-
github.com/elastic/go-docappender/v2 v2.3.1 h1:aDbXvjMrzxsiFnYvAQhJxsvgzgGnPKR9GDmXWTwkBUI=
154-
github.com/elastic/go-docappender/v2 v2.3.1/go.mod h1:QxOoeU4ud7KzY3uh3pMdRcuDsun/t+HtNZDyjH2gByM=
153+
github.com/elastic/go-docappender/v2 v2.3.2 h1:FJhYgq2DpCaxGaZUquc75dauEzWTWOyWUESAA/h8SPY=
154+
github.com/elastic/go-docappender/v2 v2.3.2/go.mod h1:5URybRUfmexRMtM/lwvcIRLje3Gsrj15qiiLm41gDrc=
155155
github.com/elastic/go-elasticsearch/v8 v8.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE=
156156
github.com/elastic/go-elasticsearch/v8 v8.16.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
157157
github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4=

‎testing/benchmark/main.tf

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,23 @@ locals {
2626
build = var.BUILD_ID
2727
created_date = coalesce(var.CREATED_DATE, time_static.created_date.unix)
2828
}
29+
project = "apm-server-benchmarks"
2930
}
3031

3132
module "tags" {
3233
source = "../infra/terraform/modules/tags"
3334
# use the convention for team/shared owned resources if we are running in CI.
3435
# assume this is an individually owned resource otherwise.
35-
project = startswith(var.user_name, "benchci") ? "benchmarks" : var.user_name
36+
project = startswith(var.user_name, "benchci") ? local.project : "${local.project}-${var.user_name}"
3637
}
3738

3839
provider "ec" {}
3940

4041
provider "aws" {
4142
region = var.worker_region
43+
default_tags {
44+
tags = merge(local.ci_tags, module.tags.labels)
45+
}
4246
}
4347

4448
locals {

‎testing/infra/terraform/modules/rally_workers/main.tf

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
provider "google" {
2-
project = var.gcp_project
3-
region = var.gcp_region
2+
project = var.gcp_project
3+
region = var.gcp_region
4+
default_labels = module.tags
45
}
56

67
locals {

‎testing/infra/terraform/modules/soaktest_workers/main.tf

-4
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ resource "google_compute_instance" "worker" {
7272
access_config {}
7373
}
7474

75-
labels = merge(module.tags.labels, {
76-
workspace = terraform.workspace
77-
})
78-
7975
metadata = {
8076
ssh-keys = "${local.ssh_user_name}:${data.tls_public_key.worker_login.public_key_openssh}"
8177
}

‎testing/infra/terraform/modules/soaktest_workers/provider.tf

+4
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ provider "google" {
22
project = var.gcp_project
33
region = var.gcp_region
44
zone = var.gcp_zone
5+
6+
default_labels = merge(module.tags.labels, {
7+
workspace = terraform.workspace
8+
})
59
}

‎tools/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ require (
123123
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
124124
go.uber.org/multierr v1.11.0 // indirect
125125
go.uber.org/zap v1.27.0 // indirect
126-
golang.org/x/crypto v0.27.0 // indirect
126+
golang.org/x/crypto v0.31.0 // indirect
127127
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
128128
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
129129
golang.org/x/mod v0.21.0 // indirect
130130
golang.org/x/net v0.29.0 // indirect
131-
golang.org/x/sync v0.8.0 // indirect
132-
golang.org/x/sys v0.25.0 // indirect
133-
golang.org/x/term v0.24.0 // indirect
134-
golang.org/x/text v0.18.0 // indirect
131+
golang.org/x/sync v0.10.0 // indirect
132+
golang.org/x/sys v0.28.0 // indirect
133+
golang.org/x/term v0.27.0 // indirect
134+
golang.org/x/text v0.21.0 // indirect
135135
golang.org/x/tools v0.25.0 // indirect
136136
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
137137
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect

‎tools/go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIi
339339
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
340340
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
341341
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
342-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
343-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
342+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
343+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
344344
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
345345
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
346346
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
@@ -377,8 +377,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
377377
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
378378
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
379379
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
380-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
381-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
380+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
381+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
382382
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
383383
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
384384
golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -408,8 +408,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
408408
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
409409
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
410410
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
411-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
412-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
411+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
412+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
413413
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
414414
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
415415
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -422,8 +422,8 @@ golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
422422
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
423423
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
424424
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
425-
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
426-
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
425+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
426+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
427427
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
428428
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
429429
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -436,8 +436,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
436436
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
437437
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
438438
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
439-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
440-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
439+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
440+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
441441
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
442442
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
443443
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

‎x-pack/apm-server/default.pgo

4.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)