Skip to content

Commit 6335aca

Browse files
Nabil-SalahNabil-Salah
authored
Merge branch 'main' into use_jaeger_idl_models
2 parents b325781 + b589bef commit 6335aca

26 files changed

+419
-400
lines changed

‎.chloggen/olivierg_gateway-usage-gauge.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add a gauge metric datadog.otel.gateway which is 1 if the collector is used as a gateway or 0 otherwise.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37499]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎.github/workflows/build-and-test.yml

-11
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ jobs:
5252
- run: make genotelcontribcol
5353
- name: Check Collector Module Version
5454
run: ./.github/workflows/scripts/check-collector-module-version.sh
55-
check-codeowners:
56-
runs-on: ubuntu-24.04
57-
needs: [setup-environment]
58-
steps:
59-
- uses: actions/checkout@v4
60-
- name: Check Code Owner Existence
61-
run: ./.github/workflows/scripts/check-codeowners.sh check_code_owner_existence
62-
- name: Check Component Existence
63-
run: ./.github/workflows/scripts/check-codeowners.sh check_component_existence
64-
- name: Validate Allowlist entries
65-
run: ./.github/workflows/scripts/check-codeowners.sh check_entries_in_allowlist
6655
lint-matrix:
6756
strategy:
6857
fail-fast: false

‎.github/workflows/scripts/check-codeowners.sh

-103
This file was deleted.

‎connector/datadogconnector/connector_native_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestContainerTagsNative(t *testing.T) {
114114

115115
ch := make(chan []byte, 100)
116116
tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch)
117-
_, err = tr.MapMetrics(context.Background(), metrics[0], nil)
117+
_, err = tr.MapMetrics(context.Background(), metrics[0], nil, nil)
118118
require.NoError(t, err)
119119
msg := <-ch
120120
sp := &pb.StatsPayload{}
@@ -211,7 +211,7 @@ func testMeasuredAndClientKindNative(t *testing.T, enableOperationAndResourceNam
211211

212212
ch := make(chan []byte, 100)
213213
tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch)
214-
_, err = tr.MapMetrics(context.Background(), metrics[0], nil)
214+
_, err = tr.MapMetrics(context.Background(), metrics[0], nil, nil)
215215
require.NoError(t, err)
216216
msg := <-ch
217217
sp := &pb.StatsPayload{}
@@ -326,7 +326,7 @@ func TestObfuscate(t *testing.T) {
326326

327327
ch := make(chan []byte, 100)
328328
tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch)
329-
_, err = tr.MapMetrics(context.Background(), metrics[0], nil)
329+
_, err = tr.MapMetrics(context.Background(), metrics[0], nil, nil)
330330
require.NoError(t, err)
331331
msg := <-ch
332332
sp := &pb.StatsPayload{}

‎connector/datadogconnector/connector_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func TestContainerTags(t *testing.T) {
181181

182182
ch := make(chan []byte, 100)
183183
tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch)
184-
_, err = tr.MapMetrics(context.Background(), metrics[0], nil)
184+
_, err = tr.MapMetrics(context.Background(), metrics[0], nil, nil)
185185
require.NoError(t, err)
186186
msg := <-ch
187187
sp := &pb.StatsPayload{}
@@ -240,7 +240,7 @@ func testReceiveResourceSpansV2(t *testing.T, enableReceiveResourceSpansV2 bool)
240240

241241
ch := make(chan []byte, 100)
242242
tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch)
243-
_, err = tr.MapMetrics(context.Background(), metrics[0], nil)
243+
_, err = tr.MapMetrics(context.Background(), metrics[0], nil, nil)
244244
require.NoError(t, err)
245245
msg := <-ch
246246
sp := &pb.StatsPayload{}
@@ -299,7 +299,7 @@ func testOperationAndResourceNameV2(t *testing.T, enableOperationAndResourceName
299299

300300
ch := make(chan []byte, 100)
301301
tr := newTranslatorWithStatsChannel(t, zap.NewNop(), ch)
302-
_, err = tr.MapMetrics(context.Background(), metrics[0], nil)
302+
_, err = tr.MapMetrics(context.Background(), metrics[0], nil, nil)
303303
require.NoError(t, err)
304304
msg := <-ch
305305
sp := &pb.StatsPayload{}

‎connector/datadogconnector/go.mod

+19-19
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.22.0
44

55
require (
66
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.61.0
7-
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.61.0
8-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.63.0-devel.0.20250123185937-1feb84b482c8
9-
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel.0.20250123185937-1feb84b482c8
10-
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250129182827-bab631c10d61
7+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.64.0-devel.0.20250203170818-31c3d5c28ba0
8+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-devel.0.20250129111638-01c8fb06949e
9+
github.com/DataDog/datadog-agent/pkg/proto v0.64.0-devel
10+
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250203170818-31c3d5c28ba0
1111
github.com/DataDog/datadog-go/v5 v5.6.0
12-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.24.0
13-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.24.0
12+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.25.0
13+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.25.0
1414
github.com/google/go-cmp v0.6.0
1515
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.119.0
1616
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.119.0
@@ -50,7 +50,7 @@ require (
5050
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.61.0 // indirect
5151
github.com/DataDog/datadog-agent/comp/core/log/def v0.61.0 // indirect
5252
github.com/DataDog/datadog-agent/comp/core/secrets v0.61.0 // indirect
53-
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.0.0-20241217122454-175edb6c74f2 // indirect
53+
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-devel // indirect
5454
github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect
5555
github.com/DataDog/datadog-agent/comp/def v0.61.0 // indirect
5656
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.61.0 // indirect
@@ -90,7 +90,7 @@ require (
9090
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.61.0 // indirect
9191
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0 // indirect
9292
github.com/DataDog/datadog-agent/pkg/util/http v0.61.0 // indirect
93-
github.com/DataDog/datadog-agent/pkg/util/log v0.63.0-devel.0.20250123185937-1feb84b482c8 // indirect
93+
github.com/DataDog/datadog-agent/pkg/util/log v0.64.0-devel.0.20250129111638-01c8fb06949e // indirect
9494
github.com/DataDog/datadog-agent/pkg/util/optional v0.61.0 // indirect
9595
github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect
9696
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.61.0 // indirect
@@ -105,9 +105,9 @@ require (
105105
github.com/DataDog/go-sqllexer v0.0.20 // indirect
106106
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
107107
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
108-
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.24.0 // indirect
109-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.24.0 // indirect
110-
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.24.0 // indirect
108+
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.25.0 // indirect
109+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.25.0 // indirect
110+
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.25.0 // indirect
111111
github.com/DataDog/sketches-go v1.4.6 // indirect
112112
github.com/DataDog/viper v1.14.0 // indirect
113113
github.com/DataDog/zstd v1.5.6 // indirect
@@ -187,7 +187,7 @@ require (
187187
github.com/knadh/koanf/maps v0.1.1 // indirect
188188
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
189189
github.com/knadh/koanf/v2 v2.1.2 // indirect
190-
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
190+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
191191
github.com/magefile/mage v1.15.0 // indirect
192192
github.com/magiconair/properties v1.8.7 // indirect
193193
github.com/mailru/easyjson v0.7.7 // indirect
@@ -220,13 +220,13 @@ require (
220220
github.com/pkg/errors v0.9.1 // indirect
221221
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
222222
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
223-
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
223+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
224224
github.com/prometheus/client_golang v1.20.5 // indirect
225225
github.com/prometheus/client_model v0.6.1 // indirect
226226
github.com/prometheus/common v0.62.0 // indirect
227227
github.com/prometheus/procfs v0.15.1 // indirect
228228
github.com/rs/cors v1.11.1 // indirect
229-
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
229+
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
230230
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
231231
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
232232
github.com/shoenig/go-m1cpu v0.1.6 // indirect
@@ -239,7 +239,7 @@ require (
239239
github.com/stretchr/objx v0.5.2 // indirect
240240
github.com/tinylib/msgp v1.2.5 // indirect
241241
github.com/tklauser/go-sysconf v0.3.14 // indirect
242-
github.com/tklauser/numcpus v0.8.0 // indirect
242+
github.com/tklauser/numcpus v0.9.0 // indirect
243243
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
244244
github.com/x448/float16 v0.8.4 // indirect
245245
github.com/yusufpapurcu/wmi v1.2.4 // indirect
@@ -309,16 +309,16 @@ require (
309309
go.uber.org/dig v1.18.0 // indirect
310310
go.uber.org/fx v1.22.2 // indirect
311311
go.uber.org/multierr v1.11.0 // indirect
312-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
312+
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
313313
golang.org/x/net v0.34.0 // indirect
314-
golang.org/x/oauth2 v0.24.0 // indirect
314+
golang.org/x/oauth2 v0.25.0 // indirect
315315
golang.org/x/sys v0.30.0 // indirect
316316
golang.org/x/term v0.28.0 // indirect
317317
golang.org/x/text v0.22.0 // indirect
318-
golang.org/x/time v0.8.0 // indirect
318+
golang.org/x/time v0.9.0 // indirect
319319
gonum.org/v1/gonum v0.15.1 // indirect
320320
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
321-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
321+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
322322
google.golang.org/grpc v1.70.0 // indirect
323323
gopkg.in/inf.v0 v0.9.1 // indirect
324324
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)