From 8ad0072709639c8fa4fa2237e6c6fe6a3b4f62c7 Mon Sep 17 00:00:00 2001 From: Ahmed Mezghani Date: Wed, 9 Aug 2023 10:37:52 +0200 Subject: [PATCH 1/2] tests/parametric: align Go with client-stats spec --- tests/parametric/test_library_tracestats.py | 3 +-- utils/build/docker/golang/parametric/go.mod | 2 +- utils/build/docker/golang/parametric/go.sum | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/parametric/test_library_tracestats.py b/tests/parametric/test_library_tracestats.py index c1d4b252062..c4df478c3cc 100644 --- a/tests/parametric/test_library_tracestats.py +++ b/tests/parametric/test_library_tracestats.py @@ -26,8 +26,7 @@ def _human_stats(stats: V06StatsAggr) -> str: def enable_tracestats(sample_rate: Optional[float] = None) -> Any: env = { - "DD_TRACE_STATS_COMPUTATION_ENABLED": "1", # reference, dotnet, python - "DD_TRACE_FEATURES": "discovery", # golang + "DD_TRACE_STATS_COMPUTATION_ENABLED": "1", # reference, dotnet, python, golang "DD_TRACE_TRACER_METRICS_ENABLED": "true", # java } if sample_rate is not None: diff --git a/utils/build/docker/golang/parametric/go.mod b/utils/build/docker/golang/parametric/go.mod index cc1cd22654c..a99ab902ec5 100644 --- a/utils/build/docker/golang/parametric/go.mod +++ b/utils/build/docker/golang/parametric/go.mod @@ -7,7 +7,7 @@ require ( go.opentelemetry.io/otel/trace v1.16.0 google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 - gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230801190547-5ebe300ac718 + gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230808142237-30bfd5205d6a ) require ( diff --git a/utils/build/docker/golang/parametric/go.sum b/utils/build/docker/golang/parametric/go.sum index 5f733dd55f2..d1ba3ee5d72 100644 --- a/utils/build/docker/golang/parametric/go.sum +++ b/utils/build/docker/golang/parametric/go.sum @@ -169,8 +169,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230801190547-5ebe300ac718 h1:lurfzON3rJTalJlBfnsWR1aDsFGNoGgIbKAvrrP3GNI= -gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230801190547-5ebe300ac718/go.mod h1:9l+gJVds2iYls2ySSNNPm842vz2clDn4eRL2uoabz2U= +gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230808142237-30bfd5205d6a h1:RMV0bJU3f8/g33nmxJrHiC+l9jxOWFvU1klZSI6TiE4= +gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230808142237-30bfd5205d6a/go.mod h1:1JqaWiPl1+vHNYuVNmHOG4HDyHbF84z98BW/hwq8FeU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 80f3c7002b1cbf292282fbc6e07e91a35d487179 Mon Sep 17 00:00:00 2001 From: Ahmed Mezghani Date: Thu, 10 Aug 2023 12:30:25 +0200 Subject: [PATCH 2/2] depend on the go tracer version and leverage #1442 --- tests/parametric/test_library_tracestats.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/parametric/test_library_tracestats.py b/tests/parametric/test_library_tracestats.py index c4df478c3cc..64bd7029ddf 100644 --- a/tests/parametric/test_library_tracestats.py +++ b/tests/parametric/test_library_tracestats.py @@ -29,6 +29,8 @@ def enable_tracestats(sample_rate: Optional[float] = None) -> Any: "DD_TRACE_STATS_COMPUTATION_ENABLED": "1", # reference, dotnet, python, golang "DD_TRACE_TRACER_METRICS_ENABLED": "true", # java } + if context.library == "golang" and context.library.version < "v1.55.0": + env["DD_TRACE_FEATURES"] = "discovery" if sample_rate is not None: assert 0 <= sample_rate <= 1.0 env.update(