diff --git a/cmd/protoc-gen-connect-go/main.go b/cmd/protoc-gen-connect-go/main.go
index 24f137aa..77421d68 100644
--- a/cmd/protoc-gen-connect-go/main.go
+++ b/cmd/protoc-gen-connect-go/main.go
@@ -91,7 +91,9 @@ func main() {
 	}
 	protogen.Options{}.Run(
 		func(plugin *protogen.Plugin) error {
-			plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
+			plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL) | uint64(pluginpb.CodeGeneratorResponse_FEATURE_SUPPORTS_EDITIONS)
+			plugin.SupportedEditionsMinimum = descriptorpb.Edition_EDITION_PROTO2
+			plugin.SupportedEditionsMaximum = descriptorpb.Edition_EDITION_2023
 			for _, file := range plugin.Files {
 				if file.Generate {
 					generate(plugin, file)
diff --git a/go.mod b/go.mod
index e66df980..36ace139 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ retract (
 require (
 	github.com/google/go-cmp v0.5.9
 	golang.org/x/net v0.23.0
-	google.golang.org/protobuf v1.33.0
+	google.golang.org/protobuf v1.34.2
 )
 
 require golang.org/x/text v0.14.0 // indirect
diff --git a/go.sum b/go.sum
index 7107a040..20d548f0 100644
--- a/go.sum
+++ b/go.sum
@@ -6,3 +6,5 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
diff --git a/internal/gen/connect/collide/v1/collide.pb.go b/internal/gen/connect/collide/v1/collide.pb.go
index ea521cf1..5aa644fb 100644
--- a/internal/gen/connect/collide/v1/collide.pb.go
+++ b/internal/gen/connect/collide/v1/collide.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: connect/collide/v1/collide.proto
 
@@ -154,7 +154,7 @@ func file_connect_collide_v1_collide_proto_rawDescGZIP() []byte {
 }
 
 var file_connect_collide_v1_collide_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_connect_collide_v1_collide_proto_goTypes = []interface{}{
+var file_connect_collide_v1_collide_proto_goTypes = []any{
 	(*ImportRequest)(nil),  // 0: connect.collide.v1.ImportRequest
 	(*ImportResponse)(nil), // 1: connect.collide.v1.ImportResponse
 }
@@ -174,7 +174,7 @@ func file_connect_collide_v1_collide_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_connect_collide_v1_collide_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_collide_v1_collide_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ImportRequest); i {
 			case 0:
 				return &v.state
@@ -186,7 +186,7 @@ func file_connect_collide_v1_collide_proto_init() {
 				return nil
 			}
 		}
-		file_connect_collide_v1_collide_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_collide_v1_collide_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*ImportResponse); i {
 			case 0:
 				return &v.state
diff --git a/internal/gen/connect/import/v1/import.pb.go b/internal/gen/connect/import/v1/import.pb.go
index eb258617..3c39dd21 100644
--- a/internal/gen/connect/import/v1/import.pb.go
+++ b/internal/gen/connect/import/v1/import.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: connect/import/v1/import.proto
 
@@ -56,7 +56,7 @@ var file_connect_import_v1_import_proto_rawDesc = []byte{
 	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-var file_connect_import_v1_import_proto_goTypes = []interface{}{}
+var file_connect_import_v1_import_proto_goTypes = []any{}
 var file_connect_import_v1_import_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
 	0, // [0:0] is the sub-list for method input_type
diff --git a/internal/gen/connect/ping/v1/ping.pb.go b/internal/gen/connect/ping/v1/ping.pb.go
index 96d3c8d0..eeb715d0 100644
--- a/internal/gen/connect/ping/v1/ping.pb.go
+++ b/internal/gen/connect/ping/v1/ping.pb.go
@@ -17,7 +17,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: connect/ping/v1/ping.proto
 
@@ -600,7 +600,7 @@ func file_connect_ping_v1_ping_proto_rawDescGZIP() []byte {
 }
 
 var file_connect_ping_v1_ping_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_connect_ping_v1_ping_proto_goTypes = []interface{}{
+var file_connect_ping_v1_ping_proto_goTypes = []any{
 	(*PingRequest)(nil),     // 0: connect.ping.v1.PingRequest
 	(*PingResponse)(nil),    // 1: connect.ping.v1.PingResponse
 	(*FailRequest)(nil),     // 2: connect.ping.v1.FailRequest
@@ -636,7 +636,7 @@ func file_connect_ping_v1_ping_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_connect_ping_v1_ping_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*PingRequest); i {
 			case 0:
 				return &v.state
@@ -648,7 +648,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*PingResponse); i {
 			case 0:
 				return &v.state
@@ -660,7 +660,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*FailRequest); i {
 			case 0:
 				return &v.state
@@ -672,7 +672,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*FailResponse); i {
 			case 0:
 				return &v.state
@@ -684,7 +684,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*SumRequest); i {
 			case 0:
 				return &v.state
@@ -696,7 +696,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*SumResponse); i {
 			case 0:
 				return &v.state
@@ -708,7 +708,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*CountUpRequest); i {
 			case 0:
 				return &v.state
@@ -720,7 +720,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*CountUpResponse); i {
 			case 0:
 				return &v.state
@@ -732,7 +732,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*CumSumRequest); i {
 			case 0:
 				return &v.state
@@ -744,7 +744,7 @@ func file_connect_ping_v1_ping_proto_init() {
 				return nil
 			}
 		}
-		file_connect_ping_v1_ping_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_connect_ping_v1_ping_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*CumSumResponse); i {
 			case 0:
 				return &v.state
diff --git a/internal/gen/connectext/grpc/status/v1/status.pb.go b/internal/gen/connectext/grpc/status/v1/status.pb.go
index d43c9bd1..f139079c 100644
--- a/internal/gen/connectext/grpc/status/v1/status.pb.go
+++ b/internal/gen/connectext/grpc/status/v1/status.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: connectext/grpc/status/v1/status.proto
 
@@ -148,7 +148,7 @@ func file_connectext_grpc_status_v1_status_proto_rawDescGZIP() []byte {
 }
 
 var file_connectext_grpc_status_v1_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_connectext_grpc_status_v1_status_proto_goTypes = []interface{}{
+var file_connectext_grpc_status_v1_status_proto_goTypes = []any{
 	(*Status)(nil),    // 0: grpc.status.v1.Status
 	(*anypb.Any)(nil), // 1: google.protobuf.Any
 }
@@ -167,7 +167,7 @@ func file_connectext_grpc_status_v1_status_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_connectext_grpc_status_v1_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_connectext_grpc_status_v1_status_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Status); i {
 			case 0:
 				return &v.state