Skip to content
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.

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

Update go1.22.0 #84

Merged
merged 12 commits into from
Feb 7, 2024
Merged

Update go1.22.0 #84

merged 12 commits into from
Feb 7, 2024

Conversation

awly
Copy link

@awly awly commented Feb 7, 2024

Doing a rebase got messy because of all the cherry-picks on the 1.21 branch.
Here's what I did:

  • create new branch tailscale.go1.22 from upstream release-branch.go1.22
  • create new branch update-go1.22.0 from tailscale.go1.22 (this PR branch)
  • cherry-pick all Tailscale patches from tailscale.go1.21 into update-go.1.22.0
  • amend a few commit messages with a [tailscale] prefix to make our patches easier to find in the future

To validate, here's the diff from upstream release-branch.go1.21 to our tailscale.go1.21: golang/go@release-branch.go1.21...tailscale:go:tailscale.go1.21 - these are all the patches in our current toolchain.
Here's the diff from upstream release-branch.go1.22 to this PR branch: golang/go@release-branch.go1.22...tailscale:go:update-go1.22.0

It's identical, except for a change in src/time/time.go that has been upstreamed: golang@4467839

Fixes #70

phirework and others added 11 commits February 7, 2024 08:23
Signed-off-by: Jenny Zhang <jz@tailscale.com>
…nspecified addr listens

For debugging Mac firewall dialog boxes blocking+failing tests.

Change-Id: Ic1a0cd51de7fe553de1c1c9333fa1cc75b8490f2
(cherry picked from commit 8c9eff4)
Git checkouts are not reproducible (in particular, the .git directory's hashes
vary according to the moods of git re: packing and other local settings), so
building our Go toolchain via Nix leads to source hashes that change from machine
to machine and over time.

Since Nix already knows the exact git revision it's building from, this change
lets Nix provide that hash to cmd/dist directly, skipping the rooting around in
.git to find the right hash.

Signed-off-by: Jenny Zhang <jz@tailscale.com>
(cherry picked from commit 6a17f14)
Lets us build a statically linked toolchain that has the same
cgo behavior as the standard dynamic toolchain.

Signed-off-by: Jenny Zhang <jz@tailscale.com>
(Cherry-picked from a2f29de)
Updates #55
Updates tailscale/corp#8944

Signed-off-by: Jenny Zhang <jz@tailscale.com>
(Cherry-picked from 13373ca)
Loosely inspired by nettrace/httptrace, allows functions to be called
when sockets are read from or written to. The hooks are specified via
the context (with a WithSockTrace function).

Only implemented for network sockets on POSIX systems.

Updates tailscale/corp#9230
Updates #58

Signed-off-by: Jenny Zhang <jz@tailscale.com>
(Cherry-picked from fb11c0d)
Extends the hooks added by #45 to also expose when TCP sockets are
created or closed (meant to allow TCP stats to be read from them). We
don't do this for all socket types since stats are not available for
UDP sockets, and they tend to be short-lived, thus invoking the hooks
would be useless overhead.

Also fixes read/write hooks to not count out-of-band data, since that's
usually not sent over the wire.

Updates tailscale/corp#9230
Updates #58

Signed-off-by: Jenny Zhang <jz@tailscale.com>
(Cherry-picked from db4dc90)
…ke our net ones

Updates #55
Updates tailscale/corp#12702

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
…efault

Updates #77
Updates tailscale/tailscale#9841

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Need to rebuild 1.20.5 release to make `tool/gocross.sh` work in OSS for
1.44 release branch for a backport. Add manual dispatch to the release
build action to allow that.

Updates tailscale/corp#15405
Use the ref provided in input instead of latest main branch SHA to tag
the release.
@awly awly requested a review from raggi February 7, 2024 16:41
Copy link
Member

@bradfitz bradfitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

I guess net internals changed (per that build failure).

Is https://github.com/tailscale/go/issues still accurate, with an open issue per patch? (sometimes an issue is two commits or so and that's fine)

@awly
Copy link
Author

awly commented Feb 7, 2024

@bradfitz yep, fixed the breakage in the latest commit.
https://github.com/tailscale/go/issues is still accurate, except for #70 which will be closed by this PR.

@awly awly requested a review from bradfitz February 7, 2024 16:53
Copy link
Member

@raggi raggi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM, and now passing.

@awly awly merged commit 53aa6e5 into tailscale.go1.22 Feb 7, 2024
5 checks passed
@awly awly deleted the update-go1.22.0 branch February 7, 2024 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants