Skip to content

Commit

Permalink
Bump github.com/go-logr/logr from 1.3.0 to 1.4.1 (#855)
Browse files Browse the repository at this point in the history
Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.3.0 to 1.4.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/go-logr/logr/releases">github.com/go-logr/logr's releases</a>.</em></p>
<blockquote>
<h2>v1.4.1</h2>
<h2>What's Changed</h2>
<ul>
<li>slogr: fix unintended API break in v1.4.0 by <a href="https://github.com/pohly"><code>@​pohly</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/253">go-logr/logr#253</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/go-logr/logr/compare/v1.4.0...v1.4.1">https://github.com/go-logr/logr/compare/v1.4.0...v1.4.1</a></p>
<h2>v1.4.0</h2>
<p>This release dramatically improves interoperability with Go's <code>log/slog</code> package.  In particular, <code>logr.NewContext</code> and <code>logr.NewContextWithSlogLogger</code> use the same context key, which allows <code>logr.FromContext</code> and <code>logr.FromContextAsSlogLogger</code> to return <code>logr.Logger</code> or <code>*slog.Logger</code> respectively, including transparently converting each to the other as needed.</p>
<p>Functions <code>logr/slogr.NewLogr</code> and <code>logr/slogr.ToSlogHandler</code> have been superceded by <code>logr.FromSlogHandler</code> and <code>logr.ToSlogHandler</code> respectively, and type <code>logr/slogr.SlogSink</code> has been superceded by <code>logr.SlogSink</code>.  All of the old names in <code>logr/slogr</code> remain, for compatibility.</p>
<p>Package <code>logr/funcr</code> now supports <code>logr.SlogSink</code>, meaning that it's output passes all but one of the Slog conformance tests (that exception being that <code>funcr</code> handles the timestamp itself).</p>
<p>Users who have a <code>logr.Logger</code> and need a <code>*slog.Logger</code> can call <code>slog.New(logr.ToSlogHandler(...))</code> and all output will go through the same stack.</p>
<p>Users who have a <code>*slog.Logger</code> or <code>slog.Handler</code> can call <code>logr.FromSlogHandler(...)</code> and all output will go through the same stack.</p>
<h2>What's Changed</h2>
<ul>
<li>slog context support by <a href="https://github.com/pohly"><code>@​pohly</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/237">go-logr/logr#237</a></li>
<li>slog support: fix WithGroup + WithValues combination by <a href="https://github.com/pohly"><code>@​pohly</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/243">go-logr/logr#243</a></li>
<li>Add tests for context with slog by <a href="https://github.com/thockin"><code>@​thockin</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/246">go-logr/logr#246</a></li>
<li>sloghandler: unnamed groups should be inlined by <a href="https://github.com/thockin"><code>@​thockin</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/245">go-logr/logr#245</a></li>
<li>Add SlogSink support to funcr by <a href="https://github.com/thockin"><code>@​thockin</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/241">go-logr/logr#241</a></li>
<li>funcr: Add LogInfoLevel Option to skip logging level in the info log by <a href="https://github.com/spacewander"><code>@​spacewander</code></a> in <a href="https://redirect.github.com/go-logr/logr/pull/240">go-logr/logr#240</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/spacewander"><code>@​spacewander</code></a> made their first contribution in <a href="https://redirect.github.com/go-logr/logr/pull/240">go-logr/logr#240</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/go-logr/logr/compare/v1.3.0...v1.4.0">https://github.com/go-logr/logr/compare/v1.3.0...v1.4.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/go-logr/logr/commit/dcdc3f2cd12e8a5c4e2a6712d6958c90e2e5bd98"><code>dcdc3f2</code></a> slogr: fix unintended API break in v0.8.0 (<a href="https://redirect.github.com/go-logr/logr/issues/253">#253</a>)</li>
<li><a href="https://github.com/go-logr/logr/commit/5d88f52f7c0bad12180de7bd4bd5a56fa7ce0ec3"><code>5d88f52</code></a> funcr: Add LogInfoLevel Option to skip logging level in the info log (<a href="https://redirect.github.com/go-logr/logr/issues/240">#240</a>)</li>
<li><a href="https://github.com/go-logr/logr/commit/177005d4eef9d394e2cb5702ab1c0dfb51ddef0f"><code>177005d</code></a> build(deps): bump actions/upload-artifact from 3.1.3 to 4.0.0</li>
<li><a href="https://github.com/go-logr/logr/commit/e7f489a410309014c7d2ddc70800f2e3031a34f6"><code>e7f489a</code></a> build(deps): bump github/codeql-action from 2.22.9 to 3.22.11</li>
<li><a href="https://github.com/go-logr/logr/commit/cf56c3b5da5a00eacf11e94616fe5dfe873bee52"><code>cf56c3b</code></a> build(deps): bump actions/setup-go from 4 to 5</li>
<li><a href="https://github.com/go-logr/logr/commit/2ad296ec40a3bbda65a372e58a27d566e2e05083"><code>2ad296e</code></a> build(deps): bump github/codeql-action from 2.22.8 to 2.22.9</li>
<li><a href="https://github.com/go-logr/logr/commit/d55b4e2d2159a37e0eb7728f3d6ae0abb563393a"><code>d55b4e2</code></a> Merge pull request <a href="https://redirect.github.com/go-logr/logr/issues/241">#241</a> from thockin/master</li>
<li><a href="https://github.com/go-logr/logr/commit/98ee9d96bccd21c2ddb6cbe144aed9022119b233"><code>98ee9d9</code></a> Clean up slog testing and restore coverage</li>
<li><a href="https://github.com/go-logr/logr/commit/b228ba8636d02f868be6802747693a8489b182e2"><code>b228ba8</code></a> Break examples to new file</li>
<li><a href="https://github.com/go-logr/logr/commit/64328772921a64a598eb222e2b0d0b9317651521"><code>6432877</code></a> Add benchmarks for slogSink</li>
<li>Additional commits viewable in <a href="https://github.com/go-logr/logr/compare/v1.3.0...v1.4.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/go-logr/logr&package-manager=go_modules&previous-version=1.3.0&new-version=1.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>
  • Loading branch information
mergify[bot] authored Jan 8, 2024
2 parents b66ba59 + 6834623 commit 50b3e35
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker v24.0.7+incompatible
github.com/equinix-labs/otel-init-go v0.0.9
github.com/go-logr/logr v1.3.0
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.3.0
github.com/go-logr/zerologr v1.2.3
github.com/google/go-cmp v0.6.0
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,9 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
Expand Down

0 comments on commit 50b3e35

Please sign in to comment.