Skip to content

Commit c56581d

Browse files
feat: hybrid elastic agent invoke collector as subprocess (#8248)
* feat: enable support for healthcheckv2 extension * feat: add edot-supervised agent sub-command * feat: refactor otel manager to invoke collector as subprocess * fix: staticcheck QF1003 in unmarshalLevel of log_writer * doc: add changelog fragment * fix: add a random UUID as name of the healthcheck extension to avoid conflicts * feat: consolidate otel and otel-supervised subcommands * fix: use http.DefaultClient directly * fix: add require failure message * fix: rename otelSetSupervised to otelSetSupervisedFlagName and improve description * fix: improve documentation * fix: extract otel settings preparation in separate function * fix: allocate healthCheckExtensionID in idiomatic way * fix: update NOTICE files * fix: exclude extensions from otel to beats status processing * fix: always emit statuses * fix: emit statuses only if there is a change in the event and subcomponents status/error * fix: denoise code * feat: reintroduce running collector embedded * fix: update NOTICE.txt * fix: replace runtime with execution * fix: clean up commented code from TestCompareAggregateStatuses * fix: removed changelog * fix: exclude extensions from getOtelRuntimePipelineStatuses * fix: pass elastic-agent logging level to supervised collector * fix: couple embedded collector context with parent one * fix: increase interval and max failed attempts of healthcheck v2 polling * fix: make exceeding failed attempts a recoverable error and don't give up * feat: add recovery support for supervised edot * feat: rework health check fail to connect threshold * feat: add license headers in recovery_backoff.go and recovery_noop.go * fix: handle races in otel manager tests * feat: support resetting to initial backoff interval for recoveryBackoff * fix: correct comments * fix: make recovery backoff unit tests more robust on OS with lower time resolution * fix: format code after resolving conflicts
1 parent 546c5a9 commit c56581d

36 files changed

+2585
-338
lines changed

NOTICE-fips.txt

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5778,6 +5778,217 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele
57785778
limitations under the License.
57795779

57805780

5781+
--------------------------------------------------------------------------------
5782+
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension
5783+
Version: v0.127.0
5784+
Licence type (autodetected): Apache-2.0
5785+
--------------------------------------------------------------------------------
5786+
5787+
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/[email protected]/LICENSE:
5788+
5789+
Apache License
5790+
Version 2.0, January 2004
5791+
http://www.apache.org/licenses/
5792+
5793+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
5794+
5795+
1. Definitions.
5796+
5797+
"License" shall mean the terms and conditions for use, reproduction,
5798+
and distribution as defined by Sections 1 through 9 of this document.
5799+
5800+
"Licensor" shall mean the copyright owner or entity authorized by
5801+
the copyright owner that is granting the License.
5802+
5803+
"Legal Entity" shall mean the union of the acting entity and all
5804+
other entities that control, are controlled by, or are under common
5805+
control with that entity. For the purposes of this definition,
5806+
"control" means (i) the power, direct or indirect, to cause the
5807+
direction or management of such entity, whether by contract or
5808+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
5809+
outstanding shares, or (iii) beneficial ownership of such entity.
5810+
5811+
"You" (or "Your") shall mean an individual or Legal Entity
5812+
exercising permissions granted by this License.
5813+
5814+
"Source" form shall mean the preferred form for making modifications,
5815+
including but not limited to software source code, documentation
5816+
source, and configuration files.
5817+
5818+
"Object" form shall mean any form resulting from mechanical
5819+
transformation or translation of a Source form, including but
5820+
not limited to compiled object code, generated documentation,
5821+
and conversions to other media types.
5822+
5823+
"Work" shall mean the work of authorship, whether in Source or
5824+
Object form, made available under the License, as indicated by a
5825+
copyright notice that is included in or attached to the work
5826+
(an example is provided in the Appendix below).
5827+
5828+
"Derivative Works" shall mean any work, whether in Source or Object
5829+
form, that is based on (or derived from) the Work and for which the
5830+
editorial revisions, annotations, elaborations, or other modifications
5831+
represent, as a whole, an original work of authorship. For the purposes
5832+
of this License, Derivative Works shall not include works that remain
5833+
separable from, or merely link (or bind by name) to the interfaces of,
5834+
the Work and Derivative Works thereof.
5835+
5836+
"Contribution" shall mean any work of authorship, including
5837+
the original version of the Work and any modifications or additions
5838+
to that Work or Derivative Works thereof, that is intentionally
5839+
submitted to Licensor for inclusion in the Work by the copyright owner
5840+
or by an individual or Legal Entity authorized to submit on behalf of
5841+
the copyright owner. For the purposes of this definition, "submitted"
5842+
means any form of electronic, verbal, or written communication sent
5843+
to the Licensor or its representatives, including but not limited to
5844+
communication on electronic mailing lists, source code control systems,
5845+
and issue tracking systems that are managed by, or on behalf of, the
5846+
Licensor for the purpose of discussing and improving the Work, but
5847+
excluding communication that is conspicuously marked or otherwise
5848+
designated in writing by the copyright owner as "Not a Contribution."
5849+
5850+
"Contributor" shall mean Licensor and any individual or Legal Entity
5851+
on behalf of whom a Contribution has been received by Licensor and
5852+
subsequently incorporated within the Work.
5853+
5854+
2. Grant of Copyright License. Subject to the terms and conditions of
5855+
this License, each Contributor hereby grants to You a perpetual,
5856+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
5857+
copyright license to reproduce, prepare Derivative Works of,
5858+
publicly display, publicly perform, sublicense, and distribute the
5859+
Work and such Derivative Works in Source or Object form.
5860+
5861+
3. Grant of Patent License. Subject to the terms and conditions of
5862+
this License, each Contributor hereby grants to You a perpetual,
5863+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
5864+
(except as stated in this section) patent license to make, have made,
5865+
use, offer to sell, sell, import, and otherwise transfer the Work,
5866+
where such license applies only to those patent claims licensable
5867+
by such Contributor that are necessarily infringed by their
5868+
Contribution(s) alone or by combination of their Contribution(s)
5869+
with the Work to which such Contribution(s) was submitted. If You
5870+
institute patent litigation against any entity (including a
5871+
cross-claim or counterclaim in a lawsuit) alleging that the Work
5872+
or a Contribution incorporated within the Work constitutes direct
5873+
or contributory patent infringement, then any patent licenses
5874+
granted to You under this License for that Work shall terminate
5875+
as of the date such litigation is filed.
5876+
5877+
4. Redistribution. You may reproduce and distribute copies of the
5878+
Work or Derivative Works thereof in any medium, with or without
5879+
modifications, and in Source or Object form, provided that You
5880+
meet the following conditions:
5881+
5882+
(a) You must give any other recipients of the Work or
5883+
Derivative Works a copy of this License; and
5884+
5885+
(b) You must cause any modified files to carry prominent notices
5886+
stating that You changed the files; and
5887+
5888+
(c) You must retain, in the Source form of any Derivative Works
5889+
that You distribute, all copyright, patent, trademark, and
5890+
attribution notices from the Source form of the Work,
5891+
excluding those notices that do not pertain to any part of
5892+
the Derivative Works; and
5893+
5894+
(d) If the Work includes a "NOTICE" text file as part of its
5895+
distribution, then any Derivative Works that You distribute must
5896+
include a readable copy of the attribution notices contained
5897+
within such NOTICE file, excluding those notices that do not
5898+
pertain to any part of the Derivative Works, in at least one
5899+
of the following places: within a NOTICE text file distributed
5900+
as part of the Derivative Works; within the Source form or
5901+
documentation, if provided along with the Derivative Works; or,
5902+
within a display generated by the Derivative Works, if and
5903+
wherever such third-party notices normally appear. The contents
5904+
of the NOTICE file are for informational purposes only and
5905+
do not modify the License. You may add Your own attribution
5906+
notices within Derivative Works that You distribute, alongside
5907+
or as an addendum to the NOTICE text from the Work, provided
5908+
that such additional attribution notices cannot be construed
5909+
as modifying the License.
5910+
5911+
You may add Your own copyright statement to Your modifications and
5912+
may provide additional or different license terms and conditions
5913+
for use, reproduction, or distribution of Your modifications, or
5914+
for any such Derivative Works as a whole, provided Your use,
5915+
reproduction, and distribution of the Work otherwise complies with
5916+
the conditions stated in this License.
5917+
5918+
5. Submission of Contributions. Unless You explicitly state otherwise,
5919+
any Contribution intentionally submitted for inclusion in the Work
5920+
by You to the Licensor shall be under the terms and conditions of
5921+
this License, without any additional terms or conditions.
5922+
Notwithstanding the above, nothing herein shall supersede or modify
5923+
the terms of any separate license agreement you may have executed
5924+
with Licensor regarding such Contributions.
5925+
5926+
6. Trademarks. This License does not grant permission to use the trade
5927+
names, trademarks, service marks, or product names of the Licensor,
5928+
except as required for reasonable and customary use in describing the
5929+
origin of the Work and reproducing the content of the NOTICE file.
5930+
5931+
7. Disclaimer of Warranty. Unless required by applicable law or
5932+
agreed to in writing, Licensor provides the Work (and each
5933+
Contributor provides its Contributions) on an "AS IS" BASIS,
5934+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
5935+
implied, including, without limitation, any warranties or conditions
5936+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
5937+
PARTICULAR PURPOSE. You are solely responsible for determining the
5938+
appropriateness of using or redistributing the Work and assume any
5939+
risks associated with Your exercise of permissions under this License.
5940+
5941+
8. Limitation of Liability. In no event and under no legal theory,
5942+
whether in tort (including negligence), contract, or otherwise,
5943+
unless required by applicable law (such as deliberate and grossly
5944+
negligent acts) or agreed to in writing, shall any Contributor be
5945+
liable to You for damages, including any direct, indirect, special,
5946+
incidental, or consequential damages of any character arising as a
5947+
result of this License or out of the use or inability to use the
5948+
Work (including but not limited to damages for loss of goodwill,
5949+
work stoppage, computer failure or malfunction, or any and all
5950+
other commercial damages or losses), even if such Contributor
5951+
has been advised of the possibility of such damages.
5952+
5953+
9. Accepting Warranty or Additional Liability. While redistributing
5954+
the Work or Derivative Works thereof, You may choose to offer,
5955+
and charge a fee for, acceptance of support, warranty, indemnity,
5956+
or other liability obligations and/or rights consistent with this
5957+
License. However, in accepting such obligations, You may act only
5958+
on Your own behalf and on Your sole responsibility, not on behalf
5959+
of any other Contributor, and only if You agree to indemnify,
5960+
defend, and hold each Contributor harmless for any liability
5961+
incurred by, or claims asserted against, such Contributor by reason
5962+
of your accepting any such warranty or additional liability.
5963+
5964+
END OF TERMS AND CONDITIONS
5965+
5966+
APPENDIX: How to apply the Apache License to your work.
5967+
5968+
To apply the Apache License to your work, attach the following
5969+
boilerplate notice, with the fields enclosed by brackets "[]"
5970+
replaced with your own identifying information. (Don't include
5971+
the brackets!) The text should be enclosed in the appropriate
5972+
comment syntax for the file format. We also recommend that a
5973+
file or class name and description of purpose be included on the
5974+
same "printed page" as the copyright notice for easier
5975+
identification within third-party archives.
5976+
5977+
Copyright [yyyy] [name of copyright owner]
5978+
5979+
Licensed under the Apache License, Version 2.0 (the "License");
5980+
you may not use this file except in compliance with the License.
5981+
You may obtain a copy of the License at
5982+
5983+
http://www.apache.org/licenses/LICENSE-2.0
5984+
5985+
Unless required by applicable law or agreed to in writing, software
5986+
distributed under the License is distributed on an "AS IS" BASIS,
5987+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
5988+
See the License for the specific language governing permissions and
5989+
limitations under the License.
5990+
5991+
57815992
--------------------------------------------------------------------------------
57825993
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver
57835994
Version: v0.127.0

0 commit comments

Comments
 (0)