Skip to content

Commit 1430f1e

Browse files
committed
Revert "update notice"
This reverts commit 43bbd46.
1 parent 914e64f commit 1430f1e

File tree

3 files changed

+215
-0
lines changed

3 files changed

+215
-0
lines changed

NOTICE.txt

+212
Original file line numberDiff line numberDiff line change
@@ -11790,6 +11790,218 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf
1179011790
limitations under the License.
1179111791

1179211792

11793+
--------------------------------------------------------------------------------
11794+
Dependency : go.opentelemetry.io/collector/confmap/converter/expandconverter
11795+
Version: v0.113.0
11796+
Licence type (autodetected): Apache-2.0
11797+
--------------------------------------------------------------------------------
11798+
11799+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/confmap/converter/expandconverter@v0.113.0/LICENSE:
11800+
11801+
11802+
Apache License
11803+
Version 2.0, January 2004
11804+
http://www.apache.org/licenses/
11805+
11806+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
11807+
11808+
1. Definitions.
11809+
11810+
"License" shall mean the terms and conditions for use, reproduction,
11811+
and distribution as defined by Sections 1 through 9 of this document.
11812+
11813+
"Licensor" shall mean the copyright owner or entity authorized by
11814+
the copyright owner that is granting the License.
11815+
11816+
"Legal Entity" shall mean the union of the acting entity and all
11817+
other entities that control, are controlled by, or are under common
11818+
control with that entity. For the purposes of this definition,
11819+
"control" means (i) the power, direct or indirect, to cause the
11820+
direction or management of such entity, whether by contract or
11821+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
11822+
outstanding shares, or (iii) beneficial ownership of such entity.
11823+
11824+
"You" (or "Your") shall mean an individual or Legal Entity
11825+
exercising permissions granted by this License.
11826+
11827+
"Source" form shall mean the preferred form for making modifications,
11828+
including but not limited to software source code, documentation
11829+
source, and configuration files.
11830+
11831+
"Object" form shall mean any form resulting from mechanical
11832+
transformation or translation of a Source form, including but
11833+
not limited to compiled object code, generated documentation,
11834+
and conversions to other media types.
11835+
11836+
"Work" shall mean the work of authorship, whether in Source or
11837+
Object form, made available under the License, as indicated by a
11838+
copyright notice that is included in or attached to the work
11839+
(an example is provided in the Appendix below).
11840+
11841+
"Derivative Works" shall mean any work, whether in Source or Object
11842+
form, that is based on (or derived from) the Work and for which the
11843+
editorial revisions, annotations, elaborations, or other modifications
11844+
represent, as a whole, an original work of authorship. For the purposes
11845+
of this License, Derivative Works shall not include works that remain
11846+
separable from, or merely link (or bind by name) to the interfaces of,
11847+
the Work and Derivative Works thereof.
11848+
11849+
"Contribution" shall mean any work of authorship, including
11850+
the original version of the Work and any modifications or additions
11851+
to that Work or Derivative Works thereof, that is intentionally
11852+
submitted to Licensor for inclusion in the Work by the copyright owner
11853+
or by an individual or Legal Entity authorized to submit on behalf of
11854+
the copyright owner. For the purposes of this definition, "submitted"
11855+
means any form of electronic, verbal, or written communication sent
11856+
to the Licensor or its representatives, including but not limited to
11857+
communication on electronic mailing lists, source code control systems,
11858+
and issue tracking systems that are managed by, or on behalf of, the
11859+
Licensor for the purpose of discussing and improving the Work, but
11860+
excluding communication that is conspicuously marked or otherwise
11861+
designated in writing by the copyright owner as "Not a Contribution."
11862+
11863+
"Contributor" shall mean Licensor and any individual or Legal Entity
11864+
on behalf of whom a Contribution has been received by Licensor and
11865+
subsequently incorporated within the Work.
11866+
11867+
2. Grant of Copyright License. Subject to the terms and conditions of
11868+
this License, each Contributor hereby grants to You a perpetual,
11869+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
11870+
copyright license to reproduce, prepare Derivative Works of,
11871+
publicly display, publicly perform, sublicense, and distribute the
11872+
Work and such Derivative Works in Source or Object form.
11873+
11874+
3. Grant of Patent License. Subject to the terms and conditions of
11875+
this License, each Contributor hereby grants to You a perpetual,
11876+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
11877+
(except as stated in this section) patent license to make, have made,
11878+
use, offer to sell, sell, import, and otherwise transfer the Work,
11879+
where such license applies only to those patent claims licensable
11880+
by such Contributor that are necessarily infringed by their
11881+
Contribution(s) alone or by combination of their Contribution(s)
11882+
with the Work to which such Contribution(s) was submitted. If You
11883+
institute patent litigation against any entity (including a
11884+
cross-claim or counterclaim in a lawsuit) alleging that the Work
11885+
or a Contribution incorporated within the Work constitutes direct
11886+
or contributory patent infringement, then any patent licenses
11887+
granted to You under this License for that Work shall terminate
11888+
as of the date such litigation is filed.
11889+
11890+
4. Redistribution. You may reproduce and distribute copies of the
11891+
Work or Derivative Works thereof in any medium, with or without
11892+
modifications, and in Source or Object form, provided that You
11893+
meet the following conditions:
11894+
11895+
(a) You must give any other recipients of the Work or
11896+
Derivative Works a copy of this License; and
11897+
11898+
(b) You must cause any modified files to carry prominent notices
11899+
stating that You changed the files; and
11900+
11901+
(c) You must retain, in the Source form of any Derivative Works
11902+
that You distribute, all copyright, patent, trademark, and
11903+
attribution notices from the Source form of the Work,
11904+
excluding those notices that do not pertain to any part of
11905+
the Derivative Works; and
11906+
11907+
(d) If the Work includes a "NOTICE" text file as part of its
11908+
distribution, then any Derivative Works that You distribute must
11909+
include a readable copy of the attribution notices contained
11910+
within such NOTICE file, excluding those notices that do not
11911+
pertain to any part of the Derivative Works, in at least one
11912+
of the following places: within a NOTICE text file distributed
11913+
as part of the Derivative Works; within the Source form or
11914+
documentation, if provided along with the Derivative Works; or,
11915+
within a display generated by the Derivative Works, if and
11916+
wherever such third-party notices normally appear. The contents
11917+
of the NOTICE file are for informational purposes only and
11918+
do not modify the License. You may add Your own attribution
11919+
notices within Derivative Works that You distribute, alongside
11920+
or as an addendum to the NOTICE text from the Work, provided
11921+
that such additional attribution notices cannot be construed
11922+
as modifying the License.
11923+
11924+
You may add Your own copyright statement to Your modifications and
11925+
may provide additional or different license terms and conditions
11926+
for use, reproduction, or distribution of Your modifications, or
11927+
for any such Derivative Works as a whole, provided Your use,
11928+
reproduction, and distribution of the Work otherwise complies with
11929+
the conditions stated in this License.
11930+
11931+
5. Submission of Contributions. Unless You explicitly state otherwise,
11932+
any Contribution intentionally submitted for inclusion in the Work
11933+
by You to the Licensor shall be under the terms and conditions of
11934+
this License, without any additional terms or conditions.
11935+
Notwithstanding the above, nothing herein shall supersede or modify
11936+
the terms of any separate license agreement you may have executed
11937+
with Licensor regarding such Contributions.
11938+
11939+
6. Trademarks. This License does not grant permission to use the trade
11940+
names, trademarks, service marks, or product names of the Licensor,
11941+
except as required for reasonable and customary use in describing the
11942+
origin of the Work and reproducing the content of the NOTICE file.
11943+
11944+
7. Disclaimer of Warranty. Unless required by applicable law or
11945+
agreed to in writing, Licensor provides the Work (and each
11946+
Contributor provides its Contributions) on an "AS IS" BASIS,
11947+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
11948+
implied, including, without limitation, any warranties or conditions
11949+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
11950+
PARTICULAR PURPOSE. You are solely responsible for determining the
11951+
appropriateness of using or redistributing the Work and assume any
11952+
risks associated with Your exercise of permissions under this License.
11953+
11954+
8. Limitation of Liability. In no event and under no legal theory,
11955+
whether in tort (including negligence), contract, or otherwise,
11956+
unless required by applicable law (such as deliberate and grossly
11957+
negligent acts) or agreed to in writing, shall any Contributor be
11958+
liable to You for damages, including any direct, indirect, special,
11959+
incidental, or consequential damages of any character arising as a
11960+
result of this License or out of the use or inability to use the
11961+
Work (including but not limited to damages for loss of goodwill,
11962+
work stoppage, computer failure or malfunction, or any and all
11963+
other commercial damages or losses), even if such Contributor
11964+
has been advised of the possibility of such damages.
11965+
11966+
9. Accepting Warranty or Additional Liability. While redistributing
11967+
the Work or Derivative Works thereof, You may choose to offer,
11968+
and charge a fee for, acceptance of support, warranty, indemnity,
11969+
or other liability obligations and/or rights consistent with this
11970+
License. However, in accepting such obligations, You may act only
11971+
on Your own behalf and on Your sole responsibility, not on behalf
11972+
of any other Contributor, and only if You agree to indemnify,
11973+
defend, and hold each Contributor harmless for any liability
11974+
incurred by, or claims asserted against, such Contributor by reason
11975+
of your accepting any such warranty or additional liability.
11976+
11977+
END OF TERMS AND CONDITIONS
11978+
11979+
APPENDIX: How to apply the Apache License to your work.
11980+
11981+
To apply the Apache License to your work, attach the following
11982+
boilerplate notice, with the fields enclosed by brackets "[]"
11983+
replaced with your own identifying information. (Don't include
11984+
the brackets!) The text should be enclosed in the appropriate
11985+
comment syntax for the file format. We also recommend that a
11986+
file or class name and description of purpose be included on the
11987+
same "printed page" as the copyright notice for easier
11988+
identification within third-party archives.
11989+
11990+
Copyright [yyyy] [name of copyright owner]
11991+
11992+
Licensed under the Apache License, Version 2.0 (the "License");
11993+
you may not use this file except in compliance with the License.
11994+
You may obtain a copy of the License at
11995+
11996+
http://www.apache.org/licenses/LICENSE-2.0
11997+
11998+
Unless required by applicable law or agreed to in writing, software
11999+
distributed under the License is distributed on an "AS IS" BASIS,
12000+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12001+
See the License for the specific language governing permissions and
12002+
limitations under the License.
12003+
12004+
1179312005
--------------------------------------------------------------------------------
1179412006
Dependency : go.opentelemetry.io/collector/confmap/provider/envprovider
1179512007
Version: v1.19.0

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ require (
111111
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.113.0
112112
go.opentelemetry.io/collector/component v0.113.0
113113
go.opentelemetry.io/collector/confmap v1.19.0
114+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.113.0
114115
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0
115116
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0
116117
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.19.0

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,8 @@ go.opentelemetry.io/collector/config/internal v0.113.0 h1:9RAzH8v7ItFT1npHpvP0Sv
15211521
go.opentelemetry.io/collector/config/internal v0.113.0/go.mod h1:yC7E4h1Uj0SubxcFImh6OvBHFTjMh99+A5PuyIgDWqc=
15221522
go.opentelemetry.io/collector/confmap v1.19.0 h1:TQ0lZpAKqgsE0EKk+u4JA+uBbPYeFRmWP3GH43w40CY=
15231523
go.opentelemetry.io/collector/confmap v1.19.0/go.mod h1:GgNu1ElPGmLn9govqIfjaopvdspw4PJ9KeDtWC4E2Q4=
1524+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.113.0 h1:DBjWXlVzdwVbs1ZOH+k1vmoBt3TLx8NvRK8ZK3nKdmo=
1525+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.113.0/go.mod h1:/YDWibNLalyfd0BR0V5ixiParsNCvVKkA58f3bcu/AA=
15241526
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0 h1:f8O/I5pVRN86Gx5mHekNx92S6fGdOS4VcooRJKWe6Bs=
15251527
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0/go.mod h1:AiaW5YW1LD0/WlZuc8eZuZPBH6PA9QqsiAYRX1iC6T0=
15261528
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0 h1:TYwyk4ea3U+5MYcEjrzZAaonBcLlabQu8CZeB7ekAYY=

0 commit comments

Comments
 (0)