v2: merge main into v2 again

.github/workflows/smoke-tests.yml

@@ -37,7 +37,7 @@ jobs:
     #  Related to issue https://github.com/DataDog/dd-trace-go/issues/1607
     name: 'go get -u smoke test'
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'DataDog' # only run on DataDog's repository, not in forks
+    if: github.repository_owner == 'DataDog' && github.ref_type == 'tag' && contains(github.ref_name, 'v2.0.0-beta.3') # only run on DataDog's repository, not in forks
     env:
       PACKAGES: ./internal/... ./ddtrace/... ./profiler/... ./appsec/...
     steps:

.github/workflows/system-tests.yml

@@ -12,7 +12,7 @@ on:
       - main
       - release-v*
     tags:
-      - "**"
+      - "v2.0.0-beta.3"
   pull_request:
     branches:
       - "**"

.github/workflows/unit-integration-tests.yml

@@ -180,20 +180,24 @@ jobs:
         image: memcached:1.5.9
         ports:
           - 11211:11211
-      zookeeper:
-        image: bitnami/zookeeper:latest
-        env:
-          ALLOW_ANONYMOUS_LOGIN: "yes"
-        ports:
-          - 2181:2181
       kafka:
-        image: darccio/kafka:2.13-2.8.1
+        image: confluentinc/confluent-local:7.5.0
         env:
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-          KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
-          KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
-          KAFKA_CREATE_TOPICS: gotest:1:1,gosegtest:1:1
-          KAFKA_BROKER_ID: 1
+          KAFKA_LISTENERS: "PLAINTEXT://0.0.0.0:9093,BROKER://0.0.0.0:9092,CONTROLLER://0.0.0.0:9094"
+          KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:9093,BROKER://localhost:9092"
+          KAFKA_REST_BOOTSTRAP_SERVERS: "PLAINTEXT://0.0.0.0:9093,BROKER://0.0.0.0:9092"
+          KAFKA_CONTROLLER_QUORUM_VOTERS: "1@localhost:9094"
+          KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT"
+          KAFKA_INTER_BROKER_LISTENER_NAME: "BROKER"
+          KAFKA_BROKER_ID: "1"
+          KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: "1"
+          KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: "1"
+          KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: "1"
+          KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: "1"
+          KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: "0"
+          KAFKA_NODE_ID: "1"
+          KAFKA_PROCESS_ROLES: "broker,controller"
+          KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
         ports:
           - 9092:9092
       localstack:

contrib/99designs/gqlgen/appsec_test.go

@@ -106,7 +106,7 @@ func TestAppSec(t *testing.T) {
 
 				// The last finished span (which is GraphQL entry) should have the "_dd.appsec.enabled" tag.
 				span := spans[len(spans)-1]
-				require.Equal(t, 1, span.Tag("_dd.appsec.enabled"))
+				require.Equal(t, float64(1), span.Tag("_dd.appsec.enabled"))
 
 				type ddAppsecJSON struct {
 					Triggers []struct {

contrib/99designs/gqlgen/go.mod

@@ -2,11 +2,9 @@ module github.com/DataDog/dd-trace-go/contrib/99designs/gqlgen/v2
 
 go 1.22.0
 
-toolchain go1.23.1
-
 require (
 	github.com/99designs/gqlgen v0.17.36
-	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3
+	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3.0.20241024132757-00c300faaace
 	github.com/stretchr/testify v1.9.0
 	github.com/vektah/gqlparser/v2 v2.5.16
 )

contrib/99designs/gqlgen/tracer_test.go

@@ -260,7 +260,7 @@ func TestInterceptOperation(t *testing.T) {
 		assertions.ElementsMatch(resNames, []string{readOp, parsingOp, validationOp, `mutation Name { name }`})
 		assertions.ElementsMatch(opNames, []string{readOp, parsingOp, validationOp, "graphql.mutation"})
 		assertions.NotNil(root)
-		assertions.NotNil(root.Tag(ext.Error))
+		assertions.NotNil(root.Tag(ext.ErrorMsg))
 	})
 
 	t.Run("intercept operation with graphQL Subscription", func(t *testing.T) {

contrib/IBM/sarama/go.mod

@@ -2,10 +2,8 @@ module github.com/DataDog/dd-trace-go/contrib/IBM/sarama/v2
 
 go 1.22.0
 
-toolchain go1.23.1
-
 require (
-	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3
+	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3.0.20241024132757-00c300faaace
 	github.com/IBM/sarama v1.40.0
 	github.com/stretchr/testify v1.9.0
 )

contrib/Shopify/sarama/go.mod

@@ -2,10 +2,8 @@ module github.com/DataDog/dd-trace-go/contrib/Shopify/sarama/v2
 
 go 1.22.0
 
-toolchain go1.23.1
-
 require (
-	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3
+	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3.0.20241024132757-00c300faaace
 	github.com/Shopify/sarama v1.38.1
 	github.com/stretchr/testify v1.9.0
 )

contrib/aws/aws-sdk-go-v2/aws/aws.go

@@ -24,6 +24,9 @@ import (
 	"github.com/aws/smithy-go/middleware"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 
+	eventBridgeTracer "github.com/DataDog/dd-trace-go/v2/contrib/aws/eventbridge"
+	snsTracer "github.com/DataDog/dd-trace-go/v2/contrib/aws/sns"
+	sqsTracer "github.com/DataDog/dd-trace-go/v2/contrib/aws/sqs"
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/ext"
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
 	"github.com/DataDog/dd-trace-go/v2/instrumentation"
@@ -102,6 +105,16 @@ func (mw *traceMiddleware) startTraceMiddleware(stack *middleware.Stack) error {
 		}
 		span, spanctx := tracer.StartSpanFromContext(ctx, spanName(serviceID, operation), opts...)
 
+		// Inject trace context
+		switch serviceID {
+		case "SQS":
+			sqsTracer.EnrichOperation(span, in, operation)
+		case "SNS":
+			snsTracer.EnrichOperation(span, in, operation)
+		case "EventBridge":
+			eventBridgeTracer.EnrichOperation(span, in, operation)
+		}
+
 		// Handle initialize and continue through the middleware chain.
 		out, metadata, err = next.HandleInitialize(spanctx, in)
 		if err != nil && (mw.cfg.errCheck == nil || mw.cfg.errCheck(err)) {

contrib/aws/aws-sdk-go-v2/aws/aws_test.go

@@ -8,6 +8,7 @@ package aws
 import (
 	"context"
 	"encoding/base64"
+	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -19,6 +20,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	"github.com/aws/aws-sdk-go-v2/service/eventbridge"
+	eventBridgeTypes "github.com/aws/aws-sdk-go-v2/service/eventbridge/types"
 	"github.com/aws/aws-sdk-go-v2/service/kinesis"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/sfn"
@@ -254,6 +256,66 @@ func TestAppendMiddlewareSqsReceiveMessage(t *testing.T) {
 	}
 }
 
+func TestAppendMiddlewareSqsSendMessage(t *testing.T) {
+	mt := mocktracer.Start()
+	defer mt.Stop()
+
+	expectedStatusCode := 200
+	server := mockAWS(expectedStatusCode)
+	defer server.Close()
+
+	resolver := aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) {
+		return aws.Endpoint{
+			PartitionID:   "aws",
+			URL:           server.URL,
+			SigningRegion: "eu-west-1",
+		}, nil
+	})
+
+	awsCfg := aws.Config{
+		Region:           "eu-west-1",
+		Credentials:      aws.AnonymousCredentials{},
+		EndpointResolver: resolver,
+	}
+
+	AppendMiddleware(&awsCfg)
+
+	sqsClient := sqs.NewFromConfig(awsCfg)
+	sendMessageInput := &sqs.SendMessageInput{
+		MessageBody: aws.String("test message"),
+		QueueUrl:    aws.String("https://sqs.us-west-2.amazonaws.com/123456789012/MyQueueName"),
+	}
+	_, err := sqsClient.SendMessage(context.Background(), sendMessageInput)
+	require.NoError(t, err)
+
+	spans := mt.FinishedSpans()
+	require.Len(t, spans, 1)
+
+	s := spans[0]
+	assert.Equal(t, "SQS.request", s.OperationName())
+	assert.Equal(t, "SendMessage", s.Tag("aws.operation"))
+	assert.Equal(t, "SQS", s.Tag("aws.service"))
+	assert.Equal(t, "MyQueueName", s.Tag("queuename"))
+	assert.Equal(t, "SQS.SendMessage", s.Tag(ext.ResourceName))
+	assert.Equal(t, "aws.SQS", s.Tag(ext.ServiceName))
+
+	// Check for trace context injection
+	assert.NotNil(t, sendMessageInput.MessageAttributes)
+	assert.Contains(t, sendMessageInput.MessageAttributes, "_datadog")
+	ddAttr := sendMessageInput.MessageAttributes["_datadog"]
+	assert.Equal(t, "String", *ddAttr.DataType)
+	assert.NotEmpty(t, *ddAttr.StringValue)
+
+	// Decode and verify the injected trace context
+	var traceContext map[string]string
+	err = json.Unmarshal([]byte(*ddAttr.StringValue), &traceContext)
+	assert.NoError(t, err)
+	assert.Contains(t, traceContext, "x-datadog-trace-id")
+	assert.Contains(t, traceContext, "x-datadog-parent-id")
+	assert.NotEmpty(t, traceContext["x-datadog-trace-id"])
+	assert.NotEmpty(t, traceContext["x-datadog-parent-id"])
+}
+
 func TestAppendMiddlewareS3ListObjects(t *testing.T) {
 	tests := []struct {
 		name               string
@@ -416,6 +478,22 @@ func TestAppendMiddlewareSnsPublish(t *testing.T) {
 			assert.Equal(t, server.URL+"/", s.Tag(ext.HTTPURL))
 			assert.Equal(t, "aws/aws-sdk-go-v2/aws", s.Tag(ext.Component))
 			assert.Equal(t, ext.SpanKindClient, s.Tag(ext.SpanKind))
+
+			// Check for trace context injection
+			assert.NotNil(t, tt.publishInput.MessageAttributes)
+			assert.Contains(t, tt.publishInput.MessageAttributes, "_datadog")
+			ddAttr := tt.publishInput.MessageAttributes["_datadog"]
+			assert.Equal(t, "Binary", *ddAttr.DataType)
+			assert.NotEmpty(t, ddAttr.BinaryValue)
+
+			// Decode and verify the injected trace context
+			var traceContext map[string]string
+			err := json.Unmarshal(ddAttr.BinaryValue, &traceContext)
+			assert.NoError(t, err)
+			assert.Contains(t, traceContext, "x-datadog-trace-id")
+			assert.Contains(t, traceContext, "x-datadog-parent-id")
+			assert.NotEmpty(t, traceContext["x-datadog-trace-id"])
+			assert.NotEmpty(t, traceContext["x-datadog-parent-id"])
 		})
 	}
 }
@@ -640,6 +718,62 @@ func TestAppendMiddlewareEventBridgePutRule(t *testing.T) {
 	}
 }
 
+func TestAppendMiddlewareEventBridgePutEvents(t *testing.T) {
+	mt := mocktracer.Start()
+	defer mt.Stop()
+
+	expectedStatusCode := 200
+	server := mockAWS(expectedStatusCode)
+	defer server.Close()
+
+	resolver := aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) {
+		return aws.Endpoint{
+			PartitionID:   "aws",
+			URL:           server.URL,
+			SigningRegion: "eu-west-1",
+		}, nil
+	})
+
+	awsCfg := aws.Config{
+		Region:           "eu-west-1",
+		Credentials:      aws.AnonymousCredentials{},
+		EndpointResolver: resolver,
+	}
+
+	AppendMiddleware(&awsCfg)
+
+	eventbridgeClient := eventbridge.NewFromConfig(awsCfg)
+	putEventsInput := &eventbridge.PutEventsInput{
+		Entries: []eventBridgeTypes.PutEventsRequestEntry{
+			{
+				EventBusName: aws.String("my-event-bus"),
+				Detail:       aws.String(`{"key": "value"}`),
+			},
+		},
+	}
+	eventbridgeClient.PutEvents(context.Background(), putEventsInput)
+
+	spans := mt.FinishedSpans()
+	require.Len(t, spans, 1)
+
+	s := spans[0]
+	assert.Equal(t, "PutEvents", s.Tag("aws.operation"))
+	assert.Equal(t, "EventBridge.PutEvents", s.Tag(ext.ResourceName))
+
+	// Check for trace context injection
+	assert.Len(t, putEventsInput.Entries, 1)
+	entry := putEventsInput.Entries[0]
+	var detail map[string]interface{}
+	err := json.Unmarshal([]byte(*entry.Detail), &detail)
+	assert.NoError(t, err)
+	assert.Contains(t, detail, "_datadog")
+	ddData, ok := detail["_datadog"].(map[string]interface{})
+	assert.True(t, ok)
+	assert.Contains(t, ddData, "x-datadog-start-time")
+	assert.Contains(t, ddData, "x-datadog-resource-name")
+	assert.Equal(t, "my-event-bus", ddData["x-datadog-resource-name"])
+}
+
 func TestAppendMiddlewareSfnDescribeStateMachine(t *testing.T) {
 	tests := []struct {
 		name               string

contrib/aws/aws-sdk-go-v2/go.mod

@@ -2,21 +2,19 @@ module github.com/DataDog/dd-trace-go/contrib/aws/aws-sdk-go-v2/v2
 
 go 1.22.0
 
-toolchain go1.23.1
-
 require (
-	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3
-	github.com/aws/aws-sdk-go-v2 v1.30.3
+	github.com/DataDog/dd-trace-go/v2 v2.0.0-beta.3.0.20241024132757-00c300faaace
+	github.com/aws/aws-sdk-go-v2 v1.32.2
 	github.com/aws/aws-sdk-go-v2/config v1.27.27
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.8
 	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.3
-	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.33.3
+	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.35.2
 	github.com/aws/aws-sdk-go-v2/service/kinesis v1.29.3
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
 	github.com/aws/aws-sdk-go-v2/service/sfn v1.29.3
-	github.com/aws/aws-sdk-go-v2/service/sns v1.31.3
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.34.3
-	github.com/aws/smithy-go v1.20.3
+	github.com/aws/aws-sdk-go-v2/service/sns v1.33.2
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2
+	github.com/aws/smithy-go v1.22.0
 	github.com/stretchr/testify v1.9.0
 )
 
@@ -32,10 +30,10 @@ require (
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.16 // indirect