Skip to content

Commit 930cb95

Browse files
michel-latermanmichel-laterman
authored
Merge branch 'main' into update-beats-main
2 parents 8ec7466 + c3b3b14 commit 930cb95

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎.package-version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"version": "9.4.0-SNAPSHOT",
3-
"build_id": "9.4.0-8c1b6467",
4-
"manifest_url": "https://snapshots.elastic.co/9.4.0-8c1b6467/manifest-9.4.0-SNAPSHOT.json",
5-
"summary_url": "https://snapshots.elastic.co/9.4.0-8c1b6467/summary-9.4.0-SNAPSHOT.html",
3+
"build_id": "9.4.0-2f95e9c5",
4+
"manifest_url": "https://snapshots.elastic.co/9.4.0-2f95e9c5/manifest-9.4.0-SNAPSHOT.json",
5+
"summary_url": "https://snapshots.elastic.co/9.4.0-2f95e9c5/summary-9.4.0-SNAPSHOT.html",
66
"core_version": "9.4.0",
77
"stack_version": "9.4.0-SNAPSHOT",
8-
"stack_build_id": "9.4.0-8c1b6467-SNAPSHOT"
8+
"stack_build_id": "9.4.0-2f95e9c5-SNAPSHOT"
99
}

‎NOTICE-fips.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,11 +810,11 @@ License Version 2.0.
810810

811811
--------------------------------------------------------------------------------
812812
Dependency : github.com/elastic/elastic-agent-autodiscover
813-
Version: v0.10.0
813+
Version: v0.10.2
814814
Licence type (autodetected): Apache-2.0
815815
--------------------------------------------------------------------------------
816816

817-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.10.0/LICENSE:
817+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.10.2/LICENSE:
818818

819819
Apache License
820820
Version 2.0, January 2004

‎NOTICE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,11 +810,11 @@ License Version 2.0.
810810

811811
--------------------------------------------------------------------------------
812812
Dependency : github.com/elastic/elastic-agent-autodiscover
813-
Version: v0.10.0
813+
Version: v0.10.2
814814
Licence type (autodetected): Apache-2.0
815815
--------------------------------------------------------------------------------
816816

817-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.10.0/LICENSE:
817+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.10.2/LICENSE:
818818

819819
Apache License
820820
Version 2.0, January 2004

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
1919
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20260212163732-f7b7d2060abb
2020
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
21-
github.com/elastic/elastic-agent-autodiscover v0.10.0
21+
github.com/elastic/elastic-agent-autodiscover v0.10.2
2222
github.com/elastic/elastic-agent-client/v7 v7.18.0
2323
github.com/elastic/elastic-agent-libs v0.32.2
2424
github.com/elastic/elastic-agent-system-metrics v0.14.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s
167167
github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
168168
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
169169
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
170-
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
171-
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
170+
github.com/elastic/elastic-agent-autodiscover v0.10.2 h1:fzi+CIcK7FKUQlQHfKP+3Ixg1wbuEYacaChunmMAP38=
171+
github.com/elastic/elastic-agent-autodiscover v0.10.2/go.mod h1:qBoYxp3lX3qFRYjEgsOaROC+xL4ItG63GSvOg1SjjsQ=
172172
github.com/elastic/elastic-agent-client/v7 v7.18.0 h1:zXdoErqECfvRjj1c+1Ko4VGuUnFtJfTiC9JJz4aQCHc=
173173
github.com/elastic/elastic-agent-client/v7 v7.18.0/go.mod h1:ChFjpIfSsQOnhWT3se5Euw/o8P4Vf77FxeObE/vUfSc=
174174
github.com/elastic/elastic-agent-libs v0.32.2 h1:2CaO4TAMcZDy0qNxh48Ui1oMc+xExKL+JkpcyOxF7XA=

‎internal/edot/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ require (
341341
github.com/edsrzf/mmap-go v1.2.0 // indirect
342342
github.com/elastic/apm-data v1.19.5 // indirect
343343
github.com/elastic/bayeux v1.0.5 // indirect
344-
github.com/elastic/elastic-agent-autodiscover v0.10.0 // indirect
344+
github.com/elastic/elastic-agent-autodiscover v0.10.2 // indirect
345345
github.com/elastic/elastic-agent-client/v7 v7.18.0 // indirect
346346
github.com/elastic/elastic-agent-system-metrics v0.14.1 // indirect
347347
github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect

‎internal/edot/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
444444
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
445445
github.com/elastic/ebpfevents v0.8.0 h1:rIrhj3SSsrwSOIv/MderZd0ZpbCLT4pudBtfnAbj3Oo=
446446
github.com/elastic/ebpfevents v0.8.0/go.mod h1:b6nLyQ8SA1RolRkP/nyGN6VAKqIObSJj8c2mhDGoNmg=
447-
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
448-
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
447+
github.com/elastic/elastic-agent-autodiscover v0.10.2 h1:fzi+CIcK7FKUQlQHfKP+3Ixg1wbuEYacaChunmMAP38=
448+
github.com/elastic/elastic-agent-autodiscover v0.10.2/go.mod h1:qBoYxp3lX3qFRYjEgsOaROC+xL4ItG63GSvOg1SjjsQ=
449449
github.com/elastic/elastic-agent-client/v7 v7.18.0 h1:zXdoErqECfvRjj1c+1Ko4VGuUnFtJfTiC9JJz4aQCHc=
450450
github.com/elastic/elastic-agent-client/v7 v7.18.0/go.mod h1:ChFjpIfSsQOnhWT3se5Euw/o8P4Vf77FxeObE/vUfSc=
451451
github.com/elastic/elastic-agent-libs v0.32.2 h1:2CaO4TAMcZDy0qNxh48Ui1oMc+xExKL+JkpcyOxF7XA=

‎pkg/component/runtime/service_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ func TestCISKeepsRunningOnNonFatalExitCodeFromStart(t *testing.T) {
368368
}
369369

370370
return false
371-
}, 2*time.Second, 200*time.Millisecond)
371+
}, 30*time.Second, 1*time.Second)
372372
}
373373

374374
// TestServiceStartRetry tests that the service runtime will

0 commit comments

Comments
 (0)