Merge branch 'main' into rarguelloF/AIDM-461/support-sarama-consumer-…

…group

.github/workflows/apps/go.mod

@@ -0,0 +1,16 @@
+module github.com/DataDog/dd-trace-go/.github/workflows/apps
+
+go 1.23.3
+
+require (
+	github.com/Masterminds/semver/v3 v3.3.1
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/mod v0.22.0
+	gopkg.in/DataDog/dd-trace-go.v1 v1.70.1
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

.github/workflows/apps/go.sum

@@ -0,0 +1,16 @@
+github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
+github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+gopkg.in/DataDog/dd-trace-go.v1 v1.70.1 h1:ZIRxAKlr3xr6xbMUDs3IDa6xq+ISv9zxyjaDCfwDjMY=
+gopkg.in/DataDog/dd-trace-go.v1 v1.70.1/go.mod h1:PMOSkeY4VfXiuPvGodeNLCZCFYU2VfOvjVI6cX5bGrc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

.github/workflows/apps/latest_major_version.go

@@ -1,7 +1,7 @@
 // Unless explicitly stated otherwise all files in this repository are licensed
 // under the Apache License Version 2.0.
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
-// Copyright 2016 Datadog, Inc.
+// Copyright 2024 Datadog, Inc.
 
 package main
 

.github/workflows/appsec.yml

@@ -19,6 +19,9 @@ on:
   merge_group:
   push:
     branches: release-v*
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
 
 env:
   DD_APPSEC_WAF_TIMEOUT: 1m

.github/workflows/codeql-analysis.yml

@@ -9,6 +9,9 @@ on:
         type: string
   push:
     branches: [ main, master ]
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]

.github/workflows/govulncheck.yml

@@ -9,7 +9,10 @@ on:
   push:
     branches:
       - main
-      - release-v*
+      - release-v*  
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
   schedule:
     - cron: '00 00 * * *'
   workflow_dispatch:

.github/workflows/main-branch-tests.yml

@@ -11,8 +11,9 @@ on:
     branches:
       - main
       - release-v*
-    tags:
-      - "**"
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
 
 concurrency:
   group: ${{ github.ref }}

.github/workflows/orchestrion.yml

@@ -6,6 +6,9 @@ on:
   push:
     branches:
       - release-v*
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
 
 permissions: read-all
 

.github/workflows/parametric-tests.yml

@@ -11,8 +11,9 @@ on:
     branches:
       - main
       - release-v*
-    tags:
-      - "**"
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
   pull_request:
     branches:
       - "**"

.github/workflows/pull-request.yml

@@ -8,6 +8,9 @@ on:
   push:
     branches:
       - 'mq-working-branch-**'
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
 
 concurrency:
   group: ${{ github.ref }}

.github/workflows/smoke-tests.yml

@@ -15,8 +15,9 @@ on:
     branches:
       - main
       - release-v*
-    tags:
-      - '**'
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
   schedule: # nightly
     - cron: "0 0 * * *"
   workflow_dispatch: {} # manually

.github/workflows/system-tests.yml

@@ -11,8 +11,9 @@ on:
     branches:
       - main
       - release-v*
-    tags:
-      - "**"
+    tags-ignore:
+      - 'contrib/**'
+      - 'instrumentation/**'
   pull_request:
     branches:
       - "**"

contrib/99designs/gqlgen/tracer.go

@@ -103,7 +103,7 @@ func (t *gqlTracer) Validate(_ graphql.ExecutableSchema) error {
 func (t *gqlTracer) InterceptOperation(ctx context.Context, next graphql.OperationHandler) graphql.ResponseHandler {
 	opCtx := graphql.GetOperationContext(ctx)
 	span, ctx := t.createRootSpan(ctx, opCtx)
-	ctx, req := graphqlsec.StartRequestOperation(ctx, graphqlsec.RequestOperationArgs{
+	ctx, req := graphqlsec.StartRequestOperation(ctx, span, graphqlsec.RequestOperationArgs{
 		RawQuery:      opCtx.RawQuery,
 		OperationName: opCtx.OperationName,
 		Variables:     opCtx.Variables,
@@ -137,7 +137,7 @@ func (t *gqlTracer) InterceptOperation(ctx context.Context, next graphql.Operati
 		}
 
 		query.Finish(executionOperationRes)
-		req.Finish(span, requestOperationRes)
+		req.Finish(requestOperationRes)
 		return response
 	}
 }

contrib/database/sql/option_test.go

@@ -69,7 +69,7 @@ func TestCheckStatsdRequired(t *testing.T) {
 		cfg := new(config)
 		cfg.dbStats = true
 		cfg.checkStatsdRequired()
-		_, ok := cfg.statsdClient.(*statsd.Client)
+		_, ok := cfg.statsdClient.(*statsd.ClientDirect)
 		assert.True(t, ok)
 	})
 	t.Run("invalid address", func(t *testing.T) {