Skip to content

Commit 69fd53c

Browse files
mergify[bot]efd6
mergify[bot]
and
efd6
authored
[8.19](backport #51950) mod: replace gopkg.in/natefinch/lumberjack.v2 with elastic fork (#51955)
* mod: replace gopkg.in/natefinch/lumberjack.v2 with elastic fork (#51950) (cherry picked from commit 3de2668) # Conflicts: # go.mod # go.sum # x-pack/filebeat/input/entityanalytics/provider/okta/conf.go * resolve conflicts --------- Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
1 parent f5cd8e4 commit 69fd53c

17 files changed

Lines changed: 51 additions & 53 deletions

File tree

‎NOTICE.txt‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14358,6 +14358,38 @@ See the License for the specific language governing permissions and
1435814358
limitations under the License.
1435914359

1436014360

14361+
--------------------------------------------------------------------------------
14362+
Dependency : github.com/elastic/lumberjack
14363+
Version: v0.0.0-20260715013204-c5b60bbeaaab
14364+
Licence type (autodetected): MIT
14365+
--------------------------------------------------------------------------------
14366+
14367+
Contents of probable licence file $GOMODCACHE/github.com/elastic/lumberjack@v0.0.0-20260715013204-c5b60bbeaaab/LICENSE:
14368+
14369+
The MIT License (MIT)
14370+
14371+
Copyright (c) 2014 Nate Finch
14372+
Copyright (c) 2026 Elasticsearch B.V.
14373+
14374+
Permission is hereby granted, free of charge, to any person obtaining a copy
14375+
of this software and associated documentation files (the "Software"), to deal
14376+
in the Software without restriction, including without limitation the rights
14377+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14378+
copies of the Software, and to permit persons to whom the Software is
14379+
furnished to do so, subject to the following conditions:
14380+
14381+
The above copyright notice and this permission notice shall be included in all
14382+
copies or substantial portions of the Software.
14383+
14384+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14385+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14386+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14387+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
14388+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
14389+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
14390+
SOFTWARE.
14391+
14392+
1436114393
--------------------------------------------------------------------------------
1436214394
Dependency : github.com/elastic/mito
1436314395
Version: v1.23.2
@@ -30666,36 +30698,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3066630698
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3066730699

3066830700

30669-
--------------------------------------------------------------------------------
30670-
Dependency : gopkg.in/natefinch/lumberjack.v2
30671-
Version: v2.2.1
30672-
Licence type (autodetected): MIT
30673-
--------------------------------------------------------------------------------
30674-
30675-
Contents of probable licence file $GOMODCACHE/gopkg.in/natefinch/lumberjack.v2@v2.2.1/LICENSE:
30676-
30677-
The MIT License (MIT)
30678-
30679-
Copyright (c) 2014 Nate Finch
30680-
30681-
Permission is hereby granted, free of charge, to any person obtaining a copy
30682-
of this software and associated documentation files (the "Software"), to deal
30683-
in the Software without restriction, including without limitation the rights
30684-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
30685-
copies of the Software, and to permit persons to whom the Software is
30686-
furnished to do so, subject to the following conditions:
30687-
30688-
The above copyright notice and this permission notice shall be included in all
30689-
copies or substantial portions of the Software.
30690-
30691-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30692-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
30693-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
30694-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30695-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
30696-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30697-
SOFTWARE.
30698-
3069930701
--------------------------------------------------------------------------------
3070030702
Dependency : gopkg.in/yaml.v2
3070130703
Version: v2.4.0

‎changelog/fragments/1784080439-49092-lumberjack.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
kind: bug-fix
2+
summary: Fix goroutine leak in request trace logging infrastructure.
3+
component: filebeat

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ require (
227227
go.uber.org/mock v0.5.0
228228
golang.org/x/term v0.44.0
229229
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa
230-
gopkg.in/natefinch/lumberjack.v2 v2.2.1
231230
gopkg.in/yaml.v3 v3.0.1
232231
)
233232

@@ -236,6 +235,7 @@ require (
236235
github.com/cilium/ebpf v0.21.0
237236
github.com/coder/websocket v1.8.14
238237
github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102
238+
github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab
239239
github.com/gorilla/mux v1.8.1
240240
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
241241
github.com/mitchellh/gox v1.0.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@ github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6 h1:VgOx6omXIMK
412412
github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA=
413413
github.com/elastic/gosigar v0.14.4 h1:7NRnWJDFjEKpOjnHhtzrPGZWr9EMrYFsLjF4q0Czosk=
414414
github.com/elastic/gosigar v0.14.4/go.mod h1:tx91Eb3YgFk6y++h88fRAnxic3Si1ZDHooqnJU/hqo8=
415+
github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab h1:p33sNyLrsWoIoRFL3E6hKajacBbsHuST8xW7y7cxGzY=
416+
github.com/elastic/lumberjack v0.0.0-20260715013204-c5b60bbeaaab/go.mod h1:t8v3y03G3KubyWgYqe+Jcxj/jDddnkp70743iSYrQiU=
415417
github.com/elastic/mito v1.23.2 h1:cEtTsCdIoqglm1847b9NKu4HGImRcL4VA0exakfWCMw=
416418
github.com/elastic/mito v1.23.2/go.mod h1:nmkKaLmNGWf79vthVZcNBvKZCAFCaxx4I1LcJ1+OAfU=
417419
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw=
@@ -1527,8 +1529,6 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
15271529
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
15281530
gopkg.in/mcuadros/go-syslog.v2 v2.3.0 h1:kcsiS+WsTKyIEPABJBJtoG0KkOS6yzvJ+/eZlhD79kk=
15291531
gopkg.in/mcuadros/go-syslog.v2 v2.3.0/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
1530-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
1531-
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
15321532
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
15331533
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
15341534
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=

‎x-pack/filebeat/input/cel/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
"regexp"
1414
"time"
1515

16-
"gopkg.in/natefinch/lumberjack.v2"
1716
"gopkg.in/yaml.v3"
1817

1918
"github.com/elastic/elastic-agent-libs/logp"
2019
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
20+
"github.com/elastic/lumberjack"
2121
"github.com/elastic/mito/lib"
2222
)
2323

‎x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"go.elastic.co/ecszap"
2323
"go.uber.org/zap"
2424
"go.uber.org/zap/zapcore"
25-
"gopkg.in/natefinch/lumberjack.v2"
2625

2726
"github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections"
2827
"github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator"
@@ -33,6 +32,7 @@ import (
3332
"github.com/elastic/elastic-agent-libs/mapstr"
3433
"github.com/elastic/elastic-agent-libs/paths"
3534
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
35+
"github.com/elastic/lumberjack"
3636
)
3737

3838
const (

‎x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020
"github.com/gofrs/uuid/v5"
2121
"github.com/google/go-cmp/cmp"
2222
"github.com/stretchr/testify/require"
23-
"gopkg.in/natefinch/lumberjack.v2"
2423

2524
"github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections"
2625
"github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock"
2726
"github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher"
2827
"github.com/elastic/elastic-agent-libs/config"
2928
"github.com/elastic/elastic-agent-libs/logp"
3029
"github.com/elastic/elastic-agent-libs/paths"
30+
"github.com/elastic/lumberjack"
3131
)
3232

3333
var trace = flag.Bool("request_trace", false, "enable request tracing during tests")

‎x-pack/filebeat/input/entityanalytics/provider/jamf/conf.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import (
88
"errors"
99
"time"
1010

11-
"gopkg.in/natefinch/lumberjack.v2"
12-
1311
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
12+
"github.com/elastic/lumberjack"
1413
)
1514

1615
// defaultConfig returns a default configuration.

‎x-pack/filebeat/input/entityanalytics/provider/jamf/conf_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ import (
1010
"testing"
1111
"time"
1212

13-
"gopkg.in/natefinch/lumberjack.v2"
14-
1513
"github.com/elastic/elastic-agent-libs/config"
1614
"github.com/elastic/elastic-agent-libs/transport/httpcommon"
15+
"github.com/elastic/lumberjack"
1716
)
1817

1918
var validateTests = []struct {

‎x-pack/filebeat/input/entityanalytics/provider/jamf/jamf_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919

2020
"github.com/gofrs/uuid/v5"
2121
"github.com/google/go-cmp/cmp"
22-
"gopkg.in/natefinch/lumberjack.v2"
2322

2423
"github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf"
2524
"github.com/elastic/elastic-agent-libs/logp"
25+
"github.com/elastic/lumberjack"
2626
)
2727

2828
var trace = flag.Bool("request_trace", false, "enable request tracing during tests")

0 commit comments

Comments
 (0)