Code

Merge main and resolve conflicts#2939

Code

Draft

ichinaski wants to merge 15 commits intomainDataDog/dd-trace-go:mainfrom ichinaski/css-mergemainDataDog/dd-trace-go:ichinaski/css-mergemainCopy head branch name to clipboard

+16,924-6,523

Commits

Commits on Aug 13, 2024

• initial support for agent SpanConcentrator wip

  ajgajg1134

  committed
  dc418a5

Commits on Aug 14, 2024

• Add fallback env for stats to avoid panic

  ajgajg1134

  committed
  63bf1de

• go mod tidy

  ajgajg1134

  committed
  cd72859

• add testEnv for tests asserting on logs, in real usage there will be an agent env

  ajgajg1134

  committed
  b81bc9c

• bump k8s client go to match k8s api version

  ajgajg1134

  committed
  e187e48

• add some temp logs

  ajgajg1134

  committed
  704acc7

• more logs

  ajgajg1134

  committed
  21aa1ce

Commits on Aug 15, 2024

• bump to dev version of agent to fix parametric tests (temporary)

  ajgajg1134

  committed
  e3796bd

• Clone net http request to avoid race

  ajgajg1134

  committed
  cfe668d

• stats need accurate origin for synthetics

  ajgajg1134

  committed
  c64efa3

• Bump google.golang.org/api to newer version to avoid downgrade of dd-agent

  Show description for 0520899
  ajgajg1134

  committed
  0520899

Commits on Aug 16, 2024

• bump go minimum version to 1.22

  ajgajg1134

  committed
  a279fd2

• Merge branch 'main' into andrew.glaude/spanConcentrator2

  ajgajg1134

  authored
  8d6425e

Commits on Aug 19, 2024

• Merge branch 'main' into andrew.glaude/spanConcentrator2

  ajgajg1134

  committed
  04aa447

Commits on Oct 22, 2024

• Merge main and resolve conflicts

  ichinaski

  committed
  a3b987d