Skip to content

Commit 2000e99

Browse files
authored
refactor: bump ulid lib to current major version (#5283)
ulid v1 is no longer supported current major is v2, update module path.
1 parent b4fe634 commit 2000e99

File tree

4 files changed

+219
-5
lines changed

4 files changed

+219
-5
lines changed

NOTICE.txt

+214-3
Original file line numberDiff line numberDiff line change
@@ -3964,12 +3964,12 @@ THE SOFTWARE.
39643964

39653965

39663966
--------------------------------------------------------------------------------
3967-
Dependency : github.com/oklog/ulid
3968-
Version: v1.3.1
3967+
Dependency : github.com/oklog/ulid/v2
3968+
Version: v2.1.0
39693969
Licence type (autodetected): Apache-2.0
39703970
--------------------------------------------------------------------------------
39713971

3972-
Contents of probable licence file $GOMODCACHE/github.com/oklog/ulid@v1.3.1/LICENSE:
3972+
Contents of probable licence file $GOMODCACHE/github.com/oklog/ulid/v2@v2.1.0/LICENSE:
39733973

39743974
Apache License
39753975
Version 2.0, January 2004
@@ -40294,6 +40294,217 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4029440294
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4029540295

4029640296

40297+
--------------------------------------------------------------------------------
40298+
Dependency : github.com/oklog/ulid
40299+
Version: v1.3.1
40300+
Licence type (autodetected): Apache-2.0
40301+
--------------------------------------------------------------------------------
40302+
40303+
Contents of probable licence file $GOMODCACHE/github.com/oklog/ulid@v1.3.1/LICENSE:
40304+
40305+
Apache License
40306+
Version 2.0, January 2004
40307+
http://www.apache.org/licenses/
40308+
40309+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
40310+
40311+
1. Definitions.
40312+
40313+
"License" shall mean the terms and conditions for use, reproduction,
40314+
and distribution as defined by Sections 1 through 9 of this document.
40315+
40316+
"Licensor" shall mean the copyright owner or entity authorized by
40317+
the copyright owner that is granting the License.
40318+
40319+
"Legal Entity" shall mean the union of the acting entity and all
40320+
other entities that control, are controlled by, or are under common
40321+
control with that entity. For the purposes of this definition,
40322+
"control" means (i) the power, direct or indirect, to cause the
40323+
direction or management of such entity, whether by contract or
40324+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
40325+
outstanding shares, or (iii) beneficial ownership of such entity.
40326+
40327+
"You" (or "Your") shall mean an individual or Legal Entity
40328+
exercising permissions granted by this License.
40329+
40330+
"Source" form shall mean the preferred form for making modifications,
40331+
including but not limited to software source code, documentation
40332+
source, and configuration files.
40333+
40334+
"Object" form shall mean any form resulting from mechanical
40335+
transformation or translation of a Source form, including but
40336+
not limited to compiled object code, generated documentation,
40337+
and conversions to other media types.
40338+
40339+
"Work" shall mean the work of authorship, whether in Source or
40340+
Object form, made available under the License, as indicated by a
40341+
copyright notice that is included in or attached to the work
40342+
(an example is provided in the Appendix below).
40343+
40344+
"Derivative Works" shall mean any work, whether in Source or Object
40345+
form, that is based on (or derived from) the Work and for which the
40346+
editorial revisions, annotations, elaborations, or other modifications
40347+
represent, as a whole, an original work of authorship. For the purposes
40348+
of this License, Derivative Works shall not include works that remain
40349+
separable from, or merely link (or bind by name) to the interfaces of,
40350+
the Work and Derivative Works thereof.
40351+
40352+
"Contribution" shall mean any work of authorship, including
40353+
the original version of the Work and any modifications or additions
40354+
to that Work or Derivative Works thereof, that is intentionally
40355+
submitted to Licensor for inclusion in the Work by the copyright owner
40356+
or by an individual or Legal Entity authorized to submit on behalf of
40357+
the copyright owner. For the purposes of this definition, "submitted"
40358+
means any form of electronic, verbal, or written communication sent
40359+
to the Licensor or its representatives, including but not limited to
40360+
communication on electronic mailing lists, source code control systems,
40361+
and issue tracking systems that are managed by, or on behalf of, the
40362+
Licensor for the purpose of discussing and improving the Work, but
40363+
excluding communication that is conspicuously marked or otherwise
40364+
designated in writing by the copyright owner as "Not a Contribution."
40365+
40366+
"Contributor" shall mean Licensor and any individual or Legal Entity
40367+
on behalf of whom a Contribution has been received by Licensor and
40368+
subsequently incorporated within the Work.
40369+
40370+
2. Grant of Copyright License. Subject to the terms and conditions of
40371+
this License, each Contributor hereby grants to You a perpetual,
40372+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
40373+
copyright license to reproduce, prepare Derivative Works of,
40374+
publicly display, publicly perform, sublicense, and distribute the
40375+
Work and such Derivative Works in Source or Object form.
40376+
40377+
3. Grant of Patent License. Subject to the terms and conditions of
40378+
this License, each Contributor hereby grants to You a perpetual,
40379+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
40380+
(except as stated in this section) patent license to make, have made,
40381+
use, offer to sell, sell, import, and otherwise transfer the Work,
40382+
where such license applies only to those patent claims licensable
40383+
by such Contributor that are necessarily infringed by their
40384+
Contribution(s) alone or by combination of their Contribution(s)
40385+
with the Work to which such Contribution(s) was submitted. If You
40386+
institute patent litigation against any entity (including a
40387+
cross-claim or counterclaim in a lawsuit) alleging that the Work
40388+
or a Contribution incorporated within the Work constitutes direct
40389+
or contributory patent infringement, then any patent licenses
40390+
granted to You under this License for that Work shall terminate
40391+
as of the date such litigation is filed.
40392+
40393+
4. Redistribution. You may reproduce and distribute copies of the
40394+
Work or Derivative Works thereof in any medium, with or without
40395+
modifications, and in Source or Object form, provided that You
40396+
meet the following conditions:
40397+
40398+
(a) You must give any other recipients of the Work or
40399+
Derivative Works a copy of this License; and
40400+
40401+
(b) You must cause any modified files to carry prominent notices
40402+
stating that You changed the files; and
40403+
40404+
(c) You must retain, in the Source form of any Derivative Works
40405+
that You distribute, all copyright, patent, trademark, and
40406+
attribution notices from the Source form of the Work,
40407+
excluding those notices that do not pertain to any part of
40408+
the Derivative Works; and
40409+
40410+
(d) If the Work includes a "NOTICE" text file as part of its
40411+
distribution, then any Derivative Works that You distribute must
40412+
include a readable copy of the attribution notices contained
40413+
within such NOTICE file, excluding those notices that do not
40414+
pertain to any part of the Derivative Works, in at least one
40415+
of the following places: within a NOTICE text file distributed
40416+
as part of the Derivative Works; within the Source form or
40417+
documentation, if provided along with the Derivative Works; or,
40418+
within a display generated by the Derivative Works, if and
40419+
wherever such third-party notices normally appear. The contents
40420+
of the NOTICE file are for informational purposes only and
40421+
do not modify the License. You may add Your own attribution
40422+
notices within Derivative Works that You distribute, alongside
40423+
or as an addendum to the NOTICE text from the Work, provided
40424+
that such additional attribution notices cannot be construed
40425+
as modifying the License.
40426+
40427+
You may add Your own copyright statement to Your modifications and
40428+
may provide additional or different license terms and conditions
40429+
for use, reproduction, or distribution of Your modifications, or
40430+
for any such Derivative Works as a whole, provided Your use,
40431+
reproduction, and distribution of the Work otherwise complies with
40432+
the conditions stated in this License.
40433+
40434+
5. Submission of Contributions. Unless You explicitly state otherwise,
40435+
any Contribution intentionally submitted for inclusion in the Work
40436+
by You to the Licensor shall be under the terms and conditions of
40437+
this License, without any additional terms or conditions.
40438+
Notwithstanding the above, nothing herein shall supersede or modify
40439+
the terms of any separate license agreement you may have executed
40440+
with Licensor regarding such Contributions.
40441+
40442+
6. Trademarks. This License does not grant permission to use the trade
40443+
names, trademarks, service marks, or product names of the Licensor,
40444+
except as required for reasonable and customary use in describing the
40445+
origin of the Work and reproducing the content of the NOTICE file.
40446+
40447+
7. Disclaimer of Warranty. Unless required by applicable law or
40448+
agreed to in writing, Licensor provides the Work (and each
40449+
Contributor provides its Contributions) on an "AS IS" BASIS,
40450+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
40451+
implied, including, without limitation, any warranties or conditions
40452+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
40453+
PARTICULAR PURPOSE. You are solely responsible for determining the
40454+
appropriateness of using or redistributing the Work and assume any
40455+
risks associated with Your exercise of permissions under this License.
40456+
40457+
8. Limitation of Liability. In no event and under no legal theory,
40458+
whether in tort (including negligence), contract, or otherwise,
40459+
unless required by applicable law (such as deliberate and grossly
40460+
negligent acts) or agreed to in writing, shall any Contributor be
40461+
liable to You for damages, including any direct, indirect, special,
40462+
incidental, or consequential damages of any character arising as a
40463+
result of this License or out of the use or inability to use the
40464+
Work (including but not limited to damages for loss of goodwill,
40465+
work stoppage, computer failure or malfunction, or any and all
40466+
other commercial damages or losses), even if such Contributor
40467+
has been advised of the possibility of such damages.
40468+
40469+
9. Accepting Warranty or Additional Liability. While redistributing
40470+
the Work or Derivative Works thereof, You may choose to offer,
40471+
and charge a fee for, acceptance of support, warranty, indemnity,
40472+
or other liability obligations and/or rights consistent with this
40473+
License. However, in accepting such obligations, You may act only
40474+
on Your own behalf and on Your sole responsibility, not on behalf
40475+
of any other Contributor, and only if You agree to indemnify,
40476+
defend, and hold each Contributor harmless for any liability
40477+
incurred by, or claims asserted against, such Contributor by reason
40478+
of your accepting any such warranty or additional liability.
40479+
40480+
END OF TERMS AND CONDITIONS
40481+
40482+
APPENDIX: How to apply the Apache License to your work.
40483+
40484+
To apply the Apache License to your work, attach the following
40485+
boilerplate notice, with the fields enclosed by brackets "[]"
40486+
replaced with your own identifying information. (Don't include
40487+
the brackets!) The text should be enclosed in the appropriate
40488+
comment syntax for the file format. We also recommend that a
40489+
file or class name and description of purpose be included on the
40490+
same "printed page" as the copyright notice for easier
40491+
identification within third-party archives.
40492+
40493+
Copyright [yyyy] [name of copyright owner]
40494+
40495+
Licensed under the Apache License, Version 2.0 (the "License");
40496+
you may not use this file except in compliance with the License.
40497+
You may obtain a copy of the License at
40498+
40499+
http://www.apache.org/licenses/LICENSE-2.0
40500+
40501+
Unless required by applicable law or agreed to in writing, software
40502+
distributed under the License is distributed on an "AS IS" BASIS,
40503+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
40504+
See the License for the specific language governing permissions and
40505+
limitations under the License.
40506+
40507+
4029740508
--------------------------------------------------------------------------------
4029840509
Dependency : github.com/onsi/ginkgo
4029940510
Version: v1.16.5

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/magefile/mage v1.15.0
3939
github.com/mitchellh/hashstructure v1.1.0
4040
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
41-
github.com/oklog/ulid v1.3.1
41+
github.com/oklog/ulid/v2 v2.1.0
4242
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.106.1
4343
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.106.1
4444
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.106.1

go.sum

+3
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
13541354
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
13551355
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
13561356
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
1357+
github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
1358+
github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
13571359
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
13581360
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
13591361
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -1475,6 +1477,7 @@ github.com/ovh/go-ovh v1.5.1/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC
14751477
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
14761478
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
14771479
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
1480+
github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
14781481
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
14791482
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
14801483
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=

internal/pkg/id/generate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"crypto/rand"
99
"time"
1010

11-
"github.com/oklog/ulid"
11+
"github.com/oklog/ulid/v2"
1212
)
1313

1414
// ID represents a unique ID.

0 commit comments

Comments
 (0)