From 047849fa77ac6c2c4f4cf4737668e3e60e324065 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Sat, 18 May 2024 18:40:18 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-sriov@main PR link: https://github.com/networkservicemesh/sdk-sriov/pull/595 Commit: 53551c7 Author: Network Service Mesh Bot Date: 2024-05-18 13:39:18 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#595) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/664 Commit: 9502001 Author: Network Service Mesh Bot Date: 2024-05-18 13:35:42 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#664) PR link: https://github.com/networkservicemesh/sdk/pull/1626 Commit: 7b51d9c Author: Vladislav Byrgazov Date: 2024-05-19 02:33:13 +0800 Message: - Fix memory leak in metrics chain element (#1626) * Fix memory leak in metrics chain element * Fix lint issues * Added check is opentelemetry enabled and fixed copyrights * Fix metrics memory leak by storing temp connection data in metadata * Added copyright * Address review comments * Fixed import --------- Signed-off-by: Vladislav Byrgazov Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 69f47265..9ad685c2 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20240516075535-3b79590e3be7 + github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 github.com/networkservicemesh/sdk-k8s v0.0.0-20240516080058-ad6911f0796e - github.com/networkservicemesh/sdk-kernel v0.0.0-20240515153714-dc6ff7c24b35 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240515155344-ed726b94d078 + github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 github.com/networkservicemesh/sdk-vpp v0.0.0-20240515155353-be77b5185e51 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index a7de5aba..e6039e7a 100644 --- a/go.sum +++ b/go.sum @@ -135,14 +135,14 @@ github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 h1:EaWGg github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA= -github.com/networkservicemesh/sdk v0.5.1-0.20240516075535-3b79590e3be7 h1:TuBrBMCTgFWLWvhoCp7gwjjrZcwLj/pu0KoLpgMVedY= -github.com/networkservicemesh/sdk v0.5.1-0.20240516075535-3b79590e3be7/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= +github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 h1:nC7dOI5zxRH3AXOpJWlLthEzYXraaRO6zXY8bTQXjm0= +github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= github.com/networkservicemesh/sdk-k8s v0.0.0-20240516080058-ad6911f0796e h1:FYwU2okf17zNlwHVijgCge1DOgScS7WfG8ri63JN4Gk= github.com/networkservicemesh/sdk-k8s v0.0.0-20240516080058-ad6911f0796e/go.mod h1:T5fZNz+UxIqk31tdMQ7QPjm4A0RWAJElYm4bynMYMYM= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240515153714-dc6ff7c24b35 h1:pcSxcNgE/r860boQ2Uw9SXB73bCuJRWv+cPt0+D8GHQ= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240515153714-dc6ff7c24b35/go.mod h1:bXzqpPKJIvT3kZddRmJcxlR23WBFxXmb8nKPuVIPhPg= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240515155344-ed726b94d078 h1:eiT7/KlWiBHjeVZxY9IJq+5P+t1vlQJhVw5T6oztInY= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240515155344-ed726b94d078/go.mod h1:vEAplvBxX3e5vSuKXgyrLdCXxZjtcVjJtcT0kfchX1Y= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 h1:6hoJ2RU7aEk8hFVSum9IlbxB8VxJHbRoZS1XxdgR7oQ= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051/go.mod h1:xnlVO69cVAz/Pn8JzL5gGAwaSOzskDvVvXW+C8/91Hg= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 h1:cs3m7ZDCpYa/6ZWKfHvqz9l40qksloE+qaT6uIRYzN0= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301/go.mod h1:OdUhoA+qBkBkcsCIKXar496Qpl+GRlM4/Qt8NsUhCWc= github.com/networkservicemesh/sdk-vpp v0.0.0-20240515155353-be77b5185e51 h1:Ot/sPLcz0rXmyzmI0gELIwOcwRDNu1rKxTtdvU4+vQg= github.com/networkservicemesh/sdk-vpp v0.0.0-20240515155353-be77b5185e51/go.mod h1:MW8vVrQjACinMbRt8QKiozVKaqOF/gzgz3zKPtz2ioc= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= From 87cdb22d87535e818ba13d87af173f3d512ad59a Mon Sep 17 00:00:00 2001 From: NSMBot Date: Sat, 18 May 2024 18:44:18 +0000 Subject: [PATCH 2/2] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c1101a40..dd163ee1 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 github.com/networkservicemesh/sdk-k8s v0.0.0-20240518183743-3fe77ab18ac3 - github.com/networkservicemesh/sdk-kernel v0.0.0-20240515153714-dc6ff7c24b35 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240515155344-ed726b94d078 + github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 github.com/networkservicemesh/sdk-vpp v0.0.0-20240515155353-be77b5185e51 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index bd90d279..ba125ea4 100644 --- a/go.sum +++ b/go.sum @@ -139,10 +139,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0 h1:nC7dOI github.com/networkservicemesh/sdk v0.5.1-0.20240518183313-7b51d9c9b5d0/go.mod h1:1H5x5GPlseIQhmvcbvSZUcLu/p24rQpTX3zsHP1yKj4= github.com/networkservicemesh/sdk-k8s v0.0.0-20240518183743-3fe77ab18ac3 h1:XkIdeN4ivjoBntbLatzlfgcdGCuuGT/lTfsrAJZuLhM= github.com/networkservicemesh/sdk-k8s v0.0.0-20240518183743-3fe77ab18ac3/go.mod h1:IfLjQG2IUD3Z6jg11xjyXSajKLXgVHDoCbrXck5Unc0= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240515153714-dc6ff7c24b35 h1:pcSxcNgE/r860boQ2Uw9SXB73bCuJRWv+cPt0+D8GHQ= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240515153714-dc6ff7c24b35/go.mod h1:bXzqpPKJIvT3kZddRmJcxlR23WBFxXmb8nKPuVIPhPg= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240515155344-ed726b94d078 h1:eiT7/KlWiBHjeVZxY9IJq+5P+t1vlQJhVw5T6oztInY= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240515155344-ed726b94d078/go.mod h1:vEAplvBxX3e5vSuKXgyrLdCXxZjtcVjJtcT0kfchX1Y= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051 h1:6hoJ2RU7aEk8hFVSum9IlbxB8VxJHbRoZS1XxdgR7oQ= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240518183542-950200102051/go.mod h1:xnlVO69cVAz/Pn8JzL5gGAwaSOzskDvVvXW+C8/91Hg= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301 h1:cs3m7ZDCpYa/6ZWKfHvqz9l40qksloE+qaT6uIRYzN0= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240518183918-53551c767301/go.mod h1:OdUhoA+qBkBkcsCIKXar496Qpl+GRlM4/Qt8NsUhCWc= github.com/networkservicemesh/sdk-vpp v0.0.0-20240515155353-be77b5185e51 h1:Ot/sPLcz0rXmyzmI0gELIwOcwRDNu1rKxTtdvU4+vQg= github.com/networkservicemesh/sdk-vpp v0.0.0-20240515155353-be77b5185e51/go.mod h1:MW8vVrQjACinMbRt8QKiozVKaqOF/gzgz3zKPtz2ioc= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=