Skip to content

Commit b5dcdb1

Browse files
Merge branch 'main' into add-receivers-v130
2 parents 0879f52 + 89e43ad commit b5dcdb1

File tree

56 files changed

+1530
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1530
-315
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
/.github/workflows/update-docs.yml @elastic/ingest-docs
1919
/docs/reference/edot-collector @elastic/ingest-docs
2020
/docs/scripts/update-docs @elastic/ingest-docs
21+
/internal/pkg/otel/samples @elastic/ingest-otel-data @elastic/ingest-docs
22+
/internal/pkg/otel/core-components.yaml @elastic/ingest-otel-data @elastic/ingest-docs
2123
/internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane
2224
/internal/pkg/otel/samples/darwin/autoops_es.yml @elastic/opex
2325
/internal/pkg/otel/samples/linux/autoops_es.yml @elastic/opex
24-
/internal/pkg/otel/samples/windows/autoops_es.yml @elastic/opex
26+
/internal/pkg/otel/samples/windows/autoops_es.yml @elastic/opex

.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-4a70e252",
4-
"manifest_url": "https://snapshots.elastic.co/9.2.0-4a70e252/manifest-9.2.0-SNAPSHOT.json",
5-
"summary_url": "https://snapshots.elastic.co/9.2.0-4a70e252/summary-9.2.0-SNAPSHOT.html",
3+
"build_id": "9.2.0-5054ab8b",
4+
"manifest_url": "https://snapshots.elastic.co/9.2.0-5054ab8b/manifest-9.2.0-SNAPSHOT.json",
5+
"summary_url": "https://snapshots.elastic.co/9.2.0-5054ab8b/summary-9.2.0-SNAPSHOT.html",
66
"core_version": "9.2.0",
7-
"stack_build_id": "9.2.0-4a70e252-SNAPSHOT"
7+
"stack_build_id": "9.2.0-5054ab8b-SNAPSHOT"
88
}

NOTICE-fips.txt

Lines changed: 242 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5989,6 +5989,217 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele
59895989
limitations under the License.
59905990

59915991

5992+
--------------------------------------------------------------------------------
5993+
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension
5994+
Version: v0.132.0
5995+
Licence type (autodetected): Apache-2.0
5996+
--------------------------------------------------------------------------------
5997+
5998+
Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/extension/[email protected]/LICENSE:
5999+
6000+
Apache License
6001+
Version 2.0, January 2004
6002+
http://www.apache.org/licenses/
6003+
6004+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6005+
6006+
1. Definitions.
6007+
6008+
"License" shall mean the terms and conditions for use, reproduction,
6009+
and distribution as defined by Sections 1 through 9 of this document.
6010+
6011+
"Licensor" shall mean the copyright owner or entity authorized by
6012+
the copyright owner that is granting the License.
6013+
6014+
"Legal Entity" shall mean the union of the acting entity and all
6015+
other entities that control, are controlled by, or are under common
6016+
control with that entity. For the purposes of this definition,
6017+
"control" means (i) the power, direct or indirect, to cause the
6018+
direction or management of such entity, whether by contract or
6019+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
6020+
outstanding shares, or (iii) beneficial ownership of such entity.
6021+
6022+
"You" (or "Your") shall mean an individual or Legal Entity
6023+
exercising permissions granted by this License.
6024+
6025+
"Source" form shall mean the preferred form for making modifications,
6026+
including but not limited to software source code, documentation
6027+
source, and configuration files.
6028+
6029+
"Object" form shall mean any form resulting from mechanical
6030+
transformation or translation of a Source form, including but
6031+
not limited to compiled object code, generated documentation,
6032+
and conversions to other media types.
6033+
6034+
"Work" shall mean the work of authorship, whether in Source or
6035+
Object form, made available under the License, as indicated by a
6036+
copyright notice that is included in or attached to the work
6037+
(an example is provided in the Appendix below).
6038+
6039+
"Derivative Works" shall mean any work, whether in Source or Object
6040+
form, that is based on (or derived from) the Work and for which the
6041+
editorial revisions, annotations, elaborations, or other modifications
6042+
represent, as a whole, an original work of authorship. For the purposes
6043+
of this License, Derivative Works shall not include works that remain
6044+
separable from, or merely link (or bind by name) to the interfaces of,
6045+
the Work and Derivative Works thereof.
6046+
6047+
"Contribution" shall mean any work of authorship, including
6048+
the original version of the Work and any modifications or additions
6049+
to that Work or Derivative Works thereof, that is intentionally
6050+
submitted to Licensor for inclusion in the Work by the copyright owner
6051+
or by an individual or Legal Entity authorized to submit on behalf of
6052+
the copyright owner. For the purposes of this definition, "submitted"
6053+
means any form of electronic, verbal, or written communication sent
6054+
to the Licensor or its representatives, including but not limited to
6055+
communication on electronic mailing lists, source code control systems,
6056+
and issue tracking systems that are managed by, or on behalf of, the
6057+
Licensor for the purpose of discussing and improving the Work, but
6058+
excluding communication that is conspicuously marked or otherwise
6059+
designated in writing by the copyright owner as "Not a Contribution."
6060+
6061+
"Contributor" shall mean Licensor and any individual or Legal Entity
6062+
on behalf of whom a Contribution has been received by Licensor and
6063+
subsequently incorporated within the Work.
6064+
6065+
2. Grant of Copyright License. Subject to the terms and conditions of
6066+
this License, each Contributor hereby grants to You a perpetual,
6067+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
6068+
copyright license to reproduce, prepare Derivative Works of,
6069+
publicly display, publicly perform, sublicense, and distribute the
6070+
Work and such Derivative Works in Source or Object form.
6071+
6072+
3. Grant of Patent License. Subject to the terms and conditions of
6073+
this License, each Contributor hereby grants to You a perpetual,
6074+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
6075+
(except as stated in this section) patent license to make, have made,
6076+
use, offer to sell, sell, import, and otherwise transfer the Work,
6077+
where such license applies only to those patent claims licensable
6078+
by such Contributor that are necessarily infringed by their
6079+
Contribution(s) alone or by combination of their Contribution(s)
6080+
with the Work to which such Contribution(s) was submitted. If You
6081+
institute patent litigation against any entity (including a
6082+
cross-claim or counterclaim in a lawsuit) alleging that the Work
6083+
or a Contribution incorporated within the Work constitutes direct
6084+
or contributory patent infringement, then any patent licenses
6085+
granted to You under this License for that Work shall terminate
6086+
as of the date such litigation is filed.
6087+
6088+
4. Redistribution. You may reproduce and distribute copies of the
6089+
Work or Derivative Works thereof in any medium, with or without
6090+
modifications, and in Source or Object form, provided that You
6091+
meet the following conditions:
6092+
6093+
(a) You must give any other recipients of the Work or
6094+
Derivative Works a copy of this License; and
6095+
6096+
(b) You must cause any modified files to carry prominent notices
6097+
stating that You changed the files; and
6098+
6099+
(c) You must retain, in the Source form of any Derivative Works
6100+
that You distribute, all copyright, patent, trademark, and
6101+
attribution notices from the Source form of the Work,
6102+
excluding those notices that do not pertain to any part of
6103+
the Derivative Works; and
6104+
6105+
(d) If the Work includes a "NOTICE" text file as part of its
6106+
distribution, then any Derivative Works that You distribute must
6107+
include a readable copy of the attribution notices contained
6108+
within such NOTICE file, excluding those notices that do not
6109+
pertain to any part of the Derivative Works, in at least one
6110+
of the following places: within a NOTICE text file distributed
6111+
as part of the Derivative Works; within the Source form or
6112+
documentation, if provided along with the Derivative Works; or,
6113+
within a display generated by the Derivative Works, if and
6114+
wherever such third-party notices normally appear. The contents
6115+
of the NOTICE file are for informational purposes only and
6116+
do not modify the License. You may add Your own attribution
6117+
notices within Derivative Works that You distribute, alongside
6118+
or as an addendum to the NOTICE text from the Work, provided
6119+
that such additional attribution notices cannot be construed
6120+
as modifying the License.
6121+
6122+
You may add Your own copyright statement to Your modifications and
6123+
may provide additional or different license terms and conditions
6124+
for use, reproduction, or distribution of Your modifications, or
6125+
for any such Derivative Works as a whole, provided Your use,
6126+
reproduction, and distribution of the Work otherwise complies with
6127+
the conditions stated in this License.
6128+
6129+
5. Submission of Contributions. Unless You explicitly state otherwise,
6130+
any Contribution intentionally submitted for inclusion in the Work
6131+
by You to the Licensor shall be under the terms and conditions of
6132+
this License, without any additional terms or conditions.
6133+
Notwithstanding the above, nothing herein shall supersede or modify
6134+
the terms of any separate license agreement you may have executed
6135+
with Licensor regarding such Contributions.
6136+
6137+
6. Trademarks. This License does not grant permission to use the trade
6138+
names, trademarks, service marks, or product names of the Licensor,
6139+
except as required for reasonable and customary use in describing the
6140+
origin of the Work and reproducing the content of the NOTICE file.
6141+
6142+
7. Disclaimer of Warranty. Unless required by applicable law or
6143+
agreed to in writing, Licensor provides the Work (and each
6144+
Contributor provides its Contributions) on an "AS IS" BASIS,
6145+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
6146+
implied, including, without limitation, any warranties or conditions
6147+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
6148+
PARTICULAR PURPOSE. You are solely responsible for determining the
6149+
appropriateness of using or redistributing the Work and assume any
6150+
risks associated with Your exercise of permissions under this License.
6151+
6152+
8. Limitation of Liability. In no event and under no legal theory,
6153+
whether in tort (including negligence), contract, or otherwise,
6154+
unless required by applicable law (such as deliberate and grossly
6155+
negligent acts) or agreed to in writing, shall any Contributor be
6156+
liable to You for damages, including any direct, indirect, special,
6157+
incidental, or consequential damages of any character arising as a
6158+
result of this License or out of the use or inability to use the
6159+
Work (including but not limited to damages for loss of goodwill,
6160+
work stoppage, computer failure or malfunction, or any and all
6161+
other commercial damages or losses), even if such Contributor
6162+
has been advised of the possibility of such damages.
6163+
6164+
9. Accepting Warranty or Additional Liability. While redistributing
6165+
the Work or Derivative Works thereof, You may choose to offer,
6166+
and charge a fee for, acceptance of support, warranty, indemnity,
6167+
or other liability obligations and/or rights consistent with this
6168+
License. However, in accepting such obligations, You may act only
6169+
on Your own behalf and on Your sole responsibility, not on behalf
6170+
of any other Contributor, and only if You agree to indemnify,
6171+
defend, and hold each Contributor harmless for any liability
6172+
incurred by, or claims asserted against, such Contributor by reason
6173+
of your accepting any such warranty or additional liability.
6174+
6175+
END OF TERMS AND CONDITIONS
6176+
6177+
APPENDIX: How to apply the Apache License to your work.
6178+
6179+
To apply the Apache License to your work, attach the following
6180+
boilerplate notice, with the fields enclosed by brackets "[]"
6181+
replaced with your own identifying information. (Don't include
6182+
the brackets!) The text should be enclosed in the appropriate
6183+
comment syntax for the file format. We also recommend that a
6184+
file or class name and description of purpose be included on the
6185+
same "printed page" as the copyright notice for easier
6186+
identification within third-party archives.
6187+
6188+
Copyright [yyyy] [name of copyright owner]
6189+
6190+
Licensed under the Apache License, Version 2.0 (the "License");
6191+
you may not use this file except in compliance with the License.
6192+
You may obtain a copy of the License at
6193+
6194+
http://www.apache.org/licenses/LICENSE-2.0
6195+
6196+
Unless required by applicable law or agreed to in writing, software
6197+
distributed under the License is distributed on an "AS IS" BASIS,
6198+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
6199+
See the License for the specific language governing permissions and
6200+
limitations under the License.
6201+
6202+
59926203
--------------------------------------------------------------------------------
59936204
Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension
59946205
Version: v0.132.0
@@ -88182,11 +88393,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/exporters
8818288393

8818388394
--------------------------------------------------------------------------------
8818488395
Dependency : go.opentelemetry.io/otel/log
88185-
Version: v0.13.0
88396+
Version: v0.14.0
8818688397
Licence type (autodetected): Apache-2.0
8818788398
--------------------------------------------------------------------------------
8818888399

88189-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/log@v0.13.0/LICENSE:
88400+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/log@v0.14.0/LICENSE:
8819088401

8819188402
Apache License
8819288403
Version 2.0, January 2004
@@ -88390,6 +88601,35 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/[email protected]
8839088601
See the License for the specific language governing permissions and
8839188602
limitations under the License.
8839288603

88604+
--------------------------------------------------------------------------------
88605+
88606+
Copyright 2009 The Go Authors.
88607+
88608+
Redistribution and use in source and binary forms, with or without
88609+
modification, are permitted provided that the following conditions are
88610+
met:
88611+
88612+
* Redistributions of source code must retain the above copyright
88613+
notice, this list of conditions and the following disclaimer.
88614+
* Redistributions in binary form must reproduce the above
88615+
copyright notice, this list of conditions and the following disclaimer
88616+
in the documentation and/or other materials provided with the
88617+
distribution.
88618+
* Neither the name of Google LLC nor the names of its
88619+
contributors may be used to endorse or promote products derived from
88620+
this software without specific prior written permission.
88621+
88622+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
88623+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
88624+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
88625+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
88626+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
88627+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
88628+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
88629+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
88630+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
88631+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
88632+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8839388633

8839488634
--------------------------------------------------------------------------------
8839588635
Dependency : go.opentelemetry.io/otel/metric

0 commit comments

Comments
 (0)