From f9bf32a6bf41e1471db8353de0aa722fd32c5574 Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Mon, 3 Jun 2024 16:00:28 +0000 Subject: [PATCH 1/3] Reverting toolchain version because cachito does not support 1.22.2 yet --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fed7aaed5..e4e4eab65 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/netobserv/netobserv-ebpf-agent go 1.21.0 -toolchain go1.22.2 +toolchain go1.21.0 require ( github.com/caarlos0/env/v6 v6.10.1 From 77bc9a072733ba9e8863cd469a1a509dcc00ec41 Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Tue, 4 Jun 2024 14:27:26 +0000 Subject: [PATCH 2/3] Removing 1.22 toolchain in go.mod because cachito does not support it yet --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index e4e4eab65..0cbe84bc3 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/netobserv/netobserv-ebpf-agent go 1.21.0 -toolchain go1.21.0 - require ( github.com/caarlos0/env/v6 v6.10.1 github.com/cilium/ebpf v0.15.0 From 76074f138b45678c72d9aed800e23bdbdf7782c2 Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Tue, 4 Jun 2024 15:34:49 +0000 Subject: [PATCH 3/3] Generating files --- pkg/pbflow/flow_grpc.pb.go | 9 +++++---- pkg/pbpacket/packet_grpc.pb.go | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkg/pbflow/flow_grpc.pb.go b/pkg/pbflow/flow_grpc.pb.go index fccb88095..f9a4eb466 100644 --- a/pkg/pbflow/flow_grpc.pb.go +++ b/pkg/pbflow/flow_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.4.0 // - protoc v3.19.4 // source: proto/flow.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Collector_Send_FullMethodName = "/pbflow.Collector/Send" @@ -38,8 +38,9 @@ func NewCollectorClient(cc grpc.ClientConnInterface) CollectorClient { } func (c *collectorClient) Send(ctx context.Context, in *Records, opts ...grpc.CallOption) (*CollectorReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CollectorReply) - err := c.cc.Invoke(ctx, Collector_Send_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Collector_Send_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } diff --git a/pkg/pbpacket/packet_grpc.pb.go b/pkg/pbpacket/packet_grpc.pb.go index b71ed24b7..5aa9685d9 100644 --- a/pkg/pbpacket/packet_grpc.pb.go +++ b/pkg/pbpacket/packet_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.4.0 // - protoc v3.19.4 // source: proto/packet.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.62.0 or later. +const _ = grpc.SupportPackageIsVersion8 const ( Collector_Send_FullMethodName = "/pbpacket.Collector/Send" @@ -38,8 +38,9 @@ func NewCollectorClient(cc grpc.ClientConnInterface) CollectorClient { } func (c *collectorClient) Send(ctx context.Context, in *Packet, opts ...grpc.CallOption) (*CollectorReply, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CollectorReply) - err := c.cc.Invoke(ctx, Collector_Send_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Collector_Send_FullMethodName, in, out, cOpts...) if err != nil { return nil, err }