Skip to content

Commit f8b4739

Browse files
andrzej-stencelandrzej-stencel
committed
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.135.0
2 parents e3b3d2a + 6918b7b commit f8b4739

File tree

16 files changed

+115
-168
lines changed

16 files changed

+115
-168
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1757120457"
88
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1757120457"
99
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1757120457"
10+
ASDF_TERRAFORM_VERSION: 1.9.2
1011

1112
# This section is used to define the plugins that will be used in the pipeline.
1213
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -21,7 +22,6 @@ steps:
2122
- label: Start ESS stack for FIPS integration tests
2223
key: integration-fips-ess
2324
env:
24-
ASDF_TERRAFORM_VERSION: 1.9.2
2525
FIPS: "true"
2626
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
2727
ESS_REGION: "us-gov-east-1"
@@ -127,6 +127,13 @@ steps:
127127
- label: ESS FIPS stack cleanup
128128
depends_on:
129129
- integration-tests-ubuntu-fips
130+
env:
131+
FIPS: "true"
132+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
133+
ESS_REGION: "us-gov-east-1"
134+
TF_VAR_deployment_template_id: "aws-general-purpose"
135+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
136+
TF_VAR_docker_images_name_suffix: "-fips"
130137
allow_dependency_failure: true
131138
command: |
132139
buildkite-agent artifact download "test_infra/ess/**" . --step "integration-fips-ess"

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1757120457"
1313
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1757120457"
1414
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1757120457"
15+
ASDF_TERRAFORM_VERSION: 1.9.2
1516

1617
# This section is used to define the plugins that will be used in the pipeline.
1718
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -74,8 +75,6 @@ steps:
7475
notify:
7576
- github_commit_status:
7677
context: "buildkite/elastic-agent-extended-testing - ESS stack provision"
77-
env:
78-
ASDF_TERRAFORM_VERSION: 1.9.2
7978
command: .buildkite/scripts/steps/ess_start.sh
8079
retry:
8180
automatic:

‎.buildkite/scripts/steps/ess.ps1‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ function ess_up {
4040
}
4141

4242
function ess_down {
43+
param (
44+
[string]$EssRegion = "gcp-us-west2"
45+
)
4346
$Workspace = & git rev-parse --show-toplevel
4447
$TfDir = Join-Path -Path $Workspace -ChildPath "test_infra/ess/"
4548
$stateFilePath = Join-Path -Path $TfDir -ChildPath "terraform.tfstate"
@@ -52,7 +55,8 @@ function ess_down {
5255
try {
5356
Push-Location -Path $TfDir
5457
& terraform init
55-
& terraform destroy -auto-approve
58+
& terraform destroy -auto-approve `
59+
-var="ess_region=$EssRegion"
5660
Pop-Location
5761
} catch {
5862
Write-Output "Error: Failed to destroy ESS stack(it will be auto-deleted later): $_"

‎.buildkite/scripts/steps/ess.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ function ess_up() {
4040
}
4141

4242
function ess_down() {
43-
echo "~~~ Tearing down the ESS Stack"
43+
echo "~~~ Tearing down the ESS Stack"
44+
local ESS_REGION=${1:-"gcp-us-west2"}
4445
local WORKSPACE=$(git rev-parse --show-toplevel)
4546
local TF_DIR="${WORKSPACE}/test_infra/ess/"
4647

4748
pushd "${TF_DIR}"
4849
terraform init
49-
terraform destroy -auto-approve
50+
terraform destroy -auto-approve \
51+
-var="ess_region=${ESS_REGION}"
5052
popd
5153
}
5254

‎.buildkite/scripts/steps/ess_down.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ set -euo pipefail
33

44
source .buildkite/scripts/steps/ess.sh
55

6-
ess_down || echo "Failed to stop ESS stack" >&2
6+
ESS_REGION="${ESS_REGION:-gcp-us-west2}"
7+
8+
ess_down "$ESS_REGION"

‎.package-version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"version": "9.2.0-SNAPSHOT",
3-
"build_id": "9.2.0-f1c053c2",
4-
"manifest_url": "https://snapshots.elastic.co/9.2.0-f1c053c2/manifest-9.2.0-SNAPSHOT.json",
5-
"summary_url": "https://snapshots.elastic.co/9.2.0-f1c053c2/summary-9.2.0-SNAPSHOT.html",
3+
"build_id": "9.2.0-98714004",
4+
"manifest_url": "https://snapshots.elastic.co/9.2.0-98714004/manifest-9.2.0-SNAPSHOT.json",
5+
"summary_url": "https://snapshots.elastic.co/9.2.0-98714004/summary-9.2.0-SNAPSHOT.html",
66
"core_version": "9.2.0",
7-
"stack_build_id": "9.2.0-f1c053c2-SNAPSHOT"
7+
"stack_build_id": "9.2.0-98714004-SNAPSHOT"
88
}

‎NOTICE-fips.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250908223557-b5d1aa207013
790+
Version: v7.0.0-alpha2.0.20250909200115-6de60d5f9d88
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250908223557-b5d1aa207013/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250909200115-6de60d5f9d88/LICENSE.txt:
795795

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

25222522
--------------------------------------------------------------------------------
25232523
Dependency : github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
2524-
Version: v0.6.0
2524+
Version: v0.7.0
25252525
Licence type (autodetected): Apache-2.0
25262526
--------------------------------------------------------------------------------
25272527

2528-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector@v0.6.0/LICENSE:
2528+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector@v0.7.0/LICENSE:
25292529

25302530
Apache License
25312531
Version 2.0, January 2004
@@ -2732,11 +2732,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
27322732

27332733
--------------------------------------------------------------------------------
27342734
Dependency : github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
2735-
Version: v0.3.0
2735+
Version: v0.5.0
27362736
Licence type (autodetected): Apache-2.0
27372737
--------------------------------------------------------------------------------
27382738

2739-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension@v0.3.0/LICENSE:
2739+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension@v0.5.0/LICENSE:
27402740

27412741
Apache License
27422742
Version 2.0, January 2004
@@ -2943,11 +2943,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
29432943

29442944
--------------------------------------------------------------------------------
29452945
Dependency : github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
2946-
Version: v0.6.0
2946+
Version: v0.7.0
29472947
Licence type (autodetected): Apache-2.0
29482948
--------------------------------------------------------------------------------
29492949

2950-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension@v0.6.0/LICENSE:
2950+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension@v0.7.0/LICENSE:
29512951

29522952
Apache License
29532953
Version 2.0, January 2004
@@ -3154,11 +3154,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
31543154

31553155
--------------------------------------------------------------------------------
31563156
Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
3157-
Version: v0.16.0
3157+
Version: v0.17.0
31583158
Licence type (autodetected): Apache-2.0
31593159
--------------------------------------------------------------------------------
31603160

3161-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.16.0/LICENSE:
3161+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.17.0/LICENSE:
31623162

31633163
Apache License
31643164
Version 2.0, January 2004
@@ -3365,11 +3365,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
33653365

33663366
--------------------------------------------------------------------------------
33673367
Dependency : github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
3368-
Version: v0.9.0
3368+
Version: v0.10.0
33693369
Licence type (autodetected): Apache-2.0
33703370
--------------------------------------------------------------------------------
33713371

3372-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor@v0.9.0/LICENSE:
3372+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor@v0.10.0/LICENSE:
33733373

33743374
Apache License
33753375
Version 2.0, January 2004
@@ -3576,11 +3576,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
35763576

35773577
--------------------------------------------------------------------------------
35783578
Dependency : github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver
3579-
Version: v0.2.1
3579+
Version: v0.3.0
35803580
Licence type (autodetected): Apache-2.0
35813581
--------------------------------------------------------------------------------
35823582

3583-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver@v0.2.1/LICENSE:
3583+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver@v0.3.0/LICENSE:
35843584

35853585
Apache License
35863586
Version 2.0, January 2004
@@ -58255,11 +58255,11 @@ SOFTWARE.
5825558255

5825658256
--------------------------------------------------------------------------------
5825758257
Dependency : github.com/microsoft/wmi
58258-
Version: v0.25.1
58258+
Version: v0.34.0
5825958259
Licence type (autodetected): MIT
5826058260
--------------------------------------------------------------------------------
5826158261

58262-
Contents of probable licence file $GOMODCACHE/github.com/microsoft/wmi@v0.25.1/LICENSE:
58262+
Contents of probable licence file $GOMODCACHE/github.com/microsoft/wmi@v0.34.0/LICENSE:
5826358263

5826458264
MIT License
5826558265

‎NOTICE.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250908223557-b5d1aa207013
790+
Version: v7.0.0-alpha2.0.20250909200115-6de60d5f9d88
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250908223557-b5d1aa207013/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250909200115-6de60d5f9d88/LICENSE.txt:
795795

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

25222522
--------------------------------------------------------------------------------
25232523
Dependency : github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector
2524-
Version: v0.6.0
2524+
Version: v0.7.0
25252525
Licence type (autodetected): Apache-2.0
25262526
--------------------------------------------------------------------------------
25272527

2528-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector@v0.6.0/LICENSE:
2528+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector@v0.7.0/LICENSE:
25292529

25302530
Apache License
25312531
Version 2.0, January 2004
@@ -2732,11 +2732,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
27322732

27332733
--------------------------------------------------------------------------------
27342734
Dependency : github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension
2735-
Version: v0.3.0
2735+
Version: v0.5.0
27362736
Licence type (autodetected): Apache-2.0
27372737
--------------------------------------------------------------------------------
27382738

2739-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension@v0.3.0/LICENSE:
2739+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension@v0.5.0/LICENSE:
27402740

27412741
Apache License
27422742
Version 2.0, January 2004
@@ -2943,11 +2943,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
29432943

29442944
--------------------------------------------------------------------------------
29452945
Dependency : github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension
2946-
Version: v0.6.0
2946+
Version: v0.7.0
29472947
Licence type (autodetected): Apache-2.0
29482948
--------------------------------------------------------------------------------
29492949

2950-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension@v0.6.0/LICENSE:
2950+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension@v0.7.0/LICENSE:
29512951

29522952
Apache License
29532953
Version 2.0, January 2004
@@ -3154,11 +3154,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
31543154

31553155
--------------------------------------------------------------------------------
31563156
Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
3157-
Version: v0.16.0
3157+
Version: v0.17.0
31583158
Licence type (autodetected): Apache-2.0
31593159
--------------------------------------------------------------------------------
31603160

3161-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.16.0/LICENSE:
3161+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.17.0/LICENSE:
31623162

31633163
Apache License
31643164
Version 2.0, January 2004
@@ -3365,11 +3365,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
33653365

33663366
--------------------------------------------------------------------------------
33673367
Dependency : github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor
3368-
Version: v0.9.0
3368+
Version: v0.10.0
33693369
Licence type (autodetected): Apache-2.0
33703370
--------------------------------------------------------------------------------
33713371

3372-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor@v0.9.0/LICENSE:
3372+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor@v0.10.0/LICENSE:
33733373

33743374
Apache License
33753375
Version 2.0, January 2004
@@ -3576,11 +3576,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
35763576

35773577
--------------------------------------------------------------------------------
35783578
Dependency : github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver
3579-
Version: v0.2.1
3579+
Version: v0.3.0
35803580
Licence type (autodetected): Apache-2.0
35813581
--------------------------------------------------------------------------------
35823582

3583-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver@v0.2.1/LICENSE:
3583+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver@v0.3.0/LICENSE:
35843584

35853585
Apache License
35863586
Version 2.0, January 2004
@@ -64178,11 +64178,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6417864178

6417964179
--------------------------------------------------------------------------------
6418064180
Dependency : github.com/microsoft/wmi
64181-
Version: v0.25.1
64181+
Version: v0.34.0
6418264182
Licence type (autodetected): MIT
6418364183
--------------------------------------------------------------------------------
6418464184

64185-
Contents of probable licence file $GOMODCACHE/github.com/microsoft/wmi@v0.25.1/LICENSE:
64185+
Contents of probable licence file $GOMODCACHE/github.com/microsoft/wmi@v0.34.0/LICENSE:
6418664186

6418764187
MIT License
6418864188

‎deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -626,12 +626,12 @@ instrumentation:
626626
type: parentbased_traceidratio # Sampler type
627627
argument: "1.0" # Sampling rate set to 100% (all traces are sampled).
628628
java:
629-
image: docker.elastic.co/observability/elastic-otel-javaagent:1.4.1
629+
image: docker.elastic.co/observability/elastic-otel-javaagent:1.5.0
630630
nodejs:
631-
image: docker.elastic.co/observability/elastic-otel-node:1.1.1
631+
image: docker.elastic.co/observability/elastic-otel-node:1.3.0
632632
dotnet:
633633
image: docker.elastic.co/observability/elastic-otel-dotnet:1.1.0
634634
python:
635-
image: docker.elastic.co/observability/elastic-otel-python:1.3.0
635+
image: docker.elastic.co/observability/elastic-otel-python:1.7.0
636636
go:
637-
image: ghcr.io/open-telemetry/opentelemetry-go-instrumentation/autoinstrumentation-go:v0.22.0
637+
image: ghcr.io/open-telemetry/opentelemetry-go-instrumentation/autoinstrumentation-go:v0.22.1

‎deploy/helm/edot-collector/kube-stack/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,12 +603,12 @@ instrumentation:
603603
type: parentbased_traceidratio # Sampler type
604604
argument: "1.0" # Sampling rate set to 100% (all traces are sampled).
605605
java:
606-
image: docker.elastic.co/observability/elastic-otel-javaagent:1.4.1
606+
image: docker.elastic.co/observability/elastic-otel-javaagent:1.5.0
607607
nodejs:
608-
image: docker.elastic.co/observability/elastic-otel-node:1.1.1
608+
image: docker.elastic.co/observability/elastic-otel-node:1.3.0
609609
dotnet:
610610
image: docker.elastic.co/observability/elastic-otel-dotnet:1.1.0
611611
python:
612-
image: docker.elastic.co/observability/elastic-otel-python:1.3.0
612+
image: docker.elastic.co/observability/elastic-otel-python:1.7.0
613613
go:
614-
image: ghcr.io/open-telemetry/opentelemetry-go-instrumentation/autoinstrumentation-go:v0.22.0
614+
image: ghcr.io/open-telemetry/opentelemetry-go-instrumentation/autoinstrumentation-go:v0.22.1

0 commit comments

Comments
 (0)