diff --git a/NOTICE.txt b/NOTICE.txt index 3c9bc576f5cf..5fba8382e632 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -15590,11 +15590,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.19.0/LI -------------------------------------------------------------------------------- Dependency : github.com/elastic/mock-es -Version: v0.0.0-20240712014503-e5b47ece0015 +Version: v0.0.0-20250530054253-8c3b6053f9b6 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/mock-es@v0.0.0-20240712014503-e5b47ece0015/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/mock-es@v0.0.0-20250530054253-8c3b6053f9b6/LICENSE: Copyright 2024 Elasticsearch B.V. @@ -27141,6 +27141,217 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/rece limitations under the License. +-------------------------------------------------------------------------------- +Dependency : go.opentelemetry.io/otel/sdk/metric +Version: v1.35.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.35.0/LICENSE: + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + -------------------------------------------------------------------------------- Dependency : go.uber.org/mock Version: v0.5.0 @@ -76169,217 +76380,6 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/log@v limitations under the License. --------------------------------------------------------------------------------- -Dependency : go.opentelemetry.io/otel/sdk/metric -Version: v1.35.0 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.35.0/LICENSE: - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/trace Version: v1.35.0 diff --git a/go.mod b/go.mod index b050611e3f9c..5ecbf7a82ac8 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,7 @@ require ( github.com/elastic/go-quark v0.3.0 github.com/elastic/go-sfdc v0.0.0-20241010131323-8e176480d727 github.com/elastic/mito v1.19.0 - github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015 + github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 github.com/elastic/sarama v1.19.1-0.20250603175145-7672917f26b6 github.com/elastic/tk-btf v0.2.0 github.com/elastic/toutoumomoma v0.0.0-20240626215117-76e39db18dfb @@ -228,6 +228,7 @@ require ( go.opentelemetry.io/collector/pipeline v0.122.0 go.opentelemetry.io/collector/receiver v0.121.0 go.opentelemetry.io/collector/receiver/receivertest v0.121.0 + go.opentelemetry.io/otel/sdk/metric v1.35.0 go.uber.org/mock v0.5.0 golang.org/x/term v0.32.0 google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a @@ -469,7 +470,6 @@ require ( go.opentelemetry.io/otel/metric v1.35.0 // indirect go.opentelemetry.io/otel/sdk v1.35.0 // indirect go.opentelemetry.io/otel/sdk/log v0.10.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect go.opentelemetry.io/otel/trace v1.35.0 // indirect go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/ratelimit v0.3.1 // indirect diff --git a/go.sum b/go.sum index 2d910ef00a4a..9fad7efecddd 100644 --- a/go.sum +++ b/go.sum @@ -404,8 +404,8 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/elastic/mito v1.19.0 h1:rrJ8GR6SniJ/KieB5j8kDTNf5vAIJOtKiAz4hcfP1LU= github.com/elastic/mito v1.19.0/go.mod h1:f+W7LJ18FGwjVGmbXlOLVYsAbuVAtqqMkgdh0Sf00W0= -github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015 h1:z8cC8GASpPo8yKlbnXI36HQ/BM9wYjhBPNbDjAWm0VU= -github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015/go.mod h1:qH9DX/Dmflz6EAtaks/+2SsdQzecVAKE174Zl66hk7E= +github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw= +github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0= github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA= github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0= github.com/elastic/sarama v1.19.1-0.20250603175145-7672917f26b6 h1:2COw7kzXkIyS4hKNUl5qw0KolrwncrY4VVNpngVNo8I= diff --git a/libbeat/tests/integration/elasticsearch_test.go b/libbeat/tests/integration/elasticsearch_test.go index d2576c816c7c..8f1295bf45d4 100644 --- a/libbeat/tests/integration/elasticsearch_test.go +++ b/libbeat/tests/integration/elasticsearch_test.go @@ -20,21 +20,19 @@ package integration import ( - "errors" + "context" "fmt" - "io" - "net/http" + "net/url" "os" "path/filepath" "testing" "time" - "github.com/gofrs/uuid/v5" - "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/require" + sdkmetric "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/metricdata" "github.com/elastic/elastic-agent-libs/testing/certutil" - "github.com/elastic/mock-es/pkg/api" ) var esCfg = ` @@ -51,7 +49,7 @@ queue.mem: output.elasticsearch: allow_older_versions: true hosts: - - "http://localhost:4242" + - "%s" backoff: init: 0.1s max: 0.2s @@ -59,10 +57,15 @@ output.elasticsearch: func TestESOutputRecoversFromNetworkError(t *testing.T) { mockbeat := NewBeat(t, "mockbeat", "../../libbeat.test") - mockbeat.WriteConfigFile(esCfg) - s, mr := startMockES(t, "localhost:4242") + s, esAddr, _, mr := StartMockES(t, ":4242", 0, 0, 0, 0, 0) + esURL, err := url.Parse(esAddr) + if err != nil { + t.Fatalf("cannot parse mockES URL: %s", err) + } + + mockbeat.WriteConfigFile(fmt.Sprintf(esCfg, esAddr)) mockbeat.Start() // 1. Wait for one _bulk call @@ -75,21 +78,22 @@ func TestESOutputRecoversFromNetworkError(t *testing.T) { // 3. Wait for connection error logs mockbeat.WaitForLogs( - `Get \"http://localhost:4242\": dial tcp 127.0.0.1:4242: connect: connection refused`, + fmt.Sprintf(`Get \"%s\": dial tcp %s: connect: connection refused`, esAddr, esURL.Host), + 2*time.Second, "did not find connection refused error") mockbeat.WaitForLogs( - "Attempting to reconnect to backoff(elasticsearch(http://localhost:4242)) with 2 reconnect attempt(s)", + fmt.Sprintf("Attempting to reconnect to backoff(elasticsearch(%s)) with 2 reconnect attempt(s)", esAddr), 2*time.Second, "did not find two tries to reconnect") // 4. Restart mock-es on the same port - s, mr = startMockES(t, "localhost:4242") + s, _, _, mr = StartMockES(t, ":4242", 0, 0, 0, 0, 0) // 5. Wait for reconnection logs mockbeat.WaitForLogs( - "Connection to backoff(elasticsearch(http://localhost:4242)) established", + fmt.Sprintf("Connection to backoff(elasticsearch(%s)) established", esAddr), 5*time.Second, // There is a backoff, so ensure we wait enough "did not find re connection confirmation") @@ -101,8 +105,7 @@ func TestESOutputRecoversFromNetworkError(t *testing.T) { func TestReloadCA(t *testing.T) { mockbeat := NewBeat(t, "mockbeat", "../../libbeat.test") - esAddr := "localhost:4242" - s, _ := startMockES(t, esAddr) + s, esAddr, _, _ := StartMockES(t, ":4242", 0, 0, 0, 0, 0) defer s.Close() _, _, pair, err := certutil.NewRootCA() @@ -153,55 +156,38 @@ logging.level: debug "did not find 'mockbeat start running' log again") } -func startMockES(t *testing.T, addr string) (*http.Server, metrics.Registry) { - uid := uuid.Must(uuid.NewV4()) - mr := metrics.NewRegistry() - es := api.NewAPIHandler(uid, "foo2", mr, time.Now().Add(24*time.Hour), 0, 0, 0, 0, 0) - - s := http.Server{Addr: addr, Handler: es, ReadHeaderTimeout: time.Second} - go func() { - if err := s.ListenAndServe(); !errors.Is(http.ErrServerClosed, err) { - t.Errorf("could not start mock-es server: %s", err) - } - }() - - require.Eventually(t, func() bool { - resp, err := http.Get("http://" + addr) //nolint:noctx // It's just a test - if err != nil { - //nolint:errcheck // We're just draining the body, we can ignore the error - io.Copy(io.Discard, resp.Body) - resp.Body.Close() - return false - } - return true - }, - time.Second, time.Millisecond, "mock-es server did not start on '%s'", addr) - - return &s, mr -} - // waitForEventToBePublished waits for at least one event published // by inspecting the count for `bulk.create.total` in `mr`. Once // the counter is > 1, waitForEventToBePublished returns. If that // does not happen within 10min, then the test fails with a call to // t.Fatal. -func waitForEventToBePublished(t *testing.T, mr metrics.Registry) { +func waitForEventToBePublished(t *testing.T, rdr *sdkmetric.ManualReader) { t.Helper() + require.Eventually(t, func() bool { - total := mr.Get("bulk.create.total") - if total == nil { - return false + rm := metricdata.ResourceMetrics{} + err := rdr.Collect(context.Background(), &rm) + + if err != nil { + t.Fatalf("failed to collect metrics: %v", err) } - sc, ok := total.(*metrics.StandardCounter) - if !ok { - t.Fatalf("expecting 'bulk.create.total' to be *metrics.StandardCounter, but got '%T' instead", - total, - ) + for _, sm := range rm.ScopeMetrics { + for _, m := range sm.Metrics { + if m.Name == "bulk.create.total" { + total := int64(0) + //nolint:errcheck // It's a test + for _, dp := range m.Data.(metricdata.Sum[int64]).DataPoints { + total += dp.Value + } + return total >= 1 + } + } } - return sc.Count() > 1 + return false }, - 10*time.Second, 100*time.Millisecond, + 10*time.Second, + 100*time.Millisecond, "at least one bulk request must be made") } diff --git a/libbeat/tests/integration/framework.go b/libbeat/tests/integration/framework.go index 1432f82c644a..c3f273542baa 100644 --- a/libbeat/tests/integration/framework.go +++ b/libbeat/tests/integration/framework.go @@ -28,6 +28,7 @@ import ( "fmt" "io" "math" + "net" "net/http" "net/url" "os" @@ -45,6 +46,9 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + sdkmetric "go.opentelemetry.io/otel/sdk/metric" + + "github.com/elastic/mock-es/pkg/api" ) type BeatProc struct { @@ -1029,6 +1033,83 @@ func (b *BeatProc) ConfigFilePath() string { return b.configFile } +// StartMockES starts mock-es on the specified address. +// If add is an empty string a random local port is used. +// The return values are: +// - The HTTP server +// - The server address in the form http://ip:port +// - The mock-es API handler +// - The ManualReader for accessing the metrics +func StartMockES( + t *testing.T, + addr string, + percentDuplicate, + percentTooMany, + percentNonIndex, + percentTooLarge, + historyCap uint, +) (*http.Server, string, *api.APIHandler, *sdkmetric.ManualReader) { + + uid := uuid.Must(uuid.NewV4()) + + rdr := sdkmetric.NewManualReader() + provider := sdkmetric.NewMeterProvider( + sdkmetric.WithReader(rdr), + ) + + es := api.NewAPIHandler( + uid, + t.Name(), + provider, + time.Now().Add(24*time.Hour), + 0, + percentDuplicate, + percentTooMany, + percentNonIndex, + percentTooLarge, + historyCap, + ) + + if addr == "" { + addr = "localhost:0" + } + + l, err := net.Listen("tcp", addr) + if err != nil { + if l, err = net.Listen("tcp6", addr); err != nil { + t.Fatalf("failed to listen on a port: %v", err) + } + } + + addr = l.Addr().String() + s := http.Server{Handler: es, ReadHeaderTimeout: time.Second} + go func() { + if err := s.Serve(l); !errors.Is(err, http.ErrServerClosed) { + t.Errorf("could not start mock-es server: %s", err) + } + }() + + serverURL := "http://" + addr + // Ensure the Server is up and running before returning + require.Eventually( + t, + func() bool { + resp, err := http.Get(serverURL) //nolint:gosec,noctx // It's just a test + if err != nil { + return false + } + //nolint: errcheck // We're just draining the body, we can ignore the error + io.Copy(io.Discard, resp.Body) + resp.Body.Close() + return true + }, + time.Second, + time.Millisecond, + "mock-es server did not start on '%s'", addr) + + return &s, serverURL, es, rdr +} + // WaitPublishedEvents waits until the desired number of events // have been published. It assumes the file output is used, the filename // for the output is 'output' and 'path' is set to the TempDir.