From bdf53b9844c615240d8a5993890d0d07674adc78 Mon Sep 17 00:00:00 2001
From: gVisor bot <gvisor-bot@google.com>
Date: Fri, 19 Apr 2024 04:05:28 -0700
Subject: [PATCH] Internal change.

PiperOrigin-RevId: 626320559
---
 go.mod                          |  2 +-
 pkg/sync/BUILD                  |  1 -
 pkg/sync/runtime_exectracer1.go | 29 -----------------------------
 pkg/sync/runtime_exectracer2.go |  2 --
 4 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkg/sync/runtime_exectracer1.go

diff --git a/go.mod b/go.mod
index 028df5b05..0996d2301 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module gvisor.dev/gvisor
 
-go 1.21.1
+go 1.22.0
 
 require (
 	github.com/BurntSushi/toml v1.2.1
diff --git a/pkg/sync/BUILD b/pkg/sync/BUILD
index 262a91a23..3f2676a5e 100644
--- a/pkg/sync/BUILD
+++ b/pkg/sync/BUILD
@@ -27,7 +27,6 @@ go_library(
         "runtime.go",
         "runtime_amd64.go",
         "runtime_constants.go",
-        "runtime_exectracer1.go",
         "runtime_exectracer2.go",
         "runtime_go121_unsafe.go",
         "runtime_not_go121_unsafe.go",
diff --git a/pkg/sync/runtime_exectracer1.go b/pkg/sync/runtime_exectracer1.go
deleted file mode 100644
index e35e5cf85..000000000
--- a/pkg/sync/runtime_exectracer1.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2023 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build !goexperiment.exectracer2
-
-package sync
-
-// TraceBlockReason constants, from Go's src/runtime/trace.go.
-const (
-	TraceBlockSelect TraceBlockReason = traceEvGoBlockSelect // +checkconst runtime traceBlockSelect
-	TraceBlockSync                    = traceEvGoBlockSync   // +checkconst runtime traceBlockSync
-)
-
-// Tracer event types, from Go's src/runtime/trace.go.
-const (
-	traceEvGoBlockSelect = 24 // +checkconst runtime traceEvGoBlockSelect
-	traceEvGoBlockSync   = 25 // +checkconst runtime traceEvGoBlockSync
-)
diff --git a/pkg/sync/runtime_exectracer2.go b/pkg/sync/runtime_exectracer2.go
index f6094cab6..58630af23 100644
--- a/pkg/sync/runtime_exectracer2.go
+++ b/pkg/sync/runtime_exectracer2.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build goexperiment.exectracer2
-
 package sync
 
 // TraceBlockReason constants, from Go's src/runtime/trace2runtime.go.