Skip to content

Commit

Permalink
bump gopkg.in/DataDog/dd-trace-go.v1 to v1.61.0 (#23623)
Browse files Browse the repository at this point in the history 
Co-authored-by: purple4reina <rey.abolofia@datadoghq.com>
  • Loading branch information
@paulcacheux @purple4reina
paulcacheux and purple4reina committed Mar 13, 2024
1 parent e5af1ba commit 4bb6481
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 39 deletions.
8 changes: 4 additions & 4 deletions LICENSE-3rdparty.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ core,github.com/DataDog/ebpf-manager/tracefs,MIT,Copyright (c) 2021 Authors of D
core,github.com/DataDog/extendeddaemonset/api/v1alpha1,Apache-2.0,"Copyright 2016-2020 Datadog, Inc"
core,github.com/DataDog/go-libddwaf/v2,Apache-2.0,"Copyright 2016-present Datadog, Inc"
core,github.com/DataDog/go-libddwaf/v2/internal/lib,Apache-2.0,"Copyright 2016-present Datadog, Inc"
core,github.com/DataDog/go-libddwaf/v2/internal/log,Apache-2.0,"Copyright 2016-present Datadog, Inc"
core,github.com/DataDog/go-libddwaf/v2/internal/noopfree,Apache-2.0,"Copyright 2016-present Datadog, Inc"
core,github.com/DataDog/go-sqllexer,MIT,"Copyright (c) 2023 Datadog, Inc"
core,github.com/DataDog/go-tuf/client,BSD-3-Clause,"Copyright (c) 2014-2020 Prime Directive, Inc. All rights reserved"
Expand Down Expand Up @@ -2479,11 +2480,10 @@ core,gopkg.in/DataDog/dd-trace-go.v1/ddtrace/internal,Apache-2.0,"Copyright 2016
core,gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/config,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo/instrumentation,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo/instrumentation/grpcsec,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo/instrumentation/httpsec,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo/instrumentation/sharedsec,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/emitter/sharedsec,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/listener,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/datastreams,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
core,gopkg.in/DataDog/dd-trace-go.v1/internal/hostname,Apache-2.0,"Copyright 2016-Present Datadog, Inc."
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ require (
google.golang.org/grpc v1.61.0
google.golang.org/grpc/examples v0.0.0-20221020162917-9127159caf5a
google.golang.org/protobuf v1.32.0
gopkg.in/DataDog/dd-trace-go.v1 v1.58.0
gopkg.in/DataDog/dd-trace-go.v1 v1.61.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
Expand Down Expand Up @@ -668,7 +668,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/uuid v0.52.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/winutil v0.52.0-rc.3
github.com/DataDog/datadog-agent/pkg/version v0.52.0-rc.3
github.com/DataDog/go-libddwaf/v2 v2.2.2
github.com/DataDog/go-libddwaf/v2 v2.3.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.3
github.com/Datadog/dublin-traceroute v0.0.1
github.com/aquasecurity/trivy v0.49.2-0.20240212231818-6a2ed8bdfe76
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions pkg/serverless/trace/propagation/extractor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func TestNilPropagator(t *testing.T) {
tc, err := extractor.Extract([]byte(`{"headers":` + headersAll + `}`))
t.Logf("Extract returned TraceContext=%#v error=%#v", tc, err)
assert.Nil(t, err)
assert.Equal(t, w3cTraceContext, tc)
assert.Equal(t, ddTraceContext, tc)
}

func TestExtractorExtract(t *testing.T) {
Expand Down Expand Up @@ -211,7 +211,7 @@ func TestExtractorExtract(t *testing.T) {
events: []interface{}{
[]byte(`{"headers":` + headersAll + `}`),
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand Down Expand Up @@ -277,15 +277,15 @@ func TestExtractorExtract(t *testing.T) {
events: []interface{}{
eventSqsMessage(headersAll, headersNone, headersNone),
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},
{
name: "extract-from-snssqs",
events: []interface{}{
eventSqsMessage(headersNone, headersAll, headersNone),
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},
{
Expand Down Expand Up @@ -391,7 +391,7 @@ func TestExtractorExtract(t *testing.T) {
},
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},
{
Expand All @@ -403,7 +403,7 @@ func TestExtractorExtract(t *testing.T) {
},
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -415,7 +415,7 @@ func TestExtractorExtract(t *testing.T) {
Headers: headersMapAll,
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -427,7 +427,7 @@ func TestExtractorExtract(t *testing.T) {
Headers: headersMapAll,
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -439,7 +439,7 @@ func TestExtractorExtract(t *testing.T) {
Headers: headersMapAll,
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -451,7 +451,7 @@ func TestExtractorExtract(t *testing.T) {
Headers: headersMapAll,
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -463,7 +463,7 @@ func TestExtractorExtract(t *testing.T) {
Headers: headersMapAll,
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -475,7 +475,7 @@ func TestExtractorExtract(t *testing.T) {
Headers: headersMapAll,
},
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},

Expand All @@ -487,7 +487,7 @@ func TestExtractorExtract(t *testing.T) {
[]byte("hello-world"),
eventSqsMessage(headersAll, headersNone, headersNone),
},
expCtx: w3cTraceContext,
expCtx: ddTraceContext,
expNoErr: true,
},
{
Expand Down Expand Up @@ -640,7 +640,7 @@ func TestPropagationStyle(t *testing.T) {
name: "no-type-headers-all",
propType: "",
hdrs: headersAll,
expTraceID: w3c.trace.asUint,
expTraceID: dd.trace.asUint,
},
{
name: "datadog-type-headers-all",
Expand Down
47 changes: 32 additions & 15 deletions tasks/build_tags.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"containerd",
"cri",
"docker",
"datadog.no_waf",
"ec2",
"etcd",
"fargateprocess",
Expand Down Expand Up @@ -54,6 +55,7 @@
"consul",
"containerd",
"cri",
"datadog.no_waf",
"docker",
"ec2",
"etcd",
Expand Down Expand Up @@ -97,7 +99,7 @@
AGENTLESS_SCANNER_TAGS = {""}

# CLUSTER_AGENT_TAGS lists the tags needed when building the cluster-agent
CLUSTER_AGENT_TAGS = {"clusterchecks", "kubeapiserver", "orchestrator", "zlib", "ec2", "gce"}
CLUSTER_AGENT_TAGS = {"clusterchecks", "datadog.no_waf", "kubeapiserver", "orchestrator", "zlib", "ec2", "gce"}

# CLUSTER_AGENT_CLOUDFOUNDRY_TAGS lists the tags needed when building the cloudfoundry cluster-agent
CLUSTER_AGENT_CLOUDFOUNDRY_TAGS = {"clusterchecks"}
Expand All @@ -117,7 +119,17 @@
)

# SECURITY_AGENT_TAGS lists the tags necessary to build the security agent
SECURITY_AGENT_TAGS = {"netcgo", "docker", "containerd", "kubeapiserver", "kubelet", "podman", "zlib", "ec2"}
SECURITY_AGENT_TAGS = {
"netcgo",
"datadog.no_waf",
"docker",
"containerd",
"kubeapiserver",
"kubelet",
"podman",
"zlib",
"ec2",
}

# SERVERLESS_TAGS lists the tags necessary to build serverless
SERVERLESS_TAGS = {"serverless", "otlp"}
Expand All @@ -126,7 +138,7 @@
SYSTEM_PROBE_TAGS = AGENT_TAGS.union({"linux_bpf", "npm"}).difference({"python", "systemd"})

# TRACE_AGENT_TAGS lists the tags that have to be added when the trace-agent
TRACE_AGENT_TAGS = {"docker", "containerd", "kubeapiserver", "kubelet", "otlp", "netcgo", "podman"}
TRACE_AGENT_TAGS = {"docker", "containerd", "datadog.no_waf", "kubeapiserver", "kubelet", "otlp", "netcgo", "podman"}

# TRACE_AGENT_HEROKU_TAGS lists the tags necessary to build the trace-agent for Heroku
TRACE_AGENT_HEROKU_TAGS = TRACE_AGENT_TAGS.difference(
Expand Down Expand Up @@ -160,6 +172,9 @@
# Unit test build tags
UNIT_TEST_TAGS = {"test"}

# List of tags to always remove when running unit tests
UNIT_TEST_EXCLUDE_TAGS = {"datadog.no_waf"}

# Build type: maps flavor to build tags map
build_tags = {
AgentFlavor.base: {
Expand All @@ -172,36 +187,38 @@
"security-agent": SECURITY_AGENT_TAGS,
"serverless": SERVERLESS_TAGS,
"system-probe": SYSTEM_PROBE_TAGS,
"system-probe-unit-tests": SYSTEM_PROBE_TAGS.union(UNIT_TEST_TAGS),
"system-probe-unit-tests": SYSTEM_PROBE_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"trace-agent": TRACE_AGENT_TAGS,
# Test setups
"test": AGENT_TEST_TAGS.union(UNIT_TEST_TAGS),
"lint": AGENT_TEST_TAGS.union(PROCESS_AGENT_TAGS).union(UNIT_TEST_TAGS),
"unit-tests": AGENT_TEST_TAGS.union(PROCESS_AGENT_TAGS).union(UNIT_TEST_TAGS),
"test": AGENT_TEST_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"lint": AGENT_TEST_TAGS.union(PROCESS_AGENT_TAGS).union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"unit-tests": AGENT_TEST_TAGS.union(PROCESS_AGENT_TAGS)
.union(UNIT_TEST_TAGS)
.difference(UNIT_TEST_EXCLUDE_TAGS),
},
AgentFlavor.heroku: {
"agent": AGENT_HEROKU_TAGS,
"process-agent": PROCESS_AGENT_HEROKU_TAGS,
"trace-agent": TRACE_AGENT_HEROKU_TAGS,
"lint": AGENT_HEROKU_TAGS.union(UNIT_TEST_TAGS),
"unit-tests": AGENT_HEROKU_TAGS.union(UNIT_TEST_TAGS),
"lint": AGENT_HEROKU_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"unit-tests": AGENT_HEROKU_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
},
AgentFlavor.iot: {
"agent": IOT_AGENT_TAGS,
"lint": IOT_AGENT_TAGS.union(UNIT_TEST_TAGS),
"unit-tests": IOT_AGENT_TAGS.union(UNIT_TEST_TAGS),
"lint": IOT_AGENT_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"unit-tests": IOT_AGENT_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
},
AgentFlavor.dogstatsd: {
"dogstatsd": DOGSTATSD_TAGS,
"system-tests": AGENT_TAGS,
"lint": DOGSTATSD_TAGS.union(UNIT_TEST_TAGS),
"unit-tests": DOGSTATSD_TAGS.union(UNIT_TEST_TAGS),
"lint": DOGSTATSD_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"unit-tests": DOGSTATSD_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
},
AgentFlavor.agentless_scanner: {
"dogstatsd": AGENTLESS_SCANNER_TAGS,
"system-tests": AGENT_TAGS,
"lint": AGENTLESS_SCANNER_TAGS.union(UNIT_TEST_TAGS),
"unit-tests": AGENTLESS_SCANNER_TAGS.union(UNIT_TEST_TAGS),
"lint": AGENTLESS_SCANNER_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
"unit-tests": AGENTLESS_SCANNER_TAGS.union(UNIT_TEST_TAGS).difference(UNIT_TEST_EXCLUDE_TAGS),
},
}

Expand Down

0 comments on commit 4bb6481

Please sign in to comment.