[CONTINT-4412] Upgrade k8s dependencies

.copyright-overrides.yml

@@ -376,3 +376,5 @@ github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/grpc_gcp: Copyright 2024 gRPC
 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/multiendpoint: Copyright 2024 gRPC authors.
 
 github.com/NVIDIA/go-nvml/*: Copyright 2023 NVIDIA CORPORATION
+
+github.com/jonboulle/clockwork: Copyright 2014 Nell Boulle

.gitlab/integration_test/otel.yml

@@ -23,7 +23,7 @@ integration_tests_otel:
     - when: always
 
 
-docker_image_build_otel:  
+docker_image_build_otel:
   stage: integration_test
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   needs: ["go_deps","integration_tests_otel"]
@@ -37,12 +37,12 @@ docker_image_build_otel:
     - wget https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O
       /usr/bin/yq && chmod +x /usr/bin/yq
     - export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.otelcol_version)
-    - yq w -i /tmp/otel-ci/manifest.yaml "receivers[+] gomod" 
+    - yq w -i /tmp/otel-ci/manifest.yaml "receivers[+] gomod"
       "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver ${OTELCOL_VERSION}"
-    - yq w -i /tmp/otel-ci/manifest.yaml "processors[+] gomod" 
+    - yq w -i /tmp/otel-ci/manifest.yaml "processors[+] gomod"
       "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor ${OTELCOL_VERSION}"
   script:
-    - docker build -t agent-byoc:latest -f /tmp/otel-ci/Dockerfile.agent-otel /tmp/otel-ci
+    - docker build --build-arg AGENT_BRANCH=$CI_COMMIT_BRANCH --tag agent-byoc:latest -f /tmp/otel-ci/Dockerfile.agent-otel /tmp/otel-ci
     - OT_AGENT_IMAGE_NAME=agent-byoc OT_AGENT_TAG=latest python3 /tmp/otel-ci/otel_agent_build_tests.py
   rules:
     - if: $CI_PIPELINE_SOURCE =~ /^schedule.*$/

Dockerfiles/agent-ot/Dockerfile.agent-otel

@@ -26,7 +26,7 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 # TEMP: Use github source code
-RUN git clone --depth 1 -b "${AGENT_BRANCH}" --single-branch https://github.com/DataDog/datadog-agent.git datadog-agent-${AGENT_VERSION}
+RUN git clone --filter=blob:none --branch "${AGENT_BRANCH}" --single-branch https://github.com/DataDog/datadog-agent.git datadog-agent-${AGENT_VERSION}
 
 # Once we have stable releases, we can use the following code to download the source code
 # TODO: use released agent version once we have an agent release with the otel binary
@@ -67,7 +67,7 @@ RUN go version && \
 RUN python3 -m venv venv && \
     . venv/bin/activate && \
     pip install --upgrade pip && \
-    pip install -r tasks/requirements.txt
+    pip install -r requirements.txt
 
 # Copy the manifest file
 COPY manifest.yaml /workspace/datadog-agent-${AGENT_VERSION}/comp/otelcol/collector-contrib/impl/manifest.yaml
@@ -83,4 +83,3 @@ FROM datadog/agent:${AGENT_VERSION}
 ARG AGENT_VERSION
 # Copy the built OTel agent from the builder stage
 COPY --from=builder /workspace/datadog-agent-${AGENT_VERSION}/bin/otel-agent/otel-agent /opt/datadog-agent/embedded/bin/otel-agent
-

cmd/cluster-agent/custommetrics/server.go

@@ -79,7 +79,7 @@ func RunServer(ctx context.Context, apiCl *as.APIClient, datadogCl optional.Opti
 		return err
 	}
 	// TODO Add extra logic to only tear down the External Metrics Server if only some components fail.
-	return server.GenericAPIServer.PrepareRun().Run(ctx.Done())
+	return server.GenericAPIServer.PrepareRun().RunWithContext(ctx)
 }
 
 func (a *DatadogMetricsAdapter) makeProviderOrDie(ctx context.Context, apiCl *as.APIClient, datadogCl optional.Option[datadogclient.Component]) (provider.ExternalMetricsProvider, error) {

cmd/otel-agent/config/agent_config.go

@@ -17,7 +17,6 @@ import (
 	pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model"
 	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
 	"go.opentelemetry.io/collector/confmap"
-	"go.opentelemetry.io/collector/confmap/converter/expandconverter"
 	"go.opentelemetry.io/collector/confmap/provider/envprovider"
 	"go.opentelemetry.io/collector/confmap/provider/fileprovider"
 	"go.opentelemetry.io/collector/confmap/provider/httpprovider"
@@ -78,7 +77,6 @@ func NewConfigComponent(ctx context.Context, ddCfg string, uris []string) (confi
 			httpprovider.NewFactory(),
 			httpsprovider.NewFactory(),
 		},
-		ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()},
 	}
 
 	resolver, err := confmap.NewResolver(rs)

cmd/serverless/dependencies_linux_amd64.txt

@@ -451,7 +451,6 @@ github.com/gogo/protobuf/proto
 github.com/gogo/protobuf/protoc-gen-gogo/descriptor
 github.com/gogo/protobuf/sortkeys
 github.com/gogo/protobuf/types
-github.com/golang/groupcache/lru
 github.com/golang/mock/gomock
 github.com/golang/protobuf/proto
 github.com/golang/snappy
@@ -506,6 +505,7 @@ github.com/mostynb/go-grpc-compression/internal/snappy
 github.com/mostynb/go-grpc-compression/internal/zstd
 github.com/mostynb/go-grpc-compression/nonclobbering/snappy
 github.com/mostynb/go-grpc-compression/nonclobbering/zstd
+github.com/munnerz/goautoneg
 github.com/olekukonko/tablewriter
 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry
 github.com/opencontainers/go-digest
@@ -519,12 +519,14 @@ github.com/patrickmn/go-cache
 github.com/pelletier/go-toml
 github.com/philhofer/fwd
 github.com/pkg/errors
+github.com/pmezard/go-difflib/difflib
+github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil
+github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil/header
 github.com/prometheus/client_golang/prometheus
 github.com/prometheus/client_golang/prometheus/internal
 github.com/prometheus/client_golang/prometheus/promhttp
 github.com/prometheus/client_model/go
 github.com/prometheus/common/expfmt
-github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
 github.com/prometheus/common/model
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
@@ -558,20 +560,16 @@ github.com/spf13/cobra
 github.com/spf13/jwalterweatherman
 github.com/spf13/pflag
 github.com/stormcat24/protodep/pkg/logger
+github.com/stretchr/testify/assert
+github.com/stretchr/testify/require
 github.com/tinylib/msgp/msgp
 github.com/tklauser/go-sysconf
 github.com/tklauser/numcpus
 github.com/twmb/murmur3
-go.opencensus.io
-go.opencensus.io/internal
-go.opencensus.io/metric/metricdata
-go.opencensus.io/metric/metricproducer
-go.opencensus.io/resource
-go.opencensus.io/trace
-go.opencensus.io/trace/internal
-go.opencensus.io/trace/tracestate
 go.opentelemetry.io/collector/client
 go.opentelemetry.io/collector/component
+go.opentelemetry.io/collector/component/componentprofiles
+go.opentelemetry.io/collector/component/componentstatus
 go.opentelemetry.io/collector/component/componenttest
 go.opentelemetry.io/collector/config/configauth
 go.opentelemetry.io/collector/config/configcompression
@@ -584,19 +582,28 @@ go.opentelemetry.io/collector/config/configtelemetry
 go.opentelemetry.io/collector/config/configtls
 go.opentelemetry.io/collector/config/internal
 go.opentelemetry.io/collector/confmap
-go.opentelemetry.io/collector/confmap/internal
 go.opentelemetry.io/collector/confmap/internal/mapstructure
 go.opentelemetry.io/collector/connector
+go.opentelemetry.io/collector/connector/connectorprofiles
+go.opentelemetry.io/collector/connector/connectortest
+go.opentelemetry.io/collector/connector/internal
 go.opentelemetry.io/collector/consumer
 go.opentelemetry.io/collector/consumer/consumererror
+go.opentelemetry.io/collector/consumer/consumerprofiles
+go.opentelemetry.io/collector/consumer/consumertest
+go.opentelemetry.io/collector/consumer/internal
 go.opentelemetry.io/collector/exporter
 go.opentelemetry.io/collector/exporter/debugexporter
 go.opentelemetry.io/collector/exporter/debugexporter/internal/metadata
 go.opentelemetry.io/collector/exporter/debugexporter/internal/normal
 go.opentelemetry.io/collector/exporter/exporterbatcher
 go.opentelemetry.io/collector/exporter/exporterhelper
+go.opentelemetry.io/collector/exporter/exporterhelper/internal
 go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata
+go.opentelemetry.io/collector/exporter/exporterprofiles
 go.opentelemetry.io/collector/exporter/exporterqueue
+go.opentelemetry.io/collector/exporter/exportertest
+go.opentelemetry.io/collector/exporter/internal
 go.opentelemetry.io/collector/exporter/internal/experr
 go.opentelemetry.io/collector/exporter/internal/otlptext
 go.opentelemetry.io/collector/exporter/internal/queue
@@ -605,13 +612,13 @@ go.opentelemetry.io/collector/exporter/otlpexporter/internal/metadata
 go.opentelemetry.io/collector/extension
 go.opentelemetry.io/collector/extension/auth
 go.opentelemetry.io/collector/extension/experimental/storage
+go.opentelemetry.io/collector/extension/extensioncapabilities
+go.opentelemetry.io/collector/extension/extensiontest
 go.opentelemetry.io/collector/featuregate
 go.opentelemetry.io/collector/internal/fanoutconsumer
-go.opentelemetry.io/collector/internal/featuregates
+go.opentelemetry.io/collector/internal/globalgates
+go.opentelemetry.io/collector/internal/globalsignal
 go.opentelemetry.io/collector/internal/httphelper
-go.opentelemetry.io/collector/internal/localhostgate
-go.opentelemetry.io/collector/internal/obsreportconfig
-go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics
 go.opentelemetry.io/collector/internal/sharedcomponent
 go.opentelemetry.io/collector/otelcol
 go.opentelemetry.io/collector/otelcol/internal/configunmarshaler
@@ -635,40 +642,51 @@ go.opentelemetry.io/collector/pdata/plog
 go.opentelemetry.io/collector/pdata/plog/plogotlp
 go.opentelemetry.io/collector/pdata/pmetric
 go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp
+go.opentelemetry.io/collector/pdata/pprofile
+go.opentelemetry.io/collector/pdata/pprofile/pprofileotlp
 go.opentelemetry.io/collector/pdata/ptrace
 go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp
+go.opentelemetry.io/collector/pdata/testdata
+go.opentelemetry.io/collector/pipeline
 go.opentelemetry.io/collector/processor
 go.opentelemetry.io/collector/processor/batchprocessor
 go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata
+go.opentelemetry.io/collector/processor/internal
 go.opentelemetry.io/collector/processor/processorhelper
 go.opentelemetry.io/collector/processor/processorhelper/internal/metadata
+go.opentelemetry.io/collector/processor/processorprofiles
+go.opentelemetry.io/collector/processor/processortest
 go.opentelemetry.io/collector/receiver
+go.opentelemetry.io/collector/receiver/internal
 go.opentelemetry.io/collector/receiver/otlpreceiver
 go.opentelemetry.io/collector/receiver/otlpreceiver/internal/errors
 go.opentelemetry.io/collector/receiver/otlpreceiver/internal/logs
 go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metadata
 go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metrics
+go.opentelemetry.io/collector/receiver/otlpreceiver/internal/profiles
 go.opentelemetry.io/collector/receiver/otlpreceiver/internal/trace
 go.opentelemetry.io/collector/receiver/receiverhelper
 go.opentelemetry.io/collector/receiver/receiverhelper/internal/metadata
+go.opentelemetry.io/collector/receiver/receiverprofiles
+go.opentelemetry.io/collector/receiver/receivertest
 go.opentelemetry.io/collector/semconv/v1.17.0
 go.opentelemetry.io/collector/semconv/v1.18.0
 go.opentelemetry.io/collector/semconv/v1.21.0
 go.opentelemetry.io/collector/semconv/v1.6.1
 go.opentelemetry.io/collector/service
 go.opentelemetry.io/collector/service/extensions
+go.opentelemetry.io/collector/service/internal/builders
 go.opentelemetry.io/collector/service/internal/capabilityconsumer
 go.opentelemetry.io/collector/service/internal/components
 go.opentelemetry.io/collector/service/internal/graph
 go.opentelemetry.io/collector/service/internal/metadata
 go.opentelemetry.io/collector/service/internal/proctelemetry
 go.opentelemetry.io/collector/service/internal/resource
-go.opentelemetry.io/collector/service/internal/servicetelemetry
 go.opentelemetry.io/collector/service/internal/status
 go.opentelemetry.io/collector/service/internal/zpages
 go.opentelemetry.io/collector/service/pipelines
 go.opentelemetry.io/collector/service/telemetry
-go.opentelemetry.io/collector/service/telemetry/internal
+go.opentelemetry.io/collector/service/telemetry/internal/otelinit
 go.opentelemetry.io/contrib/config
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
@@ -680,12 +698,10 @@ go.opentelemetry.io/contrib/propagators/b3
 go.opentelemetry.io/otel
 go.opentelemetry.io/otel/attribute
 go.opentelemetry.io/otel/baggage
-go.opentelemetry.io/otel/bridge/opencensus
-go.opentelemetry.io/otel/bridge/opencensus/internal
-go.opentelemetry.io/otel/bridge/opencensus/internal/oc2otel
-go.opentelemetry.io/otel/bridge/opencensus/internal/ocmetric
-go.opentelemetry.io/otel/bridge/opencensus/internal/otel2oc
 go.opentelemetry.io/otel/codes
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp/internal/retry
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp/internal/transform
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/envconfig
@@ -711,12 +727,16 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/envconf
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/retry
 go.opentelemetry.io/otel/exporters/prometheus
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace
 go.opentelemetry.io/otel/internal
 go.opentelemetry.io/otel/internal/attribute
 go.opentelemetry.io/otel/internal/baggage
 go.opentelemetry.io/otel/internal/global
+go.opentelemetry.io/otel/log
+go.opentelemetry.io/otel/log/embedded
+go.opentelemetry.io/otel/log/noop
 go.opentelemetry.io/otel/metric
 go.opentelemetry.io/otel/metric/embedded
 go.opentelemetry.io/otel/metric/noop
@@ -725,25 +745,30 @@ go.opentelemetry.io/otel/sdk
 go.opentelemetry.io/otel/sdk/instrumentation
 go.opentelemetry.io/otel/sdk/internal/env
 go.opentelemetry.io/otel/sdk/internal/x
+go.opentelemetry.io/otel/sdk/log
+go.opentelemetry.io/otel/sdk/log/internal/x
 go.opentelemetry.io/otel/sdk/metric
+go.opentelemetry.io/otel/sdk/metric/exemplar
 go.opentelemetry.io/otel/sdk/metric/internal
 go.opentelemetry.io/otel/sdk/metric/internal/aggregate
-go.opentelemetry.io/otel/sdk/metric/internal/exemplar
 go.opentelemetry.io/otel/sdk/metric/internal/x
 go.opentelemetry.io/otel/sdk/metric/metricdata
 go.opentelemetry.io/otel/sdk/resource
 go.opentelemetry.io/otel/sdk/trace
 go.opentelemetry.io/otel/sdk/trace/tracetest
+go.opentelemetry.io/otel/semconv/internal
 go.opentelemetry.io/otel/semconv/v1.17.0
 go.opentelemetry.io/otel/semconv/v1.20.0
-go.opentelemetry.io/otel/semconv/v1.25.0
 go.opentelemetry.io/otel/semconv/v1.26.0
+go.opentelemetry.io/otel/semconv/v1.4.0
 go.opentelemetry.io/otel/trace
 go.opentelemetry.io/otel/trace/embedded
 go.opentelemetry.io/otel/trace/noop
+go.opentelemetry.io/proto/otlp/collector/logs/v1
 go.opentelemetry.io/proto/otlp/collector/metrics/v1
 go.opentelemetry.io/proto/otlp/collector/trace/v1
 go.opentelemetry.io/proto/otlp/common/v1
+go.opentelemetry.io/proto/otlp/logs/v1
 go.opentelemetry.io/proto/otlp/metrics/v1
 go.opentelemetry.io/proto/otlp/resource/v1
 go.opentelemetry.io/proto/otlp/trace/v1
@@ -821,7 +846,6 @@ gonum.org/v1/gonum/floats
 gonum.org/v1/gonum/floats/scalar
 gonum.org/v1/gonum/graph
 gonum.org/v1/gonum/graph/internal/linear
-gonum.org/v1/gonum/graph/internal/ordered
 gonum.org/v1/gonum/graph/internal/set
 gonum.org/v1/gonum/graph/iterator
 gonum.org/v1/gonum/graph/set/uid
@@ -834,6 +858,7 @@ gonum.org/v1/gonum/internal/asm/f32
 gonum.org/v1/gonum/internal/asm/f64
 gonum.org/v1/gonum/internal/cmplx64
 gonum.org/v1/gonum/internal/math32
+gonum.org/v1/gonum/internal/order
 gonum.org/v1/gonum/lapack
 gonum.org/v1/gonum/lapack/gonum
 gonum.org/v1/gonum/lapack/lapack64