Merge branch 'main' into munir/remove-16-zeros-w3c

DataDog · Aug 7, 2024 · 3221f07 · 3221f07
2 parents 4429347 + 6e9ec58
commit 3221f07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/orchestrion.yml b/.github/workflows/orchestrion.yml
@@ -17,6 +17,6 @@ concurrency:
 jobs:
  test:
  name: 'Run Tests'
- uses: DataDog/orchestrion/.github/workflows/workflow_call.yml@eliott.bouhana/smoke-tests
+ uses: DataDog/orchestrion/.github/workflows/workflow_call.yml@main # we don't want to pin our own action
  with:
  dd-trace-go-ref: ${{ github.sha }}
diff --git a/ddtrace/tracer/option.go b/ddtrace/tracer/option.go
@@ -98,6 +98,7 @@ var contribIntegrations = map[string]struct {
  "github.com/valyala/fasthttp": {"FastHTTP", false},
  "github.com/zenazn/goji": {"Goji", false},
  "log/slog": {"log/slog", false},
+ "github.com/uptrace/bun": {"Bun", false},
 }
 
 var (

diff --git a/ddtrace/tracer/option_test.go b/ddtrace/tracer/option_test.go
@@ -258,7 +258,7 @@ func TestAgentIntegration(t *testing.T) {
  defer clearIntegrationsForTests()
 
  cfg.loadContribIntegrations(nil)
- assert.Equal(t, 56, len(cfg.integrations))
+ assert.Equal(t, 57, len(cfg.integrations))
  for integrationName, v := range cfg.integrations {
  assert.False(t, v.Instrumented, "integrationName=%s", integrationName)
  }