From 4976b5952c8d02ec58a4ef257467c5444d036e35 Mon Sep 17 00:00:00 2001 From: Ron Federman <73110295+RonFed@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:04:34 +0200 Subject: [PATCH] Update runtime-detector to v0.0.5. Pass exe paths to ignore (#2040) Co-authored-by: Amir Blum --- instrumentation/go.mod | 2 +- instrumentation/go.sum | 4 ++-- odiglet/go.mod | 2 +- odiglet/go.sum | 4 ++-- odiglet/pkg/detector/detector.go | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/instrumentation/go.mod b/instrumentation/go.mod index 9c085327f..d9c3ac3b6 100644 --- a/instrumentation/go.mod +++ b/instrumentation/go.mod @@ -5,7 +5,7 @@ go 1.23.0 require ( github.com/go-logr/logr v1.4.2 github.com/odigos-io/odigos/common v0.0.0 - github.com/odigos-io/runtime-detector v0.0.4 + github.com/odigos-io/runtime-detector v0.0.5 go.opentelemetry.io/otel v1.33.0 golang.org/x/sync v0.10.0 ) diff --git a/instrumentation/go.sum b/instrumentation/go.sum index e0cf9882a..228edee56 100644 --- a/instrumentation/go.sum +++ b/instrumentation/go.sum @@ -22,8 +22,8 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/ github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= -github.com/odigos-io/runtime-detector v0.0.4 h1:q4yap5yTApkFFSRdwnU6NZeV+IbzEzWJZv6IEVCVKyE= -github.com/odigos-io/runtime-detector v0.0.4/go.mod h1:m8GfdG6pET0K/8aoZwnX+MkYz8oVroKs8HzRnkuJWt4= +github.com/odigos-io/runtime-detector v0.0.5 h1:CojYfZpYFvub7uVQCAgwryAird5OH/RCTpAo9+bNaP8= +github.com/odigos-io/runtime-detector v0.0.5/go.mod h1:m8GfdG6pET0K/8aoZwnX+MkYz8oVroKs8HzRnkuJWt4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= diff --git a/odiglet/go.mod b/odiglet/go.mod index 3f439f397..2ec6dec65 100644 --- a/odiglet/go.mod +++ b/odiglet/go.mod @@ -15,7 +15,7 @@ require ( github.com/odigos-io/odigos/opampserver v0.0.0 github.com/odigos-io/odigos/procdiscovery v0.0.0 github.com/odigos-io/opentelemetry-zap-bridge v0.0.5 - github.com/odigos-io/runtime-detector v0.0.4 + github.com/odigos-io/runtime-detector v0.0.5 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/auto v0.19.0-alpha go.opentelemetry.io/otel v1.33.0 diff --git a/odiglet/go.sum b/odiglet/go.sum index db5340018..a9770fe39 100644 --- a/odiglet/go.sum +++ b/odiglet/go.sum @@ -234,8 +234,8 @@ github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/odigos-io/opentelemetry-zap-bridge v0.0.5 h1:UDEKtgab42nGVSvA/F3lLKUYFPETtpl7kpxM9BKBlWk= github.com/odigos-io/opentelemetry-zap-bridge v0.0.5/go.mod h1:K98wHhktQ6vCTqeFztcpBDtPTe88vxVgZFlbeGobt24= -github.com/odigos-io/runtime-detector v0.0.4 h1:q4yap5yTApkFFSRdwnU6NZeV+IbzEzWJZv6IEVCVKyE= -github.com/odigos-io/runtime-detector v0.0.4/go.mod h1:m8GfdG6pET0K/8aoZwnX+MkYz8oVroKs8HzRnkuJWt4= +github.com/odigos-io/runtime-detector v0.0.5 h1:CojYfZpYFvub7uVQCAgwryAird5OH/RCTpAo9+bNaP8= +github.com/odigos-io/runtime-detector v0.0.5/go.mod h1:m8GfdG6pET0K/8aoZwnX+MkYz8oVroKs8HzRnkuJWt4= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/odiglet/pkg/detector/detector.go b/odiglet/pkg/detector/detector.go index 4646b902a..cce0b17a6 100644 --- a/odiglet/pkg/detector/detector.go +++ b/odiglet/pkg/detector/detector.go @@ -17,6 +17,7 @@ func K8sDetectorOptions(logger logr.Logger) []detector.DetectorOption { detector.WithLogger(sLogger), detector.WithEnvironments(relevantEnvVars()...), detector.WithEnvPrefixFilter(consts.OdigosEnvVarPodName), + detector.WithExePathsToFilter("/usr/bin/bash", "/bin/bash", "/bin/sh", "/usr/bin/sh", "/bin/busybox", "/usr/bin/dash"), } return opts