New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

correcting the misuse of the context in the copyContextWithCustomTime… #1941

Merged

matt0x6F merged 2 commits into gomods:main from kkHAIKE:fix_ctxCopy

Apr 13, 2024

Contributor

kkHAIKE commented Apr 10, 2024

…out method

What is the problem I am trying to address?

This is a fundamental error, and its misuse here prevents the correct output of debug logs in stasher.Stash.

athens/pkg/stash/stasher.go

Lines 47 to 51 in a5277a3

    
           func (s *stasher) Stash(ctx context.Context, mod, ver string) (string, error) { 
        
           	const op errors.Op = "stasher.Stash" 
        
           	ctx, span := observ.StartSpan(ctx, op.String()) 
        
           	defer span.End() 
        
           	log.EntryFromContext(ctx).Debugf("saving %s@%s to storage...", mod, ver)

How is the fix applied?

output that logs:
DEBUG[5:35PM]: saving xxx to storage... http-method=GET http-path=xxx.info request-id=58cfecb1-df43-46b1-9b3f-cfb59e6c937b

What GitHub issue(s) does this PR fix or close?

Fixes #


          correcting the misuse of the context in the copyContextWithCustomTime…

65d1ca0

…out method

kkHAIKE requested a review from a team as a code owner

April 10, 2024 09:53

matt0x6F reviewed

View reviewed changes

pkg/download/protocol.go Show resolved Hide resolved


          add a test for copyContextWithCustomTimeout

877605f

matt0x6F approved these changes

View reviewed changes

matt0x6F merged commit 8141583 into gomods:main

11 checks passed

DrPsychick referenced this pull request in gomods/athens-charts


          chore(deps): update gomods/athens docker tag to v0.13.3 (#65)

cbb9f53

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [gomods/athens](https://github.com/gomods/athens) | patch |
`v0.13.1` -> `v0.13.3` |

---

### Release Notes

<details>
<summary>gomods/athens (gomods/athens)</summary>

### [`v0.13.3`](https://github.com/gomods/athens/releases/tag/v0.13.3)

[Compare
Source](https://github.com/gomods/athens/compare/v0.13.2...v0.13.3)

#### What's Changed

- Update README.md by
[@&#8203;computerscienceiscool](https://github.com/computerscienceiscool)
in
[https://github.com/gomods/athens/pull/1932](https://github.com/gomods/athens/pull/1932)
- update-go-pkg(deps): bump github.com/stretchr/testify from 1.8.4 to
1.9.0 by [@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/gomods/athens/pull/1933](https://github.com/gomods/athens/pull/1933)
- Upgrade logrus from 1.7.0 => 1.9.3 by
[@&#8203;matt0x6F](https://github.com/matt0x6F) in
[https://github.com/gomods/athens/pull/1934](https://github.com/gomods/athens/pull/1934)
- should use errors.AsErr to extract and detect errors.Error by
[@&#8203;kkHAIKE](https://github.com/kkHAIKE) in
[https://github.com/gomods/athens/pull/1936](https://github.com/gomods/athens/pull/1936)
- correcting the misuse of the context in the copyContextWithCustomTime…
by [@&#8203;kkHAIKE](https://github.com/kkHAIKE) in
[https://github.com/gomods/athens/pull/1941](https://github.com/gomods/athens/pull/1941)
- remove hardcoded rootPath values by
[@&#8203;Jeansen](https://github.com/Jeansen) in
[https://github.com/gomods/athens/pull/1874](https://github.com/gomods/athens/pull/1874)

#### New Contributors

-
[@&#8203;computerscienceiscool](https://github.com/computerscienceiscool)
made their first contribution in
[https://github.com/gomods/athens/pull/1932](https://github.com/gomods/athens/pull/1932)
- [@&#8203;kkHAIKE](https://github.com/kkHAIKE) made their first
contribution in
[https://github.com/gomods/athens/pull/1936](https://github.com/gomods/athens/pull/1936)
- [@&#8203;Jeansen](https://github.com/Jeansen) made their first
contribution in
[https://github.com/gomods/athens/pull/1874](https://github.com/gomods/athens/pull/1874)

**Full Changelog**:
gomods/athens@v0.13.2...v0.13.3

### [`v0.13.2`](https://github.com/gomods/athens/releases/tag/v0.13.2)

[Compare
Source](https://github.com/gomods/athens/compare/v0.13.1...v0.13.2)

#### What's Changed

- Send standard logger's output to logrus by
[@&#8203;mikesep](https://github.com/mikesep) in
[https://github.com/gomods/athens/pull/1912](https://github.com/gomods/athens/pull/1912)
- chore: fix broken links to 'absolutely everybody' blog post by
[@&#8203;darrylblake](https://github.com/darrylblake) in
[https://github.com/gomods/athens/pull/1914](https://github.com/gomods/athens/pull/1914)
- update-github-action(deps): bump golangci/golangci-lint-action from 3
to 4 by [@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/gomods/athens/pull/1915](https://github.com/gomods/athens/pull/1915)
- update-go-pkg(deps): bump github.com/gorilla/mux from 1.6.2 to 1.8.1
by [@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/gomods/athens/pull/1917](https://github.com/gomods/athens/pull/1917)
- update-go-pkg(deps): bump github.com/stretchr/testify from 1.8.1 to
1.8.4 by [@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/gomods/athens/pull/1918](https://github.com/gomods/athens/pull/1918)
- update-go-pkg(deps): bump go.etcd.io/etcd/api/v3 from 3.5.9 to 3.5.12
by [@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/gomods/athens/pull/1919](https://github.com/gomods/athens/pull/1919)
- Fix Markdown link in Storage docs by
[@&#8203;chriskuehl](https://github.com/chriskuehl) in
[https://github.com/gomods/athens/pull/1922](https://github.com/gomods/athens/pull/1922)
- Use quotes for args by
[@&#8203;matt0x6F](https://github.com/matt0x6F) in
[https://github.com/gomods/athens/pull/1925](https://github.com/gomods/athens/pull/1925)
- Add log formatting settings by
[@&#8203;matt0x6F](https://github.com/matt0x6F) in
[https://github.com/gomods/athens/pull/1926](https://github.com/gomods/athens/pull/1926)
- upgrade mongodb driver by
[@&#8203;xytan0056](https://github.com/xytan0056) in
[https://github.com/gomods/athens/pull/1928](https://github.com/gomods/athens/pull/1928)
- update-go-pkg(deps): bump github.com/lib/pq from 1.10.7 to 1.10.9 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/gomods/athens/pull/1923](https://github.com/gomods/athens/pull/1923)
- Rework logging defaults by
[@&#8203;matt0x6F](https://github.com/matt0x6F) in
[https://github.com/gomods/athens/pull/1927](https://github.com/gomods/athens/pull/1927)

#### New Contributors

- [@&#8203;darrylblake](https://github.com/darrylblake) made their
first contribution in
[https://github.com/gomods/athens/pull/1914](https://github.com/gomods/athens/pull/1914)
- [@&#8203;chriskuehl](https://github.com/chriskuehl) made their first
contribution in
[https://github.com/gomods/athens/pull/1922](https://github.com/gomods/athens/pull/1922)
- [@&#8203;matt0x6F](https://github.com/matt0x6F) made their first
contribution in
[https://github.com/gomods/athens/pull/1925](https://github.com/gomods/athens/pull/1925)

**Full Changelog**:
gomods/athens@v0.13.1...v0.13.2

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/gomods/athens-charts).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMDEuNCIsInVwZGF0ZWRJblZlciI6IjM3LjMwMS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

matt0x6F added this to the 0.13.3 milestone

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet