repo
stringlengths
5
53
pr_number
int32
1
321k
task_type
stringclasses
2 values
issue_text
stringlengths
0
81.2k
pr_title
stringlengths
1
319
pr_body
stringlengths
0
105k
base_sha
stringlengths
40
40
head_sha
stringlengths
40
40
gold_diff
stringlengths
0
202M
changed_files
listlengths
0
100
review_threads
listlengths
0
100
test_patch
stringlengths
0
23.4M
merged
bool
1 class
uNetworking/uWebSockets
1,486
issue_to_patch
add unix domain socket support for websocket
01a394cf5f6fce03fe111b56dc9f185cdcecf2db
f4700b990f630ec47cfefde54e83d76620b7fa3e
diff --git a/src/App.h b/src/App.h index cd7e92712..95ed0657d 100644 --- a/src/App.h +++ b/src/App.h @@ -533,6 +533,18 @@ struct TemplatedApp { return std::move(*this); } + /* options, callback, path to unix domain socket */ + TemplatedApp &&listen(int options, MoveOnlyFunction<void(us_listen_sock...
[ "src/App.h", "src/HttpContext.h" ]
[]
true
uNetworking/uWebSockets
1,414
issue_to_patch
Updated Safari hack to target 15.0-15.3 (#1347)
To be merged when we are 100% sure, that Safari 15.4 is fixed.
89ea606da99a621e61fd504f8c6278819eb4702c
f53d6aee57f33c7280d4e6dc1b38be3a02727ed7
diff --git a/src/App.h b/src/App.h index bf857be78..708dff15e 100644 --- a/src/App.h +++ b/src/App.h @@ -35,20 +35,24 @@ namespace uWS { bool compress; }; + /* Safari 15.0 - 15.3 has a completely broken compression implementation (client_no_context_takeover not + * properly implemented) - so we f...
[ "src/App.h" ]
[]
true
uNetworking/uWebSockets
1,435
issue_to_patch
Allow passing custom ciphers via options
The main goal is to be able to pass custom ciphers from node.js (In App options) and have them used internally in uSockets Followup of https://github.com/uNetworking/uSockets/pull/171
eea4b7e0f6e907646d34909e32f415c2a7dea385
e5540b15ba11bd8af04794d878433dbbb140ef79
diff --git a/src/App.h b/src/App.h index 708dff15e..49717b54b 100644 --- a/src/App.h +++ b/src/App.h @@ -76,6 +76,7 @@ namespace uWS { const char *passphrase = nullptr; const char *dh_params_file_name = nullptr; const char *ca_file_name = nullptr; + const char *ssl_ciphers = nullptr; ...
[ "src/App.h" ]
[]
true
uNetworking/uWebSockets
1,406
issue_to_patch
Fixed masking for continuations
Hi, it seems like WebSocket-masking is not done for continuations (see diff below). In fact, I observed for our project that - if a websocket frame is split into several TCP frames - only the first one is demasked. The provided patch should fix that
49da3cb27ed1f9a01ad9ea43876212e20b7227ed
e50d0079ea94021705503b47c3dba9b1f5ca4322
diff --git a/src/WebSocketProtocol.h b/src/WebSocketProtocol.h index 38f6a6b2f..06ecd9265 100644 --- a/src/WebSocketProtocol.h +++ b/src/WebSocketProtocol.h @@ -401,7 +401,7 @@ struct WIN32_EXPORT WebSocketProtocol { if (isServer) { /* No need to unmask if mask is 0 */ uin...
[ "src/WebSocketProtocol.h" ]
[]
true
uber-go/zap
1,547
issue_to_patch
release v1.28.0
0ab0d5aae5986395e2ca497385d977ccd7cdfc5e
cacd46f176f39fb71b2153e9c9694397b12ba8ff
diff --git a/CHANGELOG.md b/CHANGELOG.md index 86e7e6f98..53848733c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.28.0 (27 Apr 2026) +Enhanc...
[ "CHANGELOG.md" ]
[]
true
uber-go/zap
1,534
issue_to_patch
zapcore: Add PreWriteHook for transforming entries before write
This adds a new CheckPreWriteHook type and a Before method on CheckedEntry that allows transforming the Entry and Fields before they are written to any registered Cores. The existing CheckWriteHook (set via After/WithFatalHook) only runs *after* cores have already written the entry, which means it cannot modify what...
16fb16b353f2e27bcd71eba69cbd346b3dcc471a
aef708b169c732781cafd47c3888876963a87ebb
diff --git a/zapcore/entry.go b/zapcore/entry.go index 841752f2e..e1fc07a1f 100644 --- a/zapcore/entry.go +++ b/zapcore/entry.go @@ -201,6 +201,14 @@ func (a CheckWriteAction) OnWrite(ce *CheckedEntry, _ []Field) { var _ CheckWriteHook = CheckWriteAction(0) +// CheckPreWriteHook is a function that transforms an En...
[ "zapcore/entry.go", "zapcore/entry_test.go" ]
[]
diff --git a/zapcore/entry_test.go b/zapcore/entry_test.go index 6555ab6d0..0bed21c34 100644 --- a/zapcore/entry_test.go +++ b/zapcore/entry_test.go @@ -147,3 +147,82 @@ type customHook struct { func (c *customHook) OnWrite(_ *CheckedEntry, _ []Field) { c.called = true } + +func TestCheckedEntryBefore(t *testing.T)...
true
uber-go/zap
1,535
issue_to_patch
[chore] CI: test on Go 1.26
16fb16b353f2e27bcd71eba69cbd346b3dcc471a
1b5c1e4c48e82fae62943877fa5ec7880b2c23fc
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 448a7c1d1..52b615219 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.24.x", "1.25.x"] + go: ["1.25.x", "1.26.x"] ...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,522
issue_to_patch
chore(dep): replace archived gopkg.in/yaml.v3 with officially maintained go.yaml.in/yaml/v3
The package `gopkg.in/yaml.v3` has been archived since April and is not maintained anymore. The official Yaml org stepped up and is now maintaining a new repository under `go.yaml.in/yaml/v3`. Ref.: https://github.com/go-yaml/yaml https://github.com/yaml/go-yaml
7b755a3910491932656b01f2013b8bf41e74d4e8
cece36360b1ecac112d7d5ff95a9c3aae08d8035
diff --git a/benchmarks/go.sum b/benchmarks/go.sum index da0b1f14b..a3801bcfc 100644 --- a/benchmarks/go.sum +++ b/benchmarks/go.sum @@ -75,6 +75,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/...
[ "benchmarks/go.sum", "exp/go.sum", "go.mod", "go.sum", "zapcore/encoder_test.go", "zapgrpc/internal/test/go.sum" ]
[ { "comment": "This is due to testify waiting for the v4 release:\r\nhttps://github.com/stretchr/testify/pull/1772", "path": "go.mod", "hunk": "@@ -6,11 +6,12 @@ require (\n \tgithub.com/stretchr/testify v1.8.1\n \tgo.uber.org/goleak v1.3.0\n \tgo.uber.org/multierr v1.10.0\n-\tgopkg.in/yaml.v3 v3.0.1\n+\...
diff --git a/zapcore/encoder_test.go b/zapcore/encoder_test.go index f89f489fd..93427d800 100644 --- a/zapcore/encoder_test.go +++ b/zapcore/encoder_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" //reviv...
true
uber-go/zap
1,521
issue_to_patch
release 1.27.1
d6b395b76053053ec6ae18121c01e08718708bc3
52add135d96c2a5faa7a9839e8f4e4353b9c8ebd
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d6cd5f4d..86e7e6f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.27.1 (19 Nov 2025) +Enhan...
[ "CHANGELOG.md" ]
[]
true
uber-go/zap
1,519
issue_to_patch
Update lazy logger not to materialize unless it's being written to
Lazy logger is frequently used to delay (expensive) logger initialization unless we actually write to it. This works for a pattern like: ```golang logger := logger.With(.../*fields) err := foo() if err != nil { logger.Info("foo: %w, err) } ``` Another common pattern, though, is ```golang logger := l...
4b9cea0fee0414839ee5f8c69320c12f181c3d47
256989771495eba5d0916326f5add07408d02bcd
diff --git a/zapcore/lazy_with.go b/zapcore/lazy_with.go index c0d63a0f5..500809de0 100644 --- a/zapcore/lazy_with.go +++ b/zapcore/lazy_with.go @@ -23,7 +23,8 @@ package zapcore import "sync" type lazyWithCore struct { - core Core + core Core + originalCore Core sync.Once fields []Field } @@ -32,14 ...
[ "zapcore/lazy_with.go", "zapcore/lazy_with_test.go" ]
[ { "comment": "this is confusing, only set `originalCore`, and add a comment that `core` is set in `initOnce` (and update `initOnce` to do `d.core = d.originalCore.With(d.fields)`", "path": "zapcore/lazy_with.go", "hunk": "@@ -32,8 +33,9 @@ type lazyWithCore struct {\n // the logger is written to (or is ...
diff --git a/zapcore/lazy_with_test.go b/zapcore/lazy_with_test.go index 112b30a22..ae1723ce8 100644 --- a/zapcore/lazy_with_test.go +++ b/zapcore/lazy_with_test.go @@ -65,6 +65,7 @@ func TestLazyCore(t *testing.T) { initialFields []zapcore.Field withChains [][]zapcore.Field wantLogs []observer.LoggedE...
true
uber-go/zap
1,519
comment_to_fix
Update lazy logger not to materialize unless it's being written to
this is confusing, only set `originalCore`, and add a comment that `core` is set in `initOnce` (and update `initOnce` to do `d.core = d.originalCore.With(d.fields)`
4b9cea0fee0414839ee5f8c69320c12f181c3d47
256989771495eba5d0916326f5add07408d02bcd
diff --git a/zapcore/lazy_with.go b/zapcore/lazy_with.go index c0d63a0f5..500809de0 100644 --- a/zapcore/lazy_with.go +++ b/zapcore/lazy_with.go @@ -23,7 +23,8 @@ package zapcore import "sync" type lazyWithCore struct { - core Core + core Core + originalCore Core sync.Once fields []Field } @@ -32,14 ...
[ "zapcore/lazy_with.go" ]
[ { "comment": "this is confusing, only set `originalCore`, and add a comment that `core` is set in `initOnce` (and update `initOnce` to do `d.core = d.originalCore.With(d.fields)`", "path": "zapcore/lazy_with.go", "hunk": "@@ -32,8 +33,9 @@ type lazyWithCore struct {\n // the logger is written to (or is ...
true
uber-go/zap
1,519
comment_to_fix
Update lazy logger not to materialize unless it's being written to
maybe worth adding a comment about why it's safe (e.g., lazyWithCore doesn't change the level)
4b9cea0fee0414839ee5f8c69320c12f181c3d47
256989771495eba5d0916326f5add07408d02bcd
diff --git a/zapcore/lazy_with.go b/zapcore/lazy_with.go index c0d63a0f5..500809de0 100644 --- a/zapcore/lazy_with.go +++ b/zapcore/lazy_with.go @@ -23,7 +23,8 @@ package zapcore import "sync" type lazyWithCore struct { - core Core + core Core + originalCore Core sync.Once fields []Field } @@ -32,14 ...
[ "zapcore/lazy_with.go" ]
[ { "comment": "maybe worth adding a comment about why it's safe (e.g., lazyWithCore doesn't change the level)", "path": "zapcore/lazy_with.go", "hunk": "@@ -49,13 +51,15 @@ func (d *lazyWithCore) With(fields []Field) Core {\n }\n \n func (d *lazyWithCore) Check(e Entry, ce *CheckedEntry) *CheckedEntry {\...
true
uber-go/zap
1,508
issue_to_patch
ci: Test with Go 1.24, Go 1.25
Test with Go 1.24, Go 1.25 similar to; - #1409 - #1464 passed test: https://github.com/arukiidou/zap/pull/12 ## note ### one slogtest added since Go 1.25, but still passed. Go 1.25 will add another test case to testing/slogtest , but still passed. ``` "a Handler should not output nested groups if t...
07077a697f639389cc998ff91b8885feb25f520d
0d82c8f6fd2cfdc37244fb81084e0021f54abbe1
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 1a692cad2..448a7c1d1 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.22.x", "1.23.x"] + go: ["1.24.x", "1.25.x"] ...
[ ".github/workflows/go.yml", "tools/go.mod", "tools/go.sum" ]
[]
true
uber-go/zap
1,511
issue_to_patch
Fix race condition in WithLazy implementation (#1426)
## Summary - Fixes race condition in `WithLazy` implementation that occurred when multiple goroutines accessed `Enabled()` method - Removes embedded `Core` from `lazyWithCore` struct and replaces with explicit delegate methods - Adds regression test to prevent future race conditions ## Problem Issue #1426 reported a...
07077a697f639389cc998ff91b8885feb25f520d
12e9a73cbf7c3c5823da9103c7161d05d9b3bfc1
diff --git a/zapcore/lazy_with.go b/zapcore/lazy_with.go index 05288d6a8..c0d63a0f5 100644 --- a/zapcore/lazy_with.go +++ b/zapcore/lazy_with.go @@ -23,7 +23,7 @@ package zapcore import "sync" type lazyWithCore struct { - Core + core Core sync.Once fields []Field } @@ -32,23 +32,38 @@ type lazyWithCore struc...
[ "zapcore/lazy_with.go", "zapcore/lazy_with_test.go" ]
[]
diff --git a/zapcore/lazy_with_test.go b/zapcore/lazy_with_test.go index c86b59e0d..112b30a22 100644 --- a/zapcore/lazy_with_test.go +++ b/zapcore/lazy_with_test.go @@ -21,6 +21,7 @@ package zapcore_test import ( + "sync" "sync/atomic" "testing" @@ -152,3 +153,34 @@ func TestLazyCore(t *testing.T) { }) }...
true
uber-go/zap
948
issue_to_patch
Add NewTicker to the Clock Interface
Changes in this diff: - Move Clock interface to zapcore and re-exported from the top-level zap package - Add NewTicker method as part of Clock Interface With this changes Clock interface will be available inside of zapcore and the NewTicker method will allow us to control time.Ticker when it is necessary. T...
374825111f7fc2fca60d36daeb8d656c3bc5d40a
0839a6b1a2d15e1db516134f31966834f8ed4b41
diff --git a/benchmarks/go.sum b/benchmarks/go.sum index 5a5d873d0..d6faee4a7 100644 --- a/benchmarks/go.sum +++ b/benchmarks/go.sum @@ -1,11 +1,11 @@ -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfW...
[ "benchmarks/go.sum", "clock.go", "clock_test.go", "go.mod", "go.sum", "leak_test.go", "zapcore/clock.go", "zapcore/clock_test.go", "zapcore/leak_test.go", "zapgrpc/internal/test/go.sum" ]
[ { "comment": "Do we need to keep the zap-level Clock type? We haven't shipped this yet so we can move this type to zapcore without breaking anything.\r\n\r\nAlso, if we do want to keep it around, we probably want to use a type alias.\r\n\r\n```suggestion\r\ntype Clock = zapcore.Clock\r\n```\r\n\r\nThe current f...
diff --git a/clock_test.go b/clock_test.go index 0e7bfd863..c46b62c0a 100644 --- a/clock_test.go +++ b/clock_test.go @@ -32,6 +32,9 @@ import ( type constantClock time.Time func (c constantClock) Now() time.Time { return time.Time(c) } +func (c constantClock) NewTicker(d time.Duration) *time.Ticker { + return &time...
true
uber-go/zap
948
comment_to_fix
Add NewTicker to the Clock Interface
Do we need to keep the zap-level Clock type? We haven't shipped this yet so we can move this type to zapcore without breaking anything. Also, if we do want to keep it around, we probably want to use a type alias. ```suggestion type Clock = zapcore.Clock ``` The current form declares a new type Clock that is ...
374825111f7fc2fca60d36daeb8d656c3bc5d40a
0839a6b1a2d15e1db516134f31966834f8ed4b41
diff --git a/clock.go b/clock.go index 7d0e574ed..380d9f341 100644 --- a/clock.go +++ b/clock.go @@ -20,13 +20,14 @@ package zap -import "time" +import ( + "time" + + "go.uber.org/zap/zapcore" +) // Clock is a source of time for logged entries. -type Clock interface { - // Now returns the current local time. - ...
[ "clock.go" ]
[ { "comment": "Do we need to keep the zap-level Clock type? We haven't shipped this yet so we can move this type to zapcore without breaking anything.\r\n\r\nAlso, if we do want to keep it around, we probably want to use a type alias.\r\n\r\n```suggestion\r\ntype Clock = zapcore.Clock\r\n```\r\n\r\nThe current f...
true
uber-go/zap
948
comment_to_fix
Add NewTicker to the Clock Interface
Is this enough for a mock/test implementation? I think it would help to include a test implementation in this PR to understand how this gives us control over the Ticker.
374825111f7fc2fca60d36daeb8d656c3bc5d40a
0839a6b1a2d15e1db516134f31966834f8ed4b41
diff --git a/zapcore/clock.go b/zapcore/clock.go new file mode 100644 index 000000000..78129061a --- /dev/null +++ b/zapcore/clock.go @@ -0,0 +1,34 @@ +// Copyright (c) 2021 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated d...
[ "zapcore/clock.go" ]
[ { "comment": "Is this enough for a mock/test implementation? I think it would help to include a test implementation in this PR to understand how this gives us control over the Ticker.", "path": "zapcore/clock.go", "hunk": "@@ -0,0 +1,34 @@\n+// Copyright (c) 2021 Uber Technologies, Inc.\n+//\n+// Permis...
true
uber-go/zap
948
comment_to_fix
Add NewTicker to the Clock Interface
super nit: ```suggestion // that delivers "ticks" of a clock. ``` Not sure what kind of quotes you wanted here, but the current ticks don't look correct. Ignore me if I'm wrong.
374825111f7fc2fca60d36daeb8d656c3bc5d40a
0839a6b1a2d15e1db516134f31966834f8ed4b41
diff --git a/zapcore/clock.go b/zapcore/clock.go new file mode 100644 index 000000000..78129061a --- /dev/null +++ b/zapcore/clock.go @@ -0,0 +1,34 @@ +// Copyright (c) 2021 Uber Technologies, Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated d...
[ "zapcore/clock.go" ]
[ { "comment": "super nit: \r\n```suggestion\r\n\t// that delivers \"ticks\" of a clock.\r\n```\r\nNot sure what kind of quotes you wanted here, but the current ticks don't look correct. Ignore me if I'm wrong. ", "path": "zapcore/clock.go", "hunk": "@@ -0,0 +1,34 @@\n+// Copyright (c) 2021 Uber Technolog...
true
uber-go/zap
948
comment_to_fix
Add NewTicker to the Clock Interface
Do these exported names not need comments for docstring?
374825111f7fc2fca60d36daeb8d656c3bc5d40a
0839a6b1a2d15e1db516134f31966834f8ed4b41
diff --git a/clock.go b/clock.go index 7d0e574ed..380d9f341 100644 --- a/clock.go +++ b/clock.go @@ -20,13 +20,14 @@ package zap -import "time" +import ( + "time" + + "go.uber.org/zap/zapcore" +) // Clock is a source of time for logged entries. -type Clock interface { - // Now returns the current local time. - ...
[ "clock.go" ]
[ { "comment": "Do these exported names not need comments for docstring? ", "path": "clock.go", "hunk": "@@ -36,3 +37,7 @@ var _systemClock Clock = systemClock{}\n func (systemClock) Now() time.Time {\n \treturn time.Now()\n }\n+", "resolving_sha": "0839a6b1a2d15e1db516134f31966834f8ed4b41", "reso...
true
uber-go/zap
948
comment_to_fix
Add NewTicker to the Clock Interface
Do we need this to be a separate goroutine? For this one, since we're blocking until three ticks, we can just do this all inline. It would simplify book keeping and it doesn't need to be an atomic because there would be no concurrency: ``` target := 3 var n int ticker := _systemClock.NewTicker(..) for range t...
374825111f7fc2fca60d36daeb8d656c3bc5d40a
0839a6b1a2d15e1db516134f31966834f8ed4b41
diff --git a/clock_test.go b/clock_test.go index 0e7bfd863..c46b62c0a 100644 --- a/clock_test.go +++ b/clock_test.go @@ -32,6 +32,9 @@ import ( type constantClock time.Time func (c constantClock) Now() time.Time { return time.Time(c) } +func (c constantClock) NewTicker(d time.Duration) *time.Ticker { + return &time...
[ "clock_test.go" ]
[ { "comment": "Do we need this to be a separate goroutine?\r\nFor this one, since we're blocking until three ticks, we can just do this all inline. It would simplify book keeping and it doesn't need to be an atomic because there would be no concurrency:\r\n\r\n```\r\ntarget := 3\r\nvar n int\r\n\r\nticker := _sy...
true
uber-go/zap
1,501
issue_to_patch
Prevent zap.Object from panicing on nils
It is possible to call zap.Object with nil or nil interface This will cause panic in zap bringing down the app using it The standard way of handling this is via nilField - compare all the constructors on pointers. As interfaces are similar to pointers - lets handle this case the same way Add tests in zapcore for ...
a6afd05063133cc713487d6c883760decd673ca0
e7b227a705eca10cf2147fc168662da73761899d
diff --git a/field.go b/field.go index 8441d1afb..1884afabc 100644 --- a/field.go +++ b/field.go @@ -398,6 +398,9 @@ func Durationp(key string, val *time.Duration) Field { // struct-like user-defined types to the logging context. The struct's // MarshalLogObject method is called lazily. func Object(key string, val z...
[ "benchmarks/zap_test.go", "field.go", "field_test.go", "zapcore/field_test.go" ]
[]
diff --git a/benchmarks/zap_test.go b/benchmarks/zap_test.go index 84784152c..0abb56e87 100644 --- a/benchmarks/zap_test.go +++ b/benchmarks/zap_test.go @@ -134,6 +134,7 @@ func fakeFields() []zap.Field { zap.Times("times", _tenTimes), zap.Object("user1", _oneUser), zap.Object("user2", _oneUser), + zap.Object...
true
uber-go/zap
1,502
issue_to_patch
Fix lint check name
niliness -> nilness
6d482535bdd97f4d97b2f9573ac308f1cf9b574e
f193e9f7b27fa969e3c7abaa773af8875fdda805
diff --git a/.golangci.yml b/.golangci.yml index 2346df135..74faaa71d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -25,7 +25,7 @@ linters-settings: govet: # These govet checks are disabled by default, but they're useful. enable: - - niliness + - nilness - reflectvaluecompare - ...
[ ".golangci.yml" ]
[]
true
uber-go/zap
1,482
issue_to_patch
chore: fix typo
32f2ec12872701043515eb7d75dabdd3c269bc64
f7f21669388ce01ad99c979f62d3f3104407578f
diff --git a/zaptest/observer/logged_entry.go b/zaptest/observer/logged_entry.go index a4ea7ec36..ef89e25c3 100644 --- a/zaptest/observer/logged_entry.go +++ b/zaptest/observer/logged_entry.go @@ -22,8 +22,8 @@ package observer import "go.uber.org/zap/zapcore" -// An LoggedEntry is an encoding-agnostic representat...
[ "zaptest/observer/logged_entry.go" ]
[ { "comment": "Also this.\r\n\r\n```suggestion\r\n// A LoggedEntry is an encoding-agnostic representation of a log message.\r\n```", "path": "zaptest/observer/logged_entry.go", "hunk": "@@ -23,7 +23,7 @@ package observer\n import \"go.uber.org/zap/zapcore\"\n \n // An LoggedEntry is an encoding-agnostic ...
true
uber-go/zap
1,482
comment_to_fix
chore: fix typo
Also this. ```suggestion // A LoggedEntry is an encoding-agnostic representation of a log message. ```
32f2ec12872701043515eb7d75dabdd3c269bc64
f7f21669388ce01ad99c979f62d3f3104407578f
diff --git a/zaptest/observer/logged_entry.go b/zaptest/observer/logged_entry.go index a4ea7ec36..ef89e25c3 100644 --- a/zaptest/observer/logged_entry.go +++ b/zaptest/observer/logged_entry.go @@ -22,8 +22,8 @@ package observer import "go.uber.org/zap/zapcore" -// An LoggedEntry is an encoding-agnostic representat...
[ "zaptest/observer/logged_entry.go" ]
[ { "comment": "Also this.\r\n\r\n```suggestion\r\n// A LoggedEntry is an encoding-agnostic representation of a log message.\r\n```", "path": "zaptest/observer/logged_entry.go", "hunk": "@@ -23,7 +23,7 @@ package observer\n import \"go.uber.org/zap/zapcore\"\n \n // An LoggedEntry is an encoding-agnostic ...
true
uber-go/zap
1,480
issue_to_patch
Fix the field test for bool type
Just as the title says.
fe16eb57d6431ee607c20f6aa90f3c681b2dc029
5832eeac9084ec35f72cc5ee4964a2496d31def8
[ "field_test.go" ]
[]
diff --git a/field_test.go b/field_test.go index ee3d5fe5b..e145acf99 100644 --- a/field_test.go +++ b/field_test.go @@ -98,7 +98,7 @@ func TestFieldConstructors(t *testing.T) { {"Skip", Field{Type: zapcore.SkipType}, Skip()}, {"Binary", Field{Key: "k", Type: zapcore.BinaryType, Interface: []byte("ab12")}, Binary...
true
uber-go/zap
1,478
issue_to_patch
Upgrade grpc in zapgrc test package & bump go version
The dependabot PR #1376 fails to bump grpc due to conflict with go1.16 (ref: #1473). Bump go version by one so go mod tidy is happy in the test package with the grpc upgrade.
5f00c3474892d9fdd2e4f2ea68db93b96ead41dc
500144054ca84d1f8ad364b8b8b3a40eed7c3292
[ "zapgrpc/internal/test/go.mod", "zapgrpc/internal/test/go.sum" ]
[]
diff --git a/zapgrpc/internal/test/go.mod b/zapgrpc/internal/test/go.mod index 011bbede3..63f3c3a8e 100644 --- a/zapgrpc/internal/test/go.mod +++ b/zapgrpc/internal/test/go.mod @@ -1,11 +1,11 @@ module go.uber.org/zap/zapgrpc/internal/test -go 1.17 +go 1.18 require ( github.com/stretchr/testify v1.8.1 go.uber...
true
uber-go/zap
1,477
issue_to_patch
test(AtomicLevel): demonstrate Handler is not vulnerable to XSS
Adds a unit test and a fuzz test to demonstrate that the AtomicLevel handler is not vulnerable to XSS. I ran the fuzz test on my computer for 10 minutes on my laptop with no cases where `<...>` was present in the response body. ``` ... fuzz: elapsed: 9m57s, execs: 43145040 (95839/sec), new interesting: 442 (t...
0ba452dbe15478739ad4bab1067706018a3062c6
3a7b09262ef66f0238f804c8209232b411876903
[ "http_handler_test.go" ]
[]
diff --git a/http_handler_test.go b/http_handler_test.go index 9da3dc7b5..a4e9bcdf7 100644 --- a/http_handler_test.go +++ b/http_handler_test.go @@ -23,6 +23,7 @@ package zap_test import ( "encoding/json" "errors" + "io" "net/http" "net/http/httptest" "strings" @@ -215,3 +216,44 @@ type brokenHTTPResponseWri...
true
uber-go/zap
1,470
issue_to_patch
build(deps): bump codecov/codecov-action from 4 to 5
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/codecov/codecov-action/releases">codecov/codecov-action's releases</a>.</em></p> <blockquote> <h2>v5.0.0</h2> <h2>v5 Release</h2> <p><code>v5<...
0ba452dbe15478739ad4bab1067706018a3062c6
a2a09dec36e42bc2b047116f6b47ec325cb90264
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ce6543852..1a692cad2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -41,7 +41,7 @@ jobs: run: make cover - name: Upload coverage to codecov.io - uses: codecov/codecov-action@v4 + uses: codecov/codecov...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,411
issue_to_patch
zapslog: rename Option to HandlerOption
- relates #1333 Rename `Option` to `HandlerOption` to avoid future conflicts with [zap.Option](https://pkg.go.dev/go.uber.org/zap#Option). There is no change in functionality.
35ded09102db8ce0b2eba3e87f54ba6ce14f2359
331063255d236a55d0cffbd56cf230615c400a21
diff --git a/exp/zapslog/handler.go b/exp/zapslog/handler.go index f893455a9..7951d456a 100644 --- a/exp/zapslog/handler.go +++ b/exp/zapslog/handler.go @@ -50,7 +50,7 @@ type Handler struct { // NewHandler builds a [Handler] that writes to the supplied [zapcore.Core] // with options. -func NewHandler(core zapcore....
[ "exp/zapslog/handler.go", "exp/zapslog/options.go" ]
[ { "comment": "```suggestion\r\n// A HandlerOption configures a slog Handler.\r\n```", "path": "exp/zapslog/options.go", "hunk": "@@ -24,29 +24,29 @@ package zapslog\n \n import \"log/slog\"\n \n-// An Option configures a slog Handler.\n-type Option interface {\n+// An HandlerOption configures a slog Han...
true
uber-go/zap
1,411
comment_to_fix
zapslog: rename Option to HandlerOption
```suggestion // A HandlerOption configures a slog Handler. ```
35ded09102db8ce0b2eba3e87f54ba6ce14f2359
331063255d236a55d0cffbd56cf230615c400a21
diff --git a/exp/zapslog/options.go b/exp/zapslog/options.go index 0eb5c8c0e..cab4d0f19 100644 --- a/exp/zapslog/options.go +++ b/exp/zapslog/options.go @@ -24,29 +24,29 @@ package zapslog import "log/slog" -// An Option configures a slog Handler. -type Option interface { +// A HandlerOption configures a slog Hand...
[ "exp/zapslog/options.go" ]
[ { "comment": "```suggestion\r\n// A HandlerOption configures a slog Handler.\r\n```", "path": "exp/zapslog/options.go", "hunk": "@@ -24,29 +24,29 @@ package zapslog\n \n import \"log/slog\"\n \n-// An Option configures a slog Handler.\n-type Option interface {\n+// An HandlerOption configures a slog Han...
true
uber-go/zap
1,465
issue_to_patch
exp: Release v0.3.0
Updates the CHANGELOG of exp to prepare for a new release based on changes made to this directory since the last release. I think I got all user-facing changes, but feel free to tweak.
ede8e1888f836a9a0717a8891503f40d7998d315
40bd983a061da29e07e12299fdd252ccceef9885
diff --git a/exp/CHANGELOG.md b/exp/CHANGELOG.md index ad897e7d6..5de48f14e 100644 --- a/exp/CHANGELOG.md +++ b/exp/CHANGELOG.md @@ -3,6 +3,28 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.3.0 - 22 O...
[ "exp/CHANGELOG.md" ]
[]
true
uber-go/zap
1,464
issue_to_patch
ci: Test with Go 1.23
With the release of Go 1.23, CI should run against Go 1.22 and 1.23
d6b2d14fc541ed17b31b794afc139f03648842ca
2b85247c49d316fcb878f94ded4750e374794fd4
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 24389f6ff..ce6543852 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.21.x", "1.22.x"] + go: ["1.22.x", "1.23.x"] ...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,463
issue_to_patch
chore: fix function name
f87c7be57ccc7ab7a0aa3fbc12398369fe3a61c3
91ac6018f6eeb4b127f0498ea16e88e9df3da014
diff --git a/sink.go b/sink.go index 499772a00..92202280f 100644 --- a/sink.go +++ b/sink.go @@ -71,7 +71,7 @@ func newSinkRegistry() *sinkRegistry { return sr } -// RegisterScheme registers the given factory for the specific scheme. +// RegisterSink registers the given factory for the specific scheme. func (sr *...
[ "sink.go" ]
[]
true
uber-go/zap
1,461
issue_to_patch
fix: fix slice init length
5786471c1d41c255c1d8b63ad30a82b68eda2c21
2ed88d121aecb0d4055b97b20f937b1537b8afd6
[ "buffer/buffer_test.go" ]
[]
diff --git a/buffer/buffer_test.go b/buffer/buffer_test.go index 71ffac114..9f0091a0f 100644 --- a/buffer/buffer_test.go +++ b/buffer/buffer_test.go @@ -71,7 +71,7 @@ func BenchmarkBuffers(b *testing.B) { // bunch of extra allocations). Nevertheless, let's make sure that we're // not losing any precious nanoseconds...
true
uber-go/zap
1,460
issue_to_patch
Add `func DictObject`
Allows fields to be used to construct `ObjectMarshaler`s that can then be used with other functions like `func Objects`. Link to issue: https://github.com/uber-go/zap/issues/1458
3f27eb9c787ea9b2ddfc1f707ef291c9070655fe
9bd3a78faf2e2d574a730a3709a751e3e8b097aa
diff --git a/field.go b/field.go index 6743930b8..8441d1afb 100644 --- a/field.go +++ b/field.go @@ -431,6 +431,13 @@ func (d dictObject) MarshalLogObject(enc zapcore.ObjectEncoder) error { return nil } +// DictObject constructs a [zapcore.ObjectMarshaler] with the given list of fields. +// The resulting object ma...
[ "example_test.go", "field.go", "field_test.go", "zapcore/field_test.go" ]
[ { "comment": "can we just use time.Duration values directly here?\r\n\r\n```suggestion\r\n\td1 := 68 * time.Millisecond\r\n\td2 := 79 * time.Millisecond\r\n\td3 := 57 * time.Millisecond\r\n```", "path": "example_test.go", "hunk": "@@ -388,6 +388,60 @@ func ExampleObjects() {\n \t// {\"level\":\"debug\",...
diff --git a/example_test.go b/example_test.go index af7df0e25..c479a0aed 100644 --- a/example_test.go +++ b/example_test.go @@ -388,6 +388,51 @@ func ExampleObjects() { // {"level":"debug","msg":"opening connections","addrs":[{"ip":"123.45.67.89","port":4040},{"ip":"127.0.0.1","port":4041},{"ip":"192.168.0.1","port"...
true
uber-go/zap
1,460
comment_to_fix
Add `func DictObject`
can we just use time.Duration values directly here? ```suggestion d1 := 68 * time.Millisecond d2 := 79 * time.Millisecond d3 := 57 * time.Millisecond ```
3f27eb9c787ea9b2ddfc1f707ef291c9070655fe
9bd3a78faf2e2d574a730a3709a751e3e8b097aa
diff --git a/example_test.go b/example_test.go index af7df0e25..c479a0aed 100644 --- a/example_test.go +++ b/example_test.go @@ -388,6 +388,51 @@ func ExampleObjects() { // {"level":"debug","msg":"opening connections","addrs":[{"ip":"123.45.67.89","port":4040},{"ip":"127.0.0.1","port":4041},{"ip":"192.168.0.1","port"...
[ "example_test.go" ]
[ { "comment": "can we just use time.Duration values directly here?\r\n\r\n```suggestion\r\n\td1 := 68 * time.Millisecond\r\n\td2 := 79 * time.Millisecond\r\n\td3 := 57 * time.Millisecond\r\n```", "path": "example_test.go", "hunk": "@@ -388,6 +388,60 @@ func ExampleObjects() {\n \t// {\"level\":\"debug\",...
true
uber-go/zap
1,310
issue_to_patch
zap.Any: Reduce stack size with generics
Yet another attempt at reducing the stack size of zap.Any, borrowing from #1301, #1303, #1304, #1305, #1307, and #1308. This approach defines a generic data type for field constructors of a specific type. This is similar to the lookup map in #1307, minus the map lookup, the interface match, or reflection. ...
ae3953ef016e7b8bc7976319ca160ff6d388ee05
66c34c290c52f11f5770c23c3e258e8e6b614acb
diff --git a/field.go b/field.go index bbb745db5..7f22c5349 100644 --- a/field.go +++ b/field.go @@ -410,6 +410,43 @@ func Inline(val zapcore.ObjectMarshaler) Field { } } +// We discovered an issue where zap.Any can cause a performance degradation +// when used in new goroutines. +// +// This happens because the c...
[ "field.go" ]
[ { "comment": "Should this be private? Does it matter if it's public?", "path": "field.go", "hunk": "@@ -410,6 +410,14 @@ func Inline(val zapcore.ObjectMarshaler) Field {\n \t}\n }\n \n+type anyFieldC[T any] func(string, T) Field\n+\n+func (f anyFieldC[T]) Any(key string, val any) Field {", "resolvin...
true
uber-go/zap
1,310
comment_to_fix
zap.Any: Reduce stack size with generics
Should this be private? Does it matter if it's public?
ae3953ef016e7b8bc7976319ca160ff6d388ee05
66c34c290c52f11f5770c23c3e258e8e6b614acb
diff --git a/field.go b/field.go index bbb745db5..7f22c5349 100644 --- a/field.go +++ b/field.go @@ -410,6 +410,43 @@ func Inline(val zapcore.ObjectMarshaler) Field { } } +// We discovered an issue where zap.Any can cause a performance degradation +// when used in new goroutines. +// +// This happens because the c...
[ "field.go" ]
[ { "comment": "Should this be private? Does it matter if it's public?", "path": "field.go", "hunk": "@@ -410,6 +410,14 @@ func Inline(val zapcore.ObjectMarshaler) Field {\n \t}\n }\n \n+type anyFieldC[T any] func(string, T) Field\n+\n+func (f anyFieldC[T]) Any(key string, val any) Field {", "resolvin...
true
uber-go/zap
1,310
comment_to_fix
zap.Any: Reduce stack size with generics
TIL
ae3953ef016e7b8bc7976319ca160ff6d388ee05
66c34c290c52f11f5770c23c3e258e8e6b614acb
diff --git a/field.go b/field.go index bbb745db5..7f22c5349 100644 --- a/field.go +++ b/field.go @@ -410,6 +410,43 @@ func Inline(val zapcore.ObjectMarshaler) Field { } } +// We discovered an issue where zap.Any can cause a performance degradation +// when used in new goroutines. +// +// This happens because the c...
[ "field.go" ]
[ { "comment": "TIL", "path": "field.go", "hunk": "@@ -418,132 +426,136 @@ func Inline(val zapcore.ObjectMarshaler) Field {\n // them. To minimize surprises, []byte values are treated as binary blobs, byte\n // values are treated as uint8, and runes are always treated as integers.\n func Any(key string, v...
true
uber-go/zap
1,454
issue_to_patch
fix(test): correct assertion message
The current message is misleading. It states the opposite of what the assertion is checking for.
f95879bd02b8acd7228054ee7f80d7bba9e1161e
57957c1ae175c265b16efa20d4e0c3a179fe9609
[ "writer_test.go" ]
[]
diff --git a/writer_test.go b/writer_test.go index 20e00b74b..ac1291a17 100644 --- a/writer_test.go +++ b/writer_test.go @@ -171,7 +171,7 @@ func TestOpenFails(t *testing.T) { for _, tt := range tests { _, cleanup, err := Open(tt.paths...) - require.Nil(t, cleanup, "Cleanup function should never be nil") + req...
true
uber-go/zap
1,453
issue_to_patch
build(deps): bump golang.org/x/vuln from 1.1.2 to 1.1.3 in /tools
Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.1.2 to 1.1.3. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golang/vuln/releases">golang.org/x/vuln's releases</a>.</em></p> <blockquote> <h2>v1.1.3</h2> <p>This release brings a few bug fixes (<a href="https:/...
f9b9f66ea72d4e221f0249fef3b21430864cb2aa
0bb4bcfcff6491c0f3828ef52974a91bb40591f2
diff --git a/tools/go.mod b/tools/go.mod index 3f4a909cb..d6a12e530 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,13 +1,15 @@ module go.uber.org/zap/tools -require golang.org/x/vuln v1.1.2 +require golang.org/x/vuln v1.1.3 require ( - golang.org/x/mod v0.18.0 // indirect + golang.org/x/mod v0.19.0 // indirec...
[ "tools/go.mod", "tools/go.sum" ]
[]
true
uber-go/zap
1,452
issue_to_patch
zaptest: add ability to filter observer logs by logger name
This is useful for assertions on logs in a particular named path, currently this is only possible through calls to Filter but it is more verbose. Added a FilterLoggerName function that plays nicely with the other filters: zapLogs.FilterLoggerName("my.logger").FilterMessage("hello")
8dcd0205a07f7ce959149aaf9152569d040a2f59
f8e0ac074aff662996fa4bad443e0c6823df832d
diff --git a/zaptest/observer/observer.go b/zaptest/observer/observer.go index f77f1308b..4f7ce0ec6 100644 --- a/zaptest/observer/observer.go +++ b/zaptest/observer/observer.go @@ -91,6 +91,13 @@ func (o *ObservedLogs) FilterMessage(msg string) *ObservedLogs { }) } +// FilterLoggerName filters entries to those log...
[ "zaptest/observer/observer.go", "zaptest/observer/observer_test.go" ]
[ { "comment": "```suggestion\r\n// FilterLoggerName filters entries to those logged through logger with the specified logger name.\r\n```", "path": "zaptest/observer/observer.go", "hunk": "@@ -91,6 +91,13 @@ func (o *ObservedLogs) FilterMessage(msg string) *ObservedLogs {\n \t})\n }\n \n+// FilterLoggerN...
diff --git a/zaptest/observer/observer_test.go b/zaptest/observer/observer_test.go index 0cf631c03..cbe167025 100644 --- a/zaptest/observer/observer_test.go +++ b/zaptest/observer/observer_test.go @@ -171,6 +171,10 @@ func TestFilters(t *testing.T) { Entry: zapcore.Entry{Level: zap.ErrorLevel, Message: "warp core...
true
uber-go/zap
1,452
comment_to_fix
zaptest: add ability to filter observer logs by logger name
```suggestion // FilterLoggerName filters entries to those logged through logger with the specified logger name. ```
8dcd0205a07f7ce959149aaf9152569d040a2f59
f8e0ac074aff662996fa4bad443e0c6823df832d
diff --git a/zaptest/observer/observer.go b/zaptest/observer/observer.go index f77f1308b..4f7ce0ec6 100644 --- a/zaptest/observer/observer.go +++ b/zaptest/observer/observer.go @@ -91,6 +91,13 @@ func (o *ObservedLogs) FilterMessage(msg string) *ObservedLogs { }) } +// FilterLoggerName filters entries to those log...
[ "zaptest/observer/observer.go" ]
[ { "comment": "```suggestion\r\n// FilterLoggerName filters entries to those logged through logger with the specified logger name.\r\n```", "path": "zaptest/observer/observer.go", "hunk": "@@ -91,6 +91,13 @@ func (o *ObservedLogs) FilterMessage(msg string) *ObservedLogs {\n \t})\n }\n \n+// FilterLoggerN...
true
uber-go/zap
1,451
issue_to_patch
Fix typos
This PR fixes a few typos I spotted in the project.
bd0cf0447951b77aa98dcfc1ac19e6f58d3ee64f
b1c74310aefed1ce757b8b33c12ee7f94d6476f0
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e327d9aa5..bc988b72e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -71,5 +71,5 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]. -[ho...
[ "CODE_OF_CONDUCT.md", "zapcore/level_test.go", "zapgrpc/internal/test/grpc.go" ]
[]
diff --git a/zapcore/level_test.go b/zapcore/level_test.go index 6e88f7781..d0beadcfe 100644 --- a/zapcore/level_test.go +++ b/zapcore/level_test.go @@ -77,8 +77,8 @@ func TestLevelText(t *testing.T) { } // Some logging libraries are using "warning" instead of "warn" as level indicator. Handle this case - // for ...
true
uber-go/zap
1,435
issue_to_patch
build(deps): bump golangci/golangci-lint-action from 5 to 6
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5 to 6. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golangci/golangci-lint-action/releases">golangci/golangci-lint-action's releases</a>.</em></p> <blockquote> <h2>v6.0.0</h2> <!--...
a1ac9d22d0c27e31b2f386a0a10d194a0a009bef
5ecef05c477e2531b4b11cc0c3d8af531633b40a
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 05d984f16..24389f6ff 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -59,7 +59,7 @@ jobs: go-version: 1.22.x cache: false # managed by golangci-lint - - uses: golangci/golangci-lint-action@v5 + - us...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,447
issue_to_patch
codecov: Use non-environment option
codecov jobs have been failing recently. The error we're seeing with verbose true is ``` debug - 2024-06-12 19:18:58,188 -- Starting create commit process --- {"commit_sha": "60547051d2c7a282f81ee9c7cb4c2547c0640e40", "parent_sha": null, "pr": "1435", "branch": "dependabot/github_actions/golangci/golangci-lint-act...
0c79c08975ec1b01af1eda0e9bb0ef0da7373d4b
1705a714481a69ab7ed0c349932101cae203982a
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fc66521ca..05d984f16 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -44,8 +44,7 @@ jobs: uses: codecov/codecov-action@v4 with: verbose: true - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKE...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,446
issue_to_patch
chore: fix codecov action
88bc39ce3f7c7ba67d03548bd18f2b74694b906c
70029952c7cccb4c06f6a53d510fa88d67414b1e
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 747149166..fc66521ca 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -42,6 +42,8 @@ jobs: - name: Upload coverage to codecov.io uses: codecov/codecov-action@v4 + with: + verbose: true env: ...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,445
issue_to_patch
build(deps): bump golang.org/x/vuln from 1.1.1 to 1.1.2 in /tools
Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.1.1 to 1.1.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golang/vuln/releases">golang.org/x/vuln's releases</a>.</em></p> <blockquote> <h2>v1.1.2</h2> <p>This release brings the support for the VEX output fo...
d53ffd236bbbd099c5926d21bdec9487a752495c
8efe43628bc69e10de2698424bfc899cf766fe52
diff --git a/tools/go.mod b/tools/go.mod index 241032914..3f4a909cb 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,11 +1,13 @@ module go.uber.org/zap/tools -require golang.org/x/vuln v1.1.1 +require golang.org/x/vuln v1.1.2 require ( - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.18.0 // indirec...
[ "tools/go.mod", "tools/go.sum" ]
[]
true
uber-go/zap
1,444
issue_to_patch
remove redundant capitalizations in unmarshalText
unmarshalText currently checks for almost all of the levels as the configured string values as well as their capitalized versions. But we call unmarshalText with bytes.ToLower() when we actually parse the levels, so we do not need to check for the capitalized versions separately since this is redundant. Previo...
8a805fa71066f3dc8d1fcb8e9fb36d580c4de3f6
76bcd09add92971f879ea2c7d74c374851d7a4aa
diff --git a/zapcore/level.go b/zapcore/level.go index 751cf0b98..f3e166d67 100644 --- a/zapcore/level.go +++ b/zapcore/level.go @@ -179,19 +179,19 @@ func (l *Level) UnmarshalText(text []byte) error { func (l *Level) unmarshalText(text []byte) bool { switch string(text) { - case "debug", "DEBUG": + case "debug": ...
[ "zapcore/level.go", "zapcore/level_test.go" ]
[ { "comment": "is this actually needed? unmarshalText is called with `bytes.ToLower` at some point.", "path": "zapcore/level.go", "hunk": "@@ -183,7 +183,7 @@ func (l *Level) unmarshalText(text []byte) bool {\n \t\t*l = DebugLevel\n \tcase \"info\", \"INFO\", \"\": // make the zero value useful\n \t\t*l ...
diff --git a/zapcore/level_test.go b/zapcore/level_test.go index eaa8e0803..6e88f7781 100644 --- a/zapcore/level_test.go +++ b/zapcore/level_test.go @@ -96,6 +96,7 @@ func TestParseLevel(t *testing.T) { {"info", InfoLevel, ""}, {"DEBUG", DebugLevel, ""}, {"FOO", 0, `unrecognized level: "FOO"`}, + {"WARNING", ...
true
uber-go/zap
1,444
comment_to_fix
remove redundant capitalizations in unmarshalText
is this actually needed? unmarshalText is called with `bytes.ToLower` at some point.
8a805fa71066f3dc8d1fcb8e9fb36d580c4de3f6
76bcd09add92971f879ea2c7d74c374851d7a4aa
diff --git a/zapcore/level.go b/zapcore/level.go index 751cf0b98..f3e166d67 100644 --- a/zapcore/level.go +++ b/zapcore/level.go @@ -179,19 +179,19 @@ func (l *Level) UnmarshalText(text []byte) error { func (l *Level) unmarshalText(text []byte) bool { switch string(text) { - case "debug", "DEBUG": + case "debug": ...
[ "zapcore/level.go" ]
[ { "comment": "is this actually needed? unmarshalText is called with `bytes.ToLower` at some point.", "path": "zapcore/level.go", "hunk": "@@ -183,7 +183,7 @@ func (l *Level) unmarshalText(text []byte) bool {\n \t\t*l = DebugLevel\n \tcase \"info\", \"INFO\", \"\": // make the zero value useful\n \t\t*l ...
true
uber-go/zap
1,440
issue_to_patch
build(deps): bump golang.org/x/vuln from 1.1.0 to 1.1.1 in /tools
Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.1.0 to 1.1.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golang/vuln/releases">golang.org/x/vuln's releases</a>.</em></p> <blockquote> <h2>v1.1.1</h2> <p>This release brings some minor improvements to govuln...
8a805fa71066f3dc8d1fcb8e9fb36d580c4de3f6
41bb911b8688444ce12f1afc4660487392f8f8fa
diff --git a/tools/go.mod b/tools/go.mod index 7d872f522..241032914 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,11 +1,11 @@ module go.uber.org/zap/tools -require golang.org/x/vuln v1.1.0 +require golang.org/x/vuln v1.1.1 require ( golang.org/x/mod v0.17.0 // indirect golang.org/x/sync v0.7.0 // indirec...
[ "tools/go.mod", "tools/go.sum" ]
[]
true
uber-go/zap
1,429
issue_to_patch
zapcore: add warning as Level
Some packages set their value for WarnLevel to "warning". For easier integration add "warning" as accepted WarnLevel. Example for a package that is using "warning": https://github.com/sirupsen/logrus/blob/dd1b4c2e81afc5c255f216a722b012ed26be57df/logrus.go#L68
b15585bc7a2b383592004f75df35fa2088db5481
cb50e120e848e9fa5b2ae7909c4f70b94e0f9128
diff --git a/zapcore/level.go b/zapcore/level.go index e01a24131..751cf0b98 100644 --- a/zapcore/level.go +++ b/zapcore/level.go @@ -183,7 +183,7 @@ func (l *Level) unmarshalText(text []byte) bool { *l = DebugLevel case "info", "INFO", "": // make the zero value useful *l = InfoLevel - case "warn", "WARN": + ca...
[ "zapcore/level.go", "zapcore/level_test.go" ]
[]
diff --git a/zapcore/level_test.go b/zapcore/level_test.go index d8eb96292..eaa8e0803 100644 --- a/zapcore/level_test.go +++ b/zapcore/level_test.go @@ -75,6 +75,16 @@ func TestLevelText(t *testing.T) { assert.NoError(t, err, `Unexpected error unmarshaling text %q to level.`, tt.text) assert.Equal(t, tt.level, un...
true
uber-go/zap
1,442
issue_to_patch
go-licenses is not able to find license When running `go-licenses` on a project that depends on `go.uber.org/zap/exp/zapslog` (like caddy), I get the following error: ``` E0530 10:04:20.840357 13917 library.go:122] Failed to find license for go.uber.org/zap/exp/zapslog: cannot find a known open source license fo...
Update LICENSE year, copy to exp/ module
Fixes #1441.
4425037a44c9bdcdf5319d88072d241deaae1b9d
52dcc77ae7786bd8c02f3b4bf11ff78ea7f84a84
diff --git a/LICENSE b/LICENSE index 6652bed45..3883b9a7e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2017 Uber Technologies, Inc. +Copyright (c) 2016-2024 Uber Technologies, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated ...
[ "LICENSE", "Makefile", "exp/LICENSE", "http_handler.go", "logger.go", "options.go", "zapcore/console_encoder.go", "zapcore/entry.go" ]
[]
true
uber-go/zap
1,443
issue_to_patch
ci: Fix lint issues, makefile target
Noticed that there were a handful of lint issues, all `errcheck` things. This PR: - Adds underscores to clarify error discarding - Updates the `make golangci-lint` target to use `./...`, as e.g. there are no `exp/*.go` files
4425037a44c9bdcdf5319d88072d241deaae1b9d
4890655f0c8b78b8ae168be58affc9b327b46628
diff --git a/Makefile b/Makefile index eb1cee53b..f9db385b3 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ golangci-lint: @$(foreach mod,$(MODULE_DIRS), \ (cd $(mod) && \ echo "[lint] golangci-lint: $(mod)" && \ - golangci-lint run --path-prefix $(mod)) &&) true + golangci-lint run --path-prefix $(mod...
[ "Makefile", "http_handler.go", "logger.go", "options.go", "zapcore/console_encoder.go", "zapcore/entry.go" ]
[]
true
uber-go/zap
1,436
issue_to_patch
Remove fossa github workflow
Fossa has been deprecated for Uber OSS repositories, remove the workflow accordingly.
cf2f580374cbb923a87d62449ce50d7712b75fa1
6a24e657bb8248b80f8bba4225da4d6a1c8aa723
diff --git a/.github/workflows/fossa.yaml b/.github/workflows/fossa.yaml deleted file mode 100644 index 3da3e0d16..000000000 --- a/.github/workflows/fossa.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: FOSSA Analysis -on: push - -permissions: - contents: read - -jobs: - - build: - runs-on: ubuntu-latest - if: githu...
[ ".github/workflows/fossa.yaml" ]
[]
true
uber-go/zap
1,434
issue_to_patch
Bump setup-go from 4 to 5
This PR manually bumps setup-go to version 5 since the [dependabot PR](https://github.com/uber-go/zap/pull/1393) for it seems to be having issues w/ codecov token. CI runs on newer PRs somehow do not have this issue.
1a8ea366decc8407dda6f1db198425455e697b4b
9c7e1f3905cff7e41db605ae8ff0eb78abe51ee9
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5b9087b62..747149166 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with:...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,433
issue_to_patch
build(deps): bump golangci/golangci-lint-action from 4 to 5
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golangci/golangci-lint-action/releases">golangci/golangci-lint-action's releases</a>.</em></p> <blockquote> <h2>v5.0.0</h2> <!--...
ed52ec03fc86806389deaf551500e7a48214ca62
5dc76fd5cd425a3e8e435a3907d97aa28b97ddf8
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 790ebdf43..5b9087b62 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -58,7 +58,7 @@ jobs: go-version: 1.22.x cache: false # managed by golangci-lint - - uses: golangci/golangci-lint-action@v4 + - us...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,432
issue_to_patch
build(deps): bump golang.org/x/vuln from 1.0.1 to 1.1.0 in /tools
Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.0.1 to 1.1.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golang/vuln/releases">golang.org/x/vuln's releases</a>.</em></p> <blockquote> <h2>v1.1.0</h2> <p>This release brings minor improvements to govulncheck...
3ffa0c00594205c2c623aa9493847217982b558d
9f73a0287797f8c983140c651c30068fd2a3c64f
diff --git a/tools/go.mod b/tools/go.mod index bf851e386..7d872f522 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,12 +1,11 @@ module go.uber.org/zap/tools -require golang.org/x/vuln v1.0.1 +require golang.org/x/vuln v1.1.0 require ( - golang.org/x/mod v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirec...
[ "tools/go.mod", "tools/go.sum" ]
[]
true
uber-go/zap
1,430
issue_to_patch
Deadlock when calling `BufferedWriteSyncer.Stop` ### Describe the bug Upon calling `Stop` there's a small chance of deadlock. Happens sometimes on go `v1.21.3` zap `v1.22.0`. ### To Reproduce Can't really figure out how to reproduce it without touching said code yet. #### This is what I suspect is happening: W...
Fix deadlock when Stop and flush race
Fixes #1428. Stop signals the flush loop to end, but if the flush ticker has fired after we took the lock, then it tries to `Sync`, and waits for the same lock that `Stop` is holding. This causes a deadlock, as `Stop` holds the lock waiting for flush to end. Fix by waiting for the flush loop to end outside of the...
b15585bc7a2b383592004f75df35fa2088db5481
3909ad738fc158a1d7cdf32075cddb8363a5e87e
diff --git a/zapcore/buffered_write_syncer.go b/zapcore/buffered_write_syncer.go index a40e93b3e..4b426a564 100644 --- a/zapcore/buffered_write_syncer.go +++ b/zapcore/buffered_write_syncer.go @@ -188,32 +188,33 @@ func (s *BufferedWriteSyncer) flushLoop() { // Stop closes the buffer, cleans up background goroutines, ...
[ "zapcore/buffered_write_syncer.go", "zapcore/buffered_write_syncer_test.go" ]
[]
diff --git a/zapcore/buffered_write_syncer_test.go b/zapcore/buffered_write_syncer_test.go index d0f6037af..297a6c20b 100644 --- a/zapcore/buffered_write_syncer_test.go +++ b/zapcore/buffered_write_syncer_test.go @@ -53,6 +53,14 @@ func TestBufferWriter(t *testing.T) { assert.Equal(t, "foo", buf.String(), "Unexpecte...
true
uber-go/zap
1,424
issue_to_patch
ci broken: golangci-lint changes breaks lint. **Describe the bug** ci breaks from golangci-lint changes. ``` run golangci-lint Running [/home/runner/golangci-lint-1.57.1-linux-amd64/golangci-lint run --out-format=github-actions --version] in [] ... Error: unknown flag: --version Failed executing comman...
ci: Fix golangci-lint installation
`golangci-lint run` no longer accepts `--version`, so the hack we employ to install it using the official action no longer works. This replaces the flag with `--help`, and fixes broken CI. Resolves #1423
b39f8b6b6a44d8371a87610be50cce58eeeaabcb
8a8ce0f556f018a89b1d20a9f38522e268e41395
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3ec8881f5..790ebdf43 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -62,7 +62,9 @@ jobs: name: Install golangci-lint with: version: latest - args: --version # make lint will run the linter + ...
[ ".github/workflows/go.yml" ]
[ { "comment": "\r\nThis will run the linter twice (`make lint` does it too).\r\nWe can keep the old hack in place but with a different argument:\r\n\r\n```suggestion\r\n version: latest\r\n # Hack: Use the official action to download, but not run.\r\n # make lint below will handle actually r...
true
uber-go/zap
1,424
comment_to_fix
ci: Fix golangci-lint installation
This will run the linter twice (`make lint` does it too). We can keep the old hack in place but with a different argument: ```suggestion version: latest # Hack: Use the official action to download, but not run. # make lint below will handle actually running the linter. args: --...
b39f8b6b6a44d8371a87610be50cce58eeeaabcb
8a8ce0f556f018a89b1d20a9f38522e268e41395
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3ec8881f5..790ebdf43 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -62,7 +62,9 @@ jobs: name: Install golangci-lint with: version: latest - args: --version # make lint will run the linter + ...
[ ".github/workflows/go.yml" ]
[ { "comment": "\r\nThis will run the linter twice (`make lint` does it too).\r\nWe can keep the old hack in place but with a different argument:\r\n\r\n```suggestion\r\n version: latest\r\n # Hack: Use the official action to download, but not run.\r\n # make lint below will handle actually r...
true
uber-go/zap
1,414
issue_to_patch
zapcore: Improve errors unit tests
Updates and adds some unit tests for the zapcore/errors.go file.
e5745d6095ecc2497281569e8713835f2c4a029f
c3d30115cbe4bd337b7a2d9916332fe785ec68cd
[ "zapcore/error_test.go" ]
[ { "comment": "Technically this is a breaking change as we would have an object here instead of a string but I would argue that this would be the intended behavior when someone implements `ObjectMarshaler` on their error type.", "path": "zapcore/error.go", "hunk": "@@ -37,6 +41,16 @@ import (\n // causer...
diff --git a/zapcore/error_test.go b/zapcore/error_test.go index 41f243ac4..7a554a893 100644 --- a/zapcore/error_test.go +++ b/zapcore/error_test.go @@ -43,7 +43,20 @@ func (e errTooManyUsers) Format(s fmt.State, verb rune) { // Implement fmt.Formatter, but don't add any information beyond the basic // Error method...
true
uber-go/zap
1,410
issue_to_patch
build(deps): bump codecov/codecov-action from 3 to 4
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/codecov/codecov-action/releases">codecov/codecov-action's releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <p>v4 of the Codecov Action uses...
27b96e378909082d0bf2f0c5802a9f648150fe98
a3ea3cb4337124f37777ca7f86e1c46adb5394ea
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b5576a542..e0b3fc3c2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -41,7 +41,9 @@ jobs: run: make cover - name: Upload coverage to codecov.io - uses: codecov/codecov-action@v3 + uses: codecov/codecov...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,419
issue_to_patch
Release v1.27.0
e5a56ee593d51f611de3a73cf3140f1c1927d68e
8dc2c0dc2cc05976149f9521f165ba4bfc0c6877
diff --git a/CHANGELOG.md b/CHANGELOG.md index f5f78d19d..6d6cd5f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.27.0 (20 Feb 2024) +Enhanc...
[ "CHANGELOG.md" ]
[ { "comment": "Missing zaptest.NewTestingWriter", "path": "CHANGELOG.md", "hunk": "@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.\n \n This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## 1.27.0 (20 Feb 2024)\n+Enhancements:\n+...
true
uber-go/zap
1,419
comment_to_fix
Release v1.27.0
Missing zaptest.NewTestingWriter
e5a56ee593d51f611de3a73cf3140f1c1927d68e
8dc2c0dc2cc05976149f9521f165ba4bfc0c6877
diff --git a/CHANGELOG.md b/CHANGELOG.md index f5f78d19d..6d6cd5f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.27.0 (20 Feb 2024) +Enhanc...
[ "CHANGELOG.md" ]
[ { "comment": "Missing zaptest.NewTestingWriter", "path": "CHANGELOG.md", "hunk": "@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.\n \n This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n \n+## 1.27.0 (20 Feb 2024)\n+Enhancements:\n+...
true
uber-go/zap
1,419
comment_to_fix
Release v1.27.0
```suggestion * [#1399][]: zaptest: Add `NewTestingWriter` for customizing TestingWriter with more flexibility than `NewLogger`. * [#1406][]: Add `Log`, `Logw`, `Logln` methods for `SugaredLogger`. * [#1416][]: Add `WithPanicHook` option for testing panic logs. Thanks to @defval, @dimmo, @arxeiss, and @MKrupauska...
e5a56ee593d51f611de3a73cf3140f1c1927d68e
8dc2c0dc2cc05976149f9521f165ba4bfc0c6877
diff --git a/CHANGELOG.md b/CHANGELOG.md index f5f78d19d..6d6cd5f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.27.0 (20 Feb 2024) +Enhanc...
[ "CHANGELOG.md" ]
[ { "comment": "```suggestion\r\n* [#1399][]: zaptest: Add `NewTestingWriter` for customizing TestingWriter with more flexibility than `NewLogger`.\r\n* [#1406][]: Add `Log`, `Logw`, `Logln` methods for `SugaredLogger`.\r\n* [#1416][]: Add `WithPanicHook` option for testing panic logs.\r\n\r\nThanks to @defval, @...
true
uber-go/zap
1,416
issue_to_patch
Support specifying a custom onPanic logger hook for tests There can be complications when testing Panic/DPanic logs similarly to Fatal logs as described in https://github.com/uber-go/zap/issues/846. For example, it's impossible to recover from a logger.Panic in a tests if that log is emitted in another go routine. ...
Add WithPanicHook logger option for panic log tests
Add a `WithPanicHook` logger option that allows callers to specify custom behavior besides panicking on Panic/DPanic logs. This is similar to what we already have with the WithFatal hook implemented in https://github.com/uber-go/zap/pull/861. This will make it possible to unit test Panic log cases like the one we ha...
e5745d6095ecc2497281569e8713835f2c4a029f
7a4359b021de8f4d4c18e3f49a848dd2446e8a56
diff --git a/logger.go b/logger.go index 6205fe48a..c4d300323 100644 --- a/logger.go +++ b/logger.go @@ -43,6 +43,7 @@ type Logger struct { development bool addCaller bool + onPanic zapcore.CheckWriteHook // default is WriteThenPanic onFatal zapcore.CheckWriteHook // default is WriteThenFatal name...
[ "logger.go", "logger_test.go", "options.go" ]
[]
diff --git a/logger_test.go b/logger_test.go index 739aa610b..4a953b6c9 100644 --- a/logger_test.go +++ b/logger_test.go @@ -836,6 +836,130 @@ func TestLoggerFatalOnNoop(t *testing.T) { assert.Equal(t, 1, exitStub.Code, "must exit with status 1 for WriteThenNoop") } +func TestLoggerCustomOnPanic(t *testing.T) { + ...
true
uber-go/zap
1,418
issue_to_patch
assets: Fix logo color profile
The image was created in the Color LCD color profile, but exported as sRGB. This resulted in washed out colors in the final image. This fixes it by converting the color profile to sRGB before exporting, and adds a little more contrast to the image.
956a21c19cf77ea7a78f9f08ca44b6f77f95053a
d4443aba35854388378ab741e06bf01735f44124
diff --git a/assets/logo.png b/assets/logo.png index f7c30c03d..7a5a4aa4b 100644 Binary files a/assets/logo.png and b/assets/logo.png differ
[ "assets/logo.png" ]
[]
true
uber-go/zap
1,406
issue_to_patch
Add methods for logging with level as argument
Adding generic `Log`, `Logf`, `Logw` and `Logln` methods to Sugared logger. When I need to do a wrapper around Zap logger to pass that into 3rd party library for unifying logging, it might come handy to use zap.Log(level, ...) instead of switch or if-else if chain. However, now I need to do a same wrapper but wi...
70f61bb342203a50f8192b05f7faf40a0f809a91
24ebbfda214ce692db7d8af5cccba53367bc1ef7
diff --git a/sugar.go b/sugar.go index dce9341db..8904cd087 100644 --- a/sugar.go +++ b/sugar.go @@ -137,6 +137,12 @@ func (s *SugaredLogger) Level() zapcore.Level { return zapcore.LevelOf(s.base.core) } +// Log logs the provided arguments at provided level. +// Spaces are added between arguments when neither is a...
[ "sugar.go", "sugar_test.go" ]
[]
diff --git a/sugar_test.go b/sugar_test.go index 0f608cb50..8ca2bddfa 100644 --- a/sugar_test.go +++ b/sugar_test.go @@ -311,9 +311,10 @@ func TestSugarStructuredLogging(t *testing.T) { logger.With(context...).Warnw(tt.msg, extra...) logger.With(context...).Errorw(tt.msg, extra...) logger.With(context...).D...
true
uber-go/zap
1,417
issue_to_patch
build(deps): bump golangci/golangci-lint-action from 3 to 4
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3 to 4. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/golangci/golangci-lint-action/releases">golangci/golangci-lint-action's releases</a>.</em></p> <blockquote> <h2>v4.0.0</h2> <!--...
e5745d6095ecc2497281569e8713835f2c4a029f
2705622d1b6f7f44a0e8a88c270055f0209c3a49
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ea798b947..2fa9a6960 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -56,7 +56,7 @@ jobs: go-version: 1.22.x cache: false # managed by golangci-lint - - uses: golangci/golangci-lint-action@v3 + - us...
[ ".github/workflows/go.yml" ]
[]
true
uber-go/zap
1,409
issue_to_patch
ci: Test with Go 1.22
With the release of Go 1.22, CI should run against Go 1.21 and 1.22
27b96e378909082d0bf2f0c5802a9f648150fe98
969941ba6ef4ac353f5c37327d25a49bae89a7ad
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b5576a542..ea798b947 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.20.x", "1.21.x"] + go: ["1.21.x", "1.22.x"] ...
[ ".github/workflows/go.yml" ]
[]
true
ucb-bar/chipyard
2,333
issue_to_patch
fix: firechip CTCFireSimConfig to match new CTC changes
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
756ffa75d5c6d92fccc3f0f5260351e257346b76
0e8f66dc494151311ec176a81f1d66ee30bc8f29
diff --git a/generators/firechip/chip/src/main/scala/TargetConfigs.scala b/generators/firechip/chip/src/main/scala/TargetConfigs.scala index 95c7d26242..cf01f91101 100644 --- a/generators/firechip/chip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/chip/src/main/scala/TargetConfigs.scala @@ -356,7 +356,15...
[ "generators/firechip/chip/src/main/scala/TargetConfigs.scala" ]
[]
true
ucb-bar/chipyard
2,331
issue_to_patch
Bump testchipip
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
63c1506826fc70a8f24065237aa65130b4830ee1
c72e97988e3b1af44d09cd9d27e3c7225ba61161
diff --git a/generators/chipyard/src/main/scala/config/ChipConfigs.scala b/generators/chipyard/src/main/scala/config/ChipConfigs.scala index db685daf7c..1d80f18080 100644 --- a/generators/chipyard/src/main/scala/config/ChipConfigs.scala +++ b/generators/chipyard/src/main/scala/config/ChipConfigs.scala @@ -127,3 +127,30...
[ "generators/chipyard/src/main/scala/config/ChipConfigs.scala", "generators/chipyard/src/main/scala/config/ChipletConfigs.scala", "generators/chipyard/src/main/scala/harness/HarnessBinders.scala", "generators/testchipip", "tests/CMakeLists.txt", "tests/triple-chiplet.c" ]
[]
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 812caf5654..27b2d7e150 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -87,6 +87,7 @@ add_executable(mt-hello mt-hello.c) add_executable(symmetric symmetric.c) add_executable(ctc-test ctc-test.c) add_executable(multi-ctc-test multi-ctc-te...
true
ucb-bar/chipyard
2,326
issue_to_patch
Synchronize sim success between chiptops
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
bcb612918bb964a0dad33a26a1921c161eb598d0
1926d140403906d9ccb115de31197f95a8760eb7
diff --git a/generators/chipyard/src/main/scala/config/ChipletConfigs.scala b/generators/chipyard/src/main/scala/config/ChipletConfigs.scala index da1885ef4d..ed25f8e1f5 100644 --- a/generators/chipyard/src/main/scala/config/ChipletConfigs.scala +++ b/generators/chipyard/src/main/scala/config/ChipletConfigs.scala @@ -1...
[ "generators/chipyard/src/main/scala/config/ChipletConfigs.scala", "generators/chipyard/src/main/scala/harness/HarnessBinders.scala", "generators/chipyard/src/main/scala/harness/HasHarnessInstantiators.scala", "generators/chipyard/src/main/scala/harness/TestHarness.scala", "tests/multi-ctc-test.c" ]
[]
diff --git a/tests/multi-ctc-test.c b/tests/multi-ctc-test.c index 3e72fe8ef1..cafbb1feb5 100644 --- a/tests/multi-ctc-test.c +++ b/tests/multi-ctc-test.c @@ -4,9 +4,11 @@ #include <stdlib.h> #include <riscv-pk/encoding.h> #include "marchid.h" +#include "mmio.h" #define CTC0_OFFSET (0x10L << 32) #define CTC1_OFF...
true
ucb-bar/chipyard
2,325
issue_to_patch
fix: pin "which" dep at 2.21 & build h0b41bf4_1
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
7241286bd1d922b72fd0ab751630d5541ca9d60f
fdb0012779284fe30cc10a33536eb977fd55b307
diff --git a/conda-reqs/chipyard-extended.yaml b/conda-reqs/chipyard-extended.yaml index 830d39d720..34bfd6dd7f 100644 --- a/conda-reqs/chipyard-extended.yaml +++ b/conda-reqs/chipyard-extended.yaml @@ -33,7 +33,7 @@ dependencies: - bc - unzip - patch - - which + - which=2.21=h0b41bf4_1 - sed ...
[ "conda-reqs/chipyard-extended.yaml" ]
[]
true
ucb-bar/chipyard
2,271
issue_to_patch
Fix glibc versioning to replace with system version & regenerate lockfiles
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of...
55cd603a23bfebc1ea5ee912b6ae6d6e2ee4ea50
2f853d7d8e885e23e706fcc6485f4e74b6abcf95
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index aa7ee0ff43..709fc4db6e 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -185,6 +185,14 @@ conda environment or \`source env.sh\` and skip this step with \`-s 1\`." >&2 $CYDIR/scripts/generate-conda-lockfiles.sh exit_...
[ "scripts/build-setup.sh" ]
[]
true
ucb-bar/chipyard
2,321
issue_to_patch
fix single clock broadcasting binder, add option for 1 io cell per clock
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
291733d835c2c71160a67d8a61226bf45b6fbbbd
a26cf8607027fe29f2d88734a58480d0598ba7c1
diff --git a/generators/chipyard/src/main/scala/clocking/ClockBinders.scala b/generators/chipyard/src/main/scala/clocking/ClockBinders.scala index 7ef9f9227a..11995fa626 100644 --- a/generators/chipyard/src/main/scala/clocking/ClockBinders.scala +++ b/generators/chipyard/src/main/scala/clocking/ClockBinders.scala @@ -1...
[ "generators/chipyard/src/main/scala/clocking/ClockBinders.scala" ]
[]
true
ucb-bar/chipyard
2,316
issue_to_patch
Add CTC link
Add CTC link, including the FireSim bridge collateral. <!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the ...
ee46501fcbc2b8ee5fec738ff370e0b25f2b912c
9f9900a10045d5fedb5f65bc1feaf8f697140417
diff --git a/build.sbt b/build.sbt index c4197aba77..29748eb7af 100644 --- a/build.sbt +++ b/build.sbt @@ -160,7 +160,7 @@ lazy val rocketLibDeps = (rocketchip / Keys.libraryDependencies) // -- Chipyard-managed External Projects -- -lazy val testchipip = withInitCheck((project in file("generators/testchipip")), "t...
[ "build.sbt", "docs/Generators/TestChipIP.rst", "generators/chipyard/src/main/scala/DigitalTop.scala", "generators/chipyard/src/main/scala/config/AbstractConfig.scala", "generators/chipyard/src/main/scala/config/ChipletConfigs.scala", "generators/chipyard/src/main/scala/harness/HarnessBinders.scala", "ge...
[]
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 88833a90ea..812caf5654 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -85,6 +85,8 @@ add_executable(gcd gcd.c) add_executable(hello hello.c) add_executable(mt-hello mt-hello.c) add_executable(symmetric symmetric.c) +add_executable(ctc-te...
true
ucb-bar/chipyard
2,318
issue_to_patch
fix: renamed BlockDevBridge.scala to BlockDevBridgeModule.scala for module to be recognized in goldengate
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
ee46501fcbc2b8ee5fec738ff370e0b25f2b912c
9aec676bedfb7decf7c2e171302ceaebeca7c617
diff --git a/generators/firechip/goldengateimplementations/src/main/scala/BlockDevBridge.scala b/generators/firechip/goldengateimplementations/src/main/scala/BlockDevBridgeModule.scala similarity index 100% rename from generators/firechip/goldengateimplementations/src/main/scala/BlockDevBridge.scala rename to generator...
[ "generators/firechip/goldengateimplementations/src/main/scala/BlockDevBridgeModule.scala" ]
[]
true
ucb-bar/chipyard
2,315
issue_to_patch
Sync branch
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
8e010db52d77174f60971b11cda0f4aaf2d8fbc4
ee46501fcbc2b8ee5fec738ff370e0b25f2b912c
diff --git a/README.md b/README.md index f4419353d9..734f866c4a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To get started using Chipyard, see the documentation on the Chipyard documentati Chipyard is an open source framework for agile development of Chisel-based systems-on-chip. It will allow you to l...
[ "README.md", "generators/boom", "tools/tapeout/src/main/scala/macrolib/SRAM.scala", "tools/tapeout/src/main/scala/macros/MacroCompiler.scala" ]
[]
true
ucb-bar/chipyard
2,303
issue_to_patch
Support sram depth/width lists, as well as explicit list of legal combos
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
592dad64d9704ed46f2931d684bf4b1d0857352b
b38f52013f130333b61d4bc2bab168d4ff37daee
diff --git a/tools/tapeout/src/main/scala/macrolib/SRAM.scala b/tools/tapeout/src/main/scala/macrolib/SRAM.scala index ea51b04906..7d370ce0db 100644 --- a/tools/tapeout/src/main/scala/macrolib/SRAM.scala +++ b/tools/tapeout/src/main/scala/macrolib/SRAM.scala @@ -105,8 +105,9 @@ case class SRAMGroup( family: Stri...
[ "tools/tapeout/src/main/scala/macrolib/SRAM.scala", "tools/tapeout/src/main/scala/macros/MacroCompiler.scala" ]
[ { "comment": "The third element of the triple is ignored with '_' but it's unclear what this represents. Consider adding a comment explaining what the third element is (likely port count) and why it's not used here.\n```suggestion\n case Some(triples) =>\n // The third el...
true
ucb-bar/chipyard
2,303
comment_to_fix
Support sram depth/width lists, as well as explicit list of legal combos
The third element of the triple is ignored with '_' but it's unclear what this represents. Consider adding a comment explaining what the third element is (likely port count) and why it's not used here. ```suggestion case Some(triples) => // The third element of the triple is th...
592dad64d9704ed46f2931d684bf4b1d0857352b
b38f52013f130333b61d4bc2bab168d4ff37daee
diff --git a/tools/tapeout/src/main/scala/macros/MacroCompiler.scala b/tools/tapeout/src/main/scala/macros/MacroCompiler.scala index fbf857fea7..27a057d505 100644 --- a/tools/tapeout/src/main/scala/macros/MacroCompiler.scala +++ b/tools/tapeout/src/main/scala/macros/MacroCompiler.scala @@ -623,10 +623,16 @@ class Macro...
[ "tools/tapeout/src/main/scala/macros/MacroCompiler.scala" ]
[ { "comment": "The third element of the triple is ignored with '_' but it's unclear what this represents. Consider adding a comment explaining what the third element is (likely port count) and why it's not used here.\n```suggestion\n case Some(triples) =>\n // The third el...
true
ucb-bar/chipyard
2,303
comment_to_fix
Support sram depth/width lists, as well as explicit list of legal combos
This logic is duplicated for both depth and width parsing. Consider extracting this into a helper function or variable to reduce duplication.
592dad64d9704ed46f2931d684bf4b1d0857352b
b38f52013f130333b61d4bc2bab168d4ff37daee
diff --git a/tools/tapeout/src/main/scala/macrolib/SRAM.scala b/tools/tapeout/src/main/scala/macrolib/SRAM.scala index ea51b04906..7d370ce0db 100644 --- a/tools/tapeout/src/main/scala/macrolib/SRAM.scala +++ b/tools/tapeout/src/main/scala/macrolib/SRAM.scala @@ -105,8 +105,9 @@ case class SRAMGroup( family: Stri...
[ "tools/tapeout/src/main/scala/macrolib/SRAM.scala" ]
[ { "comment": "This logic is duplicated for both depth and width parsing. Consider extracting this into a helper function or variable to reduce duplication.", "path": "tools/tapeout/src/main/scala/macrolib/SRAM.scala", "hunk": "@@ -148,17 +159,35 @@ object SRAMGroup {\n case Some(x: JsNumber) => x....
true
ucb-bar/chipyard
2,303
comment_to_fix
Support sram depth/width lists, as well as explicit list of legal combos
This logic is duplicated for both depth and width parsing. Consider extracting this into a helper function or variable to reduce duplication.
592dad64d9704ed46f2931d684bf4b1d0857352b
b38f52013f130333b61d4bc2bab168d4ff37daee
diff --git a/tools/tapeout/src/main/scala/macrolib/SRAM.scala b/tools/tapeout/src/main/scala/macrolib/SRAM.scala index ea51b04906..7d370ce0db 100644 --- a/tools/tapeout/src/main/scala/macrolib/SRAM.scala +++ b/tools/tapeout/src/main/scala/macrolib/SRAM.scala @@ -105,8 +105,9 @@ case class SRAMGroup( family: Stri...
[ "tools/tapeout/src/main/scala/macrolib/SRAM.scala" ]
[ { "comment": "This logic is duplicated for both depth and width parsing. Consider extracting this into a helper function or variable to reduce duplication.", "path": "tools/tapeout/src/main/scala/macrolib/SRAM.scala", "hunk": "@@ -148,17 +159,35 @@ object SRAMGroup {\n case Some(x: JsNumber) => x....
true
ucb-bar/chipyard
2,303
comment_to_fix
Support sram depth/width lists, as well as explicit list of legal combos
No validation that each inner array has exactly 3 elements before accessing y(0), y(1), y(2). This could throw an IndexOutOfBoundsException if the JSON contains arrays with fewer than 3 elements. ```suggestion val seq = x.as[List[JsArray]].map(_.as[List[JsNumber]].map(_.value.intValue)) if (seq.exists(_...
592dad64d9704ed46f2931d684bf4b1d0857352b
b38f52013f130333b61d4bc2bab168d4ff37daee
diff --git a/tools/tapeout/src/main/scala/macrolib/SRAM.scala b/tools/tapeout/src/main/scala/macrolib/SRAM.scala index ea51b04906..7d370ce0db 100644 --- a/tools/tapeout/src/main/scala/macrolib/SRAM.scala +++ b/tools/tapeout/src/main/scala/macrolib/SRAM.scala @@ -105,8 +105,9 @@ case class SRAMGroup( family: Stri...
[ "tools/tapeout/src/main/scala/macrolib/SRAM.scala" ]
[ { "comment": "No validation that each inner array has exactly 3 elements before accessing y(0), y(1), y(2). This could throw an IndexOutOfBoundsException if the JSON contains arrays with fewer than 3 elements.\n```suggestion\n val seq = x.as[List[JsArray]].map(_.as[List[JsNumber]].map(_.value.intValue))\...
true
ucb-bar/chipyard
2,250
issue_to_patch
Update boomv3 for rocc fix
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
6927c487a6b4964b3880c2363827a6d8ecc1528d
34d32fe4db8feb00746902c0ac5155e50e8f5a06
diff --git a/generators/boom b/generators/boom index 3d305f2ff5..5223e44cfe 160000 --- a/generators/boom +++ b/generators/boom @@ -1,1 +1,1 @@ -Subproject commit 3d305f2ff5dab9371d9c95754888d4b49baea556 +Subproject commit 5223e44cfeb26f41380057a2eb4d651197475f69
[ "generators/boom" ]
[]
true
ucb-bar/chipyard
2,293
issue_to_patch
Experimental chisel7 support
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
90745a2141675a4e01ae07c2e89ccfa357210915
431744d97363534cf114e16184a0fc54cac901c0
diff --git a/.github/workflows/chipyard-chisel7.yml b/.github/workflows/chipyard-chisel7.yml new file mode 100644 index 0000000000..0f4ea828aa --- /dev/null +++ b/.github/workflows/chipyard-chisel7.yml @@ -0,0 +1,44 @@ +name: chipyard-chisel7 + +on: + pull_request: + branches: + - main + - '1.[0-9]*.x' + ...
[ ".github/workflows/chipyard-chisel7.yml", "build.sbt", "common.mk", "generators/rocket-chip", "scripts/uniquify-module-names.py", "tools/stage-chisel7/src/main/scala/ChipyardAnnotations.scala", "tools/stage-chisel7/src/main/scala/ChipyardCli.scala", "tools/stage-chisel7/src/main/scala/ChipyardOptions....
[ { "comment": "oh... how does this work? regardless of useChisel7 or not, wouldn't hf require midas as a dependency?", "path": "build.sbt", "hunk": "@@ -115,11 +121,17 @@ lazy val scalaTestSettings = Seq(\n \n // -- Rocket Chip --\n \n-lazy val hardfloat = freshProject(\"hardfloat\", file(\"generators/h...
true
ucb-bar/chipyard
2,293
comment_to_fix
Experimental chisel7 support
**[P1] Fix firtool version detection under USE_CHISEL7** The new `require_firtool_version` macro assumes `firtool --version` prints `CIRCT firtool-X.Y.Z`, but released firtool binaries typically report `firtool version X.Y.Z`. With `USE_CHISEL7` set the `grep` on that hard‑coded pattern returns nothing, so the guard e...
90745a2141675a4e01ae07c2e89ccfa357210915
431744d97363534cf114e16184a0fc54cac901c0
diff --git a/common.mk b/common.mk index 8de57f3b75..297b82aaa0 100644 --- a/common.mk +++ b/common.mk @@ -16,6 +16,21 @@ define require_cmd || { echo "Error: $(1) not found in PATH. Set up your tool environment before building this target." >&2; exit 1; } endef +# Require minimum firtool version when building wi...
[ "common.mk" ]
[ { "comment": "**[P1] Fix firtool version detection under USE_CHISEL7**\n\nThe new `require_firtool_version` macro assumes `firtool --version` prints `CIRCT firtool-X.Y.Z`, but released firtool binaries typically report `firtool version X.Y.Z`. With `USE_CHISEL7` set the `grep` on that hard‑coded pattern returns...
true
ucb-bar/chipyard
2,293
comment_to_fix
Experimental chisel7 support
**[P1] Honour --emit-legacy-sfc in the Chisel7 stage** The Chisel 7 stage still exposes `LegacySFCAnnotation` and the `enableSFCFIRRTLEmission` flag, but `ChipyardStage` no longer checks that flag when constructing the phase manager. As a result, passing `--emit-legacy-sfc` has no effect—the legacy `LegacyFirrtl2Emiss...
90745a2141675a4e01ae07c2e89ccfa357210915
431744d97363534cf114e16184a0fc54cac901c0
diff --git a/tools/stage-chisel7/src/main/scala/ChipyardStage.scala b/tools/stage-chisel7/src/main/scala/ChipyardStage.scala new file mode 100644 index 0000000000..bda626baa4 --- /dev/null +++ b/tools/stage-chisel7/src/main/scala/ChipyardStage.scala @@ -0,0 +1,60 @@ +// See LICENSE for license details. +// Based on Roc...
[ "tools/stage-chisel7/src/main/scala/ChipyardStage.scala" ]
[ { "comment": "**[P1] Honour --emit-legacy-sfc in the Chisel7 stage**\n\nThe Chisel 7 stage still exposes `LegacySFCAnnotation` and the `enableSFCFIRRTLEmission` flag, but `ChipyardStage` no longer checks that flag when constructing the phase manager. As a result, passing `--emit-legacy-sfc` has no effect—the le...
true
ucb-bar/chipyard
2,297
issue_to_patch
Fix: reference link syntax
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
67d971d0ea173adb23f426e05a3231428b15c570
68b9931a85c5b4b616698208839399a2fbba3355
diff --git a/README.md b/README.md index f4419353d9..734f866c4a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To get started using Chipyard, see the documentation on the Chipyard documentati Chipyard is an open source framework for agile development of Chisel-based systems-on-chip. It will allow you to l...
[ "README.md" ]
[]
true
ucb-bar/chipyard
2,295
issue_to_patch
fix: organize repos
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
feef6e067d20486d29c7ed78b20e10cef135e5ad
e149fb0e4d758709d3d6bb7034503a0c3bf5bdcb
diff --git a/.gitmodules b/.gitmodules index 3dad92dc1d..05d307b563 100644 --- a/.gitmodules +++ b/.gitmodules @@ -156,10 +156,10 @@ url = https://github.com/ucb-bar/zephyr.git [submodule "software/tacit_decoder"] path = software/tacit_decoder - url = https://github.com/ucb-bar/tacit_decoder.git + url = https://gi...
[ ".gitmodules" ]
[]
true
ucb-bar/chipyard
2,287
issue_to_patch
Modularize out most submodules
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
369aea00da70511e96190d06830cf0ba47271251
60af4c0c472e3b1827b3f156a9f21641db0bc9a3
diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index cc23a8c87d..f177a1667a 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -150,6 +150,7 @@ jobs: - name: Check that documentation builds with no warnings/err...
[ ".github/workflows/chipyard-run-tests.yml", "build.sbt", "common.mk", "docs/Chipyard-Basics/Configs-Parameters-Mixins.rst", "docs/Chipyard-Basics/Initial-Repo-Setup.rst", "docs/Generators/CVA6.rst", "docs/Generators/Ibex.rst", "docs/Generators/Sodor.rst", "docs/Generators/VexiiRiscv.rst", "docs/Ge...
[]
true
ucb-bar/chipyard
2,294
issue_to_patch
Unpollute init-submodules script
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
c9ce518588157da752eca77e38f77c2d605dc0eb
f0cc2753b3f8da31cd5b32badc4d98d343157a75
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index 446fb355f3..aa7ee0ff43 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -309,6 +309,8 @@ if run_step "8"; then exit_if_last_command_failed fi popd + # Ensure FireMarshal CLI is on PATH in env.sh (idempotent) + ...
[ "scripts/build-setup.sh", "scripts/init-submodules-no-riscv-tools-nolog.sh" ]
[]
true
ucb-bar/chipyard
2,292
issue_to_patch
Update spike
<!-- First, please ensure that the title of your PR is sufficient to include in the next changelog. Refer to https://github.com/ucb-bar/chipyard/releases for examples and feel free to ask reviewers for help. Then, make sure to label your PR with one of the changelog:<section> labels to indicate which section of t...
06f3a6215658405b706f0faf14ba6748f72ca607
6038d2f83be5b0e1c764ff1d229b51e5e302e577
diff --git a/toolchains/riscv-tools/riscv-isa-sim b/toolchains/riscv-tools/riscv-isa-sim index 76858cc3aa..9c190a07c6 160000 --- a/toolchains/riscv-tools/riscv-isa-sim +++ b/toolchains/riscv-tools/riscv-isa-sim @@ -1,1 +1,1 @@ -Subproject commit 76858cc3aa178446584eae52f82e0a933e71f8db +Subproject commit 9c190a07c6838f...
[ "toolchains/riscv-tools/riscv-isa-sim" ]
[]
true
ucb-bar/chipyard
2,212
issue_to_patch
Allow "lite" Chipyard builds with a minimal subset of submodules
There are a lot of submodules in generators/. Currently they are all cloned, initialized, and compiled, even though most people only use a small subset of these at a time. This PR demonstrates a path towards a "modular generator submodule" approach, here some submodules can be left uninitialized, with the consequenc...
06f3a6215658405b706f0faf14ba6748f72ca607
b69b3592e161165e0f92337f58a28611aa94dd90
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 38d002431e..65c22f241e 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -20,7 +20,7 @@ runs: run: | conda activate ${{ env.conda-env-name-no-time }}-$(date --date...
[ ".github/actions/run-tests/action.yml", ".github/scripts/remote-do-rtl-build.sh", ".github/workflows/chipyard-run-tests.yml", "build.sbt", "common.mk", "docs/Generators/Ara.rst", "docs/Generators/Saturn.rst", "generators/ara", "generators/caliptra-aes-acc", "generators/chipyard/src/main/scala/conf...
[ { "comment": "```suggestion\r\n\t ENABLE_CALIPTRA=1\r\n\t ENABLE_COMPRESSACC=1\r\n```", "path": "scripts/init-submodules-no-riscv-tools-nolog.sh", "hunk": "@@ -27,6 +39,19 @@ do\n ;;\n --force | -f | --skip-validate) # Deprecated flags\n ;;\n+\t--full)\n+\t ENABL...
true
ucb-bar/chipyard
2,212
comment_to_fix
Allow "lite" Chipyard builds with a minimal subset of submodules
```suggestion ENABLE_CALIPTRA=1 ENABLE_COMPRESSACC=1 ```
06f3a6215658405b706f0faf14ba6748f72ca607
b69b3592e161165e0f92337f58a28611aa94dd90
diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh index 560fa16a3c..22959d1a53 100755 --- a/scripts/init-submodules-no-riscv-tools-nolog.sh +++ b/scripts/init-submodules-no-riscv-tools-nolog.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash -# exit script if any comm...
[ "scripts/init-submodules-no-riscv-tools-nolog.sh" ]
[ { "comment": "```suggestion\r\n\t ENABLE_CALIPTRA=1\r\n\t ENABLE_COMPRESSACC=1\r\n```", "path": "scripts/init-submodules-no-riscv-tools-nolog.sh", "hunk": "@@ -27,6 +39,19 @@ do\n ;;\n --force | -f | --skip-validate) # Deprecated flags\n ;;\n+\t--full)\n+\t ENABL...
true
ucb-bar/chipyard
2,212
comment_to_fix
Allow "lite" Chipyard builds with a minimal subset of submodules
Nit: Do we want to also ignore unfound files for the other repositories?
06f3a6215658405b706f0faf14ba6748f72ca607
b69b3592e161165e0f92337f58a28611aa94dd90
diff --git a/common.mk b/common.mk index 2a774cc8f0..99d37f93b4 100644 --- a/common.mk +++ b/common.mk @@ -75,13 +75,16 @@ HELP_COMMANDS += \ # include additional subproject make fragments # see HELP_COMPILATION_VARIABLES ######################################################################################### -incl...
[ "common.mk" ]
[ { "comment": "Nit: Do we want to also ignore unfound files for the other repositories?", "path": "common.mk", "hunk": "@@ -65,29 +65,30 @@ HELP_COMMANDS += \\\n # include additional subproject make fragments\n # see HELP_COMPILATION_VARIABLES\n ###########################################################...
true
ucb-bar/chipyard
2,212
comment_to_fix
Allow "lite" Chipyard builds with a minimal subset of submodules
Can we make this find expression easier to read, i.e. `not a symlink and (name is $(2) and not name .*)`. Currently, this is quite hard to parse.
06f3a6215658405b706f0faf14ba6748f72ca607
b69b3592e161165e0f92337f58a28611aa94dd90
diff --git a/common.mk b/common.mk index 2a774cc8f0..99d37f93b4 100644 --- a/common.mk +++ b/common.mk @@ -75,13 +75,16 @@ HELP_COMMANDS += \ # include additional subproject make fragments # see HELP_COMPILATION_VARIABLES ######################################################################################### -incl...
[ "common.mk" ]
[ { "comment": "Can we make this find expression easier to read, i.e. `not a symlink and (name is $(2) and not name .*)`. Currently, this is quite hard to parse.", "path": "common.mk", "hunk": "@@ -65,29 +65,30 @@ HELP_COMMANDS += \\\n # include additional subproject make fragments\n # see HELP_COMPILATIO...
true
ucb-bar/chipyard
2,212
comment_to_fix
Allow "lite" Chipyard builds with a minimal subset of submodules
This to me seems brittle, I expect users to forget to add things to this list. Can we auto-generate this list based on something else (maybe we just specify the core set of submodules instead excluding the extension submodules)
06f3a6215658405b706f0faf14ba6748f72ca607
b69b3592e161165e0f92337f58a28611aa94dd90
diff --git a/common.mk b/common.mk index 2a774cc8f0..99d37f93b4 100644 --- a/common.mk +++ b/common.mk @@ -75,13 +75,16 @@ HELP_COMMANDS += \ # include additional subproject make fragments # see HELP_COMPILATION_VARIABLES ######################################################################################### -incl...
[ "common.mk" ]
[ { "comment": "This to me seems brittle, I expect users to forget to add things to this list. Can we auto-generate this list based on something else (maybe we just specify the core set of submodules instead excluding the extension submodules)", "path": "common.mk", "hunk": "@@ -65,29 +65,30 @@ HELP_COMMA...
true
ucb-bar/chipyard
2,212
comment_to_fix
Allow "lite" Chipyard builds with a minimal subset of submodules
Surprisingly not horrible. I wonder if we can encode this a bit better though... maybe we can write a quick SBT plugin to do this for us for any Chipyard submodule). Dropping https://github.com/sbt/sbt-sriracha/blob/master/src/main/scala/SrirachaPlugin.scala for a reference on how to write a plugin. Or maybe we can wri...
06f3a6215658405b706f0faf14ba6748f72ca607
b69b3592e161165e0f92337f58a28611aa94dd90
diff --git a/build.sbt b/build.sbt index d9002e56fe..ae8b585720 100644 --- a/build.sbt +++ b/build.sbt @@ -153,20 +153,57 @@ lazy val testchipip = (project in file("generators/testchipip")) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) -lazy val chipyard = (project in file("ge...
[ "build.sbt" ]
[ { "comment": "Surprisingly not horrible. I wonder if we can encode this a bit better though... maybe we can write a quick SBT plugin to do this for us for any Chipyard submodule). Dropping https://github.com/sbt/sbt-sriracha/blob/master/src/main/scala/SrirachaPlugin.scala for a reference on how to write a plugi...
true