diff --git a/go.mod b/go.mod index 9c05f58a..0e3b69d1 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.20 require ( cloud.google.com/go/compute/metadata v0.2.3 - code.cloudfoundry.org/clock v1.1.0 contrib.go.opencensus.io/exporter/prometheus v0.4.2 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 github.com/acobaugh/osrelease v0.1.0 diff --git a/go.sum b/go.sum index 3c8abd08..5ecf51fa 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,6 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/trace v1.10.1 h1:EwGdOLCNfYOOPtgqo+D2sDLZmRCEO1AagRTJCU6ztdg= cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk= -code.cloudfoundry.org/clock v1.1.0 h1:XLzC6W3Ah/Y7ht1rmZ6+QfPdt1iGWEAAtIZXgiaj57c= -code.cloudfoundry.org/clock v1.1.0/go.mod h1:yA3fxddT9RINQL2XHS7PS+OXxKCGhfrZmlNUCIM6AKo= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= contrib.go.opencensus.io/exporter/stackdriver v0.13.14 h1:zBakwHardp9Jcb8sQHcHpXy/0+JIb1M8KjigCJzx7+4= @@ -1074,7 +1072,6 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4 h1:MGZzzxBuPuK4J0XQo+0uy0NnXQGKzHXhYp5oG1Wy860= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= diff --git a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher.go b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher.go index 7d1247c1..2c319d6f 100644 --- a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher.go +++ b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher.go @@ -23,7 +23,6 @@ import ( "strings" "time" - utilclock "code.cloudfoundry.org/clock" "k8s.io/klog/v2" "k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types" @@ -40,7 +39,6 @@ type filelogWatcher struct { logCh chan *logtypes.Log startTime time.Time tomb *tomb.Tomb - clock utilclock.Clock } // NewSyslogWatcherOrDie creates a new log watcher. The function panics @@ -62,7 +60,6 @@ func NewSyslogWatcherOrDie(cfg types.WatcherConfig) types.LogWatcher { tomb: tomb.NewTomb(), // A capacity 1000 buffer should be enough logCh: make(chan *logtypes.Log, 1000), - clock: utilclock.NewClock(), } } diff --git a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_test.go b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_test.go index 93c758d1..959a7de4 100644 --- a/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_test.go +++ b/pkg/systemlogmonitor/logwatchers/filelog/log_watcher_test.go @@ -25,8 +25,8 @@ import ( logtypes "k8s.io/node-problem-detector/pkg/systemlogmonitor/types" "k8s.io/node-problem-detector/pkg/util" - "code.cloudfoundry.org/clock/fakeclock" "github.com/stretchr/testify/assert" + testclock "k8s.io/utils/clock/testing" ) // getTestPluginConfig returns a plugin config for test. Use configuration for @@ -42,7 +42,7 @@ func getTestPluginConfig() map[string]string { func TestWatch(t *testing.T) { // now is a fake time now := time.Date(time.Now().Year(), time.January, 2, 3, 4, 5, 0, time.Local) - fakeClock := fakeclock.NewFakeClock(now) + fakeClock := testclock.NewFakeClock(now) testCases := []struct { uptime time.Duration lookback string @@ -155,8 +155,6 @@ Jan 2 03:04:05 kernel: [2.000000] 3 }) // Set the startTime. w.(*filelogWatcher).startTime, _ = util.GetStartTime(fakeClock.Now(), test.uptime, test.lookback, test.delay) - // Set the fake clock. - w.(*filelogWatcher).clock = fakeClock logCh, err := w.Watch() assert.NoError(t, err) defer w.Stop() diff --git a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux.go b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux.go index 0dd4fc9d..ecc40294 100644 --- a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux.go +++ b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux.go @@ -21,7 +21,6 @@ import ( "strings" "time" - utilclock "code.cloudfoundry.org/clock" "github.com/euank/go-kmsg-parser/kmsgparser" "k8s.io/klog/v2" @@ -38,7 +37,6 @@ type kernelLogWatcher struct { tomb *tomb.Tomb kmsgParser kmsgparser.Parser - clock utilclock.Clock } // NewKmsgWatcher creates a watcher which will read messages from /dev/kmsg @@ -58,7 +56,6 @@ func NewKmsgWatcher(cfg types.WatcherConfig) types.LogWatcher { tomb: tomb.NewTomb(), // Arbitrary capacity logCh: make(chan *logtypes.Log, 100), - clock: utilclock.NewClock(), } } diff --git a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux_test.go b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux_test.go index fd018ed9..85c95652 100644 --- a/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux_test.go +++ b/pkg/systemlogmonitor/logwatchers/kmsg/log_watcher_linux_test.go @@ -17,12 +17,11 @@ limitations under the License. package kmsg import ( + testclock "k8s.io/utils/clock/testing" "testing" - "code.cloudfoundry.org/clock/fakeclock" "github.com/euank/go-kmsg-parser/kmsgparser" "github.com/stretchr/testify/assert" - "time" "k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types" @@ -49,7 +48,7 @@ func (m *mockKmsgParser) SeekEnd() error { return nil } func TestWatch(t *testing.T) { now := time.Date(time.Now().Year(), time.January, 2, 3, 4, 5, 0, time.Local) - fakeClock := fakeclock.NewFakeClock(now) + fakeClock := testclock.NewFakeClock(now) testCases := []struct { uptime time.Duration lookback string @@ -150,7 +149,6 @@ func TestWatch(t *testing.T) { for _, test := range testCases { w := NewKmsgWatcher(types.WatcherConfig{Lookback: test.lookback}) w.(*kernelLogWatcher).startTime, _ = util.GetStartTime(fakeClock.Now(), test.uptime, test.lookback, test.delay) - w.(*kernelLogWatcher).clock = fakeClock w.(*kernelLogWatcher).kmsgParser = test.log logCh, err := w.Watch() if err != nil { diff --git a/vendor/code.cloudfoundry.org/clock/LICENSE b/vendor/code.cloudfoundry.org/clock/LICENSE deleted file mode 100644 index f49a4e16..00000000 --- a/vendor/code.cloudfoundry.org/clock/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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. \ No newline at end of file diff --git a/vendor/code.cloudfoundry.org/clock/NOTICE b/vendor/code.cloudfoundry.org/clock/NOTICE deleted file mode 100644 index 29c0e5ff..00000000 --- a/vendor/code.cloudfoundry.org/clock/NOTICE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2015-Present CloudFoundry.org Foundation, Inc. All Rights Reserved. - -This project contains software that is Copyright (c) 2015 Pivotal Software, Inc. - -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. - -This project may include a number of subcomponents with separate -copyright notices and license terms. Your use of these subcomponents -is subject to the terms and conditions of each subcomponent's license, -as noted in the LICENSE file. diff --git a/vendor/code.cloudfoundry.org/clock/README.md b/vendor/code.cloudfoundry.org/clock/README.md deleted file mode 100644 index f6dc4a4a..00000000 --- a/vendor/code.cloudfoundry.org/clock/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# clock - -**Note**: This repository should be imported as `code.cloudfoundry.org/clock`. - -Provides a `Clock` interface, useful for injecting time dependencies in tests. - -## Reporting issues and requesting features - -Please report all issues and feature requests in [cloudfoundry/diego-release](https://github.com/cloudfoundry/diego-release/issues). - -## Contributing - -For tagging please use the semver compatible version format e.g. `v1.0.0`. diff --git a/vendor/code.cloudfoundry.org/clock/clock.go b/vendor/code.cloudfoundry.org/clock/clock.go deleted file mode 100644 index 6b091d99..00000000 --- a/vendor/code.cloudfoundry.org/clock/clock.go +++ /dev/null @@ -1,53 +0,0 @@ -package clock - -import "time" - -type Clock interface { - Now() time.Time - Sleep(d time.Duration) - Since(t time.Time) time.Duration - // After waits for the duration to elapse and then sends the current time - // on the returned channel. - // It is equivalent to clock.NewTimer(d).C. - // The underlying Timer is not recovered by the garbage collector - // until the timer fires. If efficiency is a concern, use clock.NewTimer - // instead and call Timer.Stop if the timer is no longer needed. - After(d time.Duration) <-chan time.Time - - NewTimer(d time.Duration) Timer - NewTicker(d time.Duration) Ticker -} - -type realClock struct{} - -func NewClock() Clock { - return &realClock{} -} - -func (clock *realClock) Now() time.Time { - return time.Now() -} - -func (clock *realClock) Since(t time.Time) time.Duration { - return time.Now().Sub(t) -} - -func (clock *realClock) Sleep(d time.Duration) { - <-clock.NewTimer(d).C() -} - -func (clock *realClock) After(d time.Duration) <-chan time.Time { - return clock.NewTimer(d).C() -} - -func (clock *realClock) NewTimer(d time.Duration) Timer { - return &realTimer{ - t: time.NewTimer(d), - } -} - -func (clock *realClock) NewTicker(d time.Duration) Ticker { - return &realTicker{ - t: time.NewTicker(d), - } -} diff --git a/vendor/code.cloudfoundry.org/clock/fakeclock/fake_clock.go b/vendor/code.cloudfoundry.org/clock/fakeclock/fake_clock.go deleted file mode 100644 index abe64a75..00000000 --- a/vendor/code.cloudfoundry.org/clock/fakeclock/fake_clock.go +++ /dev/null @@ -1,139 +0,0 @@ -package fakeclock - -import ( - "errors" - "sync" - "time" - - "code.cloudfoundry.org/clock" -) - -type timeWatcher interface { - timeUpdated(time.Time) - shouldFire(time.Time) bool - repeatable() bool -} - -type FakeClock struct { - now time.Time - - watchers map[timeWatcher]struct{} - cond *sync.Cond -} - -func NewFakeClock(now time.Time) *FakeClock { - return &FakeClock{ - now: now, - watchers: make(map[timeWatcher]struct{}), - cond: &sync.Cond{L: &sync.Mutex{}}, - } -} - -func (clock *FakeClock) Since(t time.Time) time.Duration { - return clock.Now().Sub(t) -} - -func (clock *FakeClock) Now() time.Time { - clock.cond.L.Lock() - defer clock.cond.L.Unlock() - - return clock.now -} - -func (clock *FakeClock) Increment(duration time.Duration) { - clock.increment(duration, false, 0) -} - -func (clock *FakeClock) IncrementBySeconds(seconds uint64) { - clock.Increment(time.Duration(seconds) * time.Second) -} - -func (clock *FakeClock) WaitForWatcherAndIncrement(duration time.Duration) { - clock.WaitForNWatchersAndIncrement(duration, 1) -} - -func (clock *FakeClock) WaitForNWatchersAndIncrement(duration time.Duration, numWatchers int) { - clock.increment(duration, true, numWatchers) -} - -func (clock *FakeClock) NewTimer(d time.Duration) clock.Timer { - timer := newFakeTimer(clock, d, false) - clock.addTimeWatcher(timer) - - return timer -} - -func (clock *FakeClock) Sleep(d time.Duration) { - <-clock.NewTimer(d).C() -} - -func (clock *FakeClock) After(d time.Duration) <-chan time.Time { - return clock.NewTimer(d).C() -} - -func (clock *FakeClock) NewTicker(d time.Duration) clock.Ticker { - if d <= 0 { - panic(errors.New("duration must be greater than zero")) - } - - timer := newFakeTimer(clock, d, true) - clock.addTimeWatcher(timer) - - return newFakeTicker(timer) -} - -func (clock *FakeClock) WatcherCount() int { - clock.cond.L.Lock() - defer clock.cond.L.Unlock() - - return len(clock.watchers) -} - -func (clock *FakeClock) increment(duration time.Duration, waitForWatchers bool, numWatchers int) { - clock.cond.L.Lock() - - for waitForWatchers && len(clock.watchers) < numWatchers { - clock.cond.Wait() - } - - now := clock.now.Add(duration) - clock.now = now - - watchers := make([]timeWatcher, 0) - newWatchers := map[timeWatcher]struct{}{} - for w, _ := range clock.watchers { - fire := w.shouldFire(now) - if fire { - watchers = append(watchers, w) - } - - if !fire || w.repeatable() { - newWatchers[w] = struct{}{} - } - } - - clock.watchers = newWatchers - - clock.cond.L.Unlock() - - for _, w := range watchers { - w.timeUpdated(now) - } -} - -func (clock *FakeClock) addTimeWatcher(tw timeWatcher) { - clock.cond.L.Lock() - clock.watchers[tw] = struct{}{} - clock.cond.L.Unlock() - - // force the timer to fire - clock.Increment(0) - - clock.cond.Broadcast() -} - -func (clock *FakeClock) removeTimeWatcher(tw timeWatcher) { - clock.cond.L.Lock() - delete(clock.watchers, tw) - clock.cond.L.Unlock() -} diff --git a/vendor/code.cloudfoundry.org/clock/fakeclock/fake_ticker.go b/vendor/code.cloudfoundry.org/clock/fakeclock/fake_ticker.go deleted file mode 100644 index b77bcc7e..00000000 --- a/vendor/code.cloudfoundry.org/clock/fakeclock/fake_ticker.go +++ /dev/null @@ -1,25 +0,0 @@ -package fakeclock - -import ( - "time" - - "code.cloudfoundry.org/clock" -) - -type fakeTicker struct { - timer clock.Timer -} - -func newFakeTicker(timer *fakeTimer) *fakeTicker { - return &fakeTicker{ - timer: timer, - } -} - -func (ft *fakeTicker) C() <-chan time.Time { - return ft.timer.C() -} - -func (ft *fakeTicker) Stop() { - ft.timer.Stop() -} diff --git a/vendor/code.cloudfoundry.org/clock/fakeclock/fake_timer.go b/vendor/code.cloudfoundry.org/clock/fakeclock/fake_timer.go deleted file mode 100644 index 8c6cc0c4..00000000 --- a/vendor/code.cloudfoundry.org/clock/fakeclock/fake_timer.go +++ /dev/null @@ -1,87 +0,0 @@ -package fakeclock - -import ( - "sync" - "time" -) - -type fakeTimer struct { - clock *FakeClock - - mutex sync.Mutex - completionTime time.Time - channel chan time.Time - duration time.Duration - repeat bool -} - -func newFakeTimer(clock *FakeClock, d time.Duration, repeat bool) *fakeTimer { - return &fakeTimer{ - clock: clock, - completionTime: clock.Now().Add(d), - channel: make(chan time.Time, 1), - duration: d, - repeat: repeat, - } -} - -func (ft *fakeTimer) C() <-chan time.Time { - ft.mutex.Lock() - defer ft.mutex.Unlock() - return ft.channel -} - -func (ft *fakeTimer) reset(d time.Duration) bool { - currentTime := ft.clock.Now() - - ft.mutex.Lock() - active := !ft.completionTime.IsZero() - ft.completionTime = currentTime.Add(d) - ft.mutex.Unlock() - return active -} - -func (ft *fakeTimer) Reset(d time.Duration) bool { - active := ft.reset(d) - ft.clock.addTimeWatcher(ft) - return active -} - -func (ft *fakeTimer) Stop() bool { - ft.mutex.Lock() - active := !ft.completionTime.IsZero() - ft.mutex.Unlock() - - ft.clock.removeTimeWatcher(ft) - - return active -} - -func (ft *fakeTimer) shouldFire(now time.Time) bool { - ft.mutex.Lock() - defer ft.mutex.Unlock() - - if ft.completionTime.IsZero() { - return false - } - - return now.After(ft.completionTime) || now.Equal(ft.completionTime) -} - -func (ft *fakeTimer) repeatable() bool { - return ft.repeat -} - -func (ft *fakeTimer) timeUpdated(now time.Time) { - select { - case ft.channel <- now: - default: - // drop on the floor. timers have a buffered channel anyway. according to - // godoc of the `time' package a ticker can loose ticks in case of a slow - // receiver - } - - if ft.repeatable() { - ft.reset(ft.duration) - } -} diff --git a/vendor/code.cloudfoundry.org/clock/fakeclock/package.go b/vendor/code.cloudfoundry.org/clock/fakeclock/package.go deleted file mode 100644 index 36b82a2e..00000000 --- a/vendor/code.cloudfoundry.org/clock/fakeclock/package.go +++ /dev/null @@ -1 +0,0 @@ -package fakeclock // import "code.cloudfoundry.org/clock/fakeclock" diff --git a/vendor/code.cloudfoundry.org/clock/package.go b/vendor/code.cloudfoundry.org/clock/package.go deleted file mode 100644 index 349f67c8..00000000 --- a/vendor/code.cloudfoundry.org/clock/package.go +++ /dev/null @@ -1 +0,0 @@ -package clock // import "code.cloudfoundry.org/clock" diff --git a/vendor/code.cloudfoundry.org/clock/ticker.go b/vendor/code.cloudfoundry.org/clock/ticker.go deleted file mode 100644 index f25129e1..00000000 --- a/vendor/code.cloudfoundry.org/clock/ticker.go +++ /dev/null @@ -1,20 +0,0 @@ -package clock - -import "time" - -type Ticker interface { - C() <-chan time.Time - Stop() -} - -type realTicker struct { - t *time.Ticker -} - -func (t *realTicker) C() <-chan time.Time { - return t.t.C -} - -func (t *realTicker) Stop() { - t.t.Stop() -} diff --git a/vendor/code.cloudfoundry.org/clock/timer.go b/vendor/code.cloudfoundry.org/clock/timer.go deleted file mode 100644 index cf8c2212..00000000 --- a/vendor/code.cloudfoundry.org/clock/timer.go +++ /dev/null @@ -1,25 +0,0 @@ -package clock - -import "time" - -type Timer interface { - C() <-chan time.Time - Reset(d time.Duration) bool - Stop() bool -} - -type realTimer struct { - t *time.Timer -} - -func (t *realTimer) C() <-chan time.Time { - return t.t.C -} - -func (t *realTimer) Reset(d time.Duration) bool { - return t.t.Reset(d) -} - -func (t *realTimer) Stop() bool { - return t.t.Stop() -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 9cd2b62e..add30d89 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -14,10 +14,6 @@ cloud.google.com/go/monitoring/internal cloud.google.com/go/trace/apiv2 cloud.google.com/go/trace/apiv2/tracepb cloud.google.com/go/trace/internal -# code.cloudfoundry.org/clock v1.1.0 -## explicit; go 1.20 -code.cloudfoundry.org/clock -code.cloudfoundry.org/clock/fakeclock # contrib.go.opencensus.io/exporter/prometheus v0.4.2 ## explicit; go 1.13 contrib.go.opencensus.io/exporter/prometheus