Skip to content

Commit 1bb33ff

Browse files
authored
[exporter/datadogexporter] support insecure_skip_verify for metrics (#40507)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Support `insecure_skip_verify` for metrics by bringing in DataDog/datadog-agent#37656. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #40085 <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.-->
1 parent 7f4018f commit 1bb33ff

File tree

8 files changed

+70
-42
lines changed

8 files changed

+70
-42
lines changed
Lines changed: 27 additions & 0 deletions
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: bug_fix
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: config `tls::insecure_skip_verify` is now taken into account in metrics path.
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: [40507, 40085]
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: []

connector/datadogconnector/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.67.0-devel.0.20250507144401-a64863d1e01a // indirect
6161
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.67.0-devel.0.20250507144401-a64863d1e01a // indirect
6262
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.67.0-devel.0.20250507144401-a64863d1e01a // indirect
63-
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.67.0-devel.0.20250428143048-1cb2fe523d83 // indirect
63+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.68.0-devel.0.20250604170009-feaecfbfd700 // indirect
6464
github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
6565
github.com/DataDog/datadog-agent/comp/serializer/metricscompression v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
6666
github.com/DataDog/datadog-agent/comp/trace/compression/def v0.66.0 // indirect
@@ -261,13 +261,13 @@ require (
261261
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
262262
github.com/shoenig/go-m1cpu v0.1.6 // indirect
263263
github.com/spf13/afero v1.14.0 // indirect
264-
github.com/spf13/cast v1.7.1 // indirect
264+
github.com/spf13/cast v1.8.0 // indirect
265265
github.com/spf13/cobra v1.9.1 // indirect
266266
github.com/spf13/jwalterweatherman v1.1.0 // indirect
267267
github.com/spf13/pflag v1.0.6 // indirect
268268
github.com/stormcat24/protodep v0.1.8 // indirect
269269
github.com/stretchr/objx v0.5.2 // indirect
270-
github.com/tinylib/msgp v1.2.5 // indirect
270+
github.com/tinylib/msgp v1.3.0 // indirect
271271
github.com/tklauser/go-sysconf v0.3.14 // indirect
272272
github.com/tklauser/numcpus v0.9.0 // indirect
273273
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -343,8 +343,8 @@ require (
343343
go.opentelemetry.io/otel/trace v1.36.0 // indirect
344344
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
345345
go.uber.org/atomic v1.11.0 // indirect
346-
go.uber.org/dig v1.18.1 // indirect
347-
go.uber.org/fx v1.23.0 // indirect
346+
go.uber.org/dig v1.19.0 // indirect
347+
go.uber.org/fx v1.24.0 // indirect
348348
go.uber.org/multierr v1.11.0 // indirect
349349
golang.org/x/crypto v0.38.0 // indirect
350350
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect

connector/datadogconnector/go.sum

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/datadogexporter/factory.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ func (f *factory) createMetricsExporter(
370370
TimeoutConfig: exporterhelper.TimeoutConfig{
371371
Timeout: cfg.Timeout,
372372
},
373+
ClientConfig: cfg.TLS,
373374
QueueBatchConfig: cfg.QueueSettings,
374375
API: cfg.API,
375376
HostProvider: func(ctx context.Context) (string, error) {

exporter/datadogexporter/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ require (
8989
)
9090

9191
require (
92-
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.67.0-devel.0.20250428143048-1cb2fe523d83
92+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.68.0-devel.0.20250604170009-feaecfbfd700
9393
github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.66.0-devel.0.20250407180930-ebfcfa2817ce
9494
github.com/DataDog/datadog-agent/pkg/config/viperconfig v0.66.0
9595
github.com/DataDog/datadog-agent/pkg/util/log v0.66.0
@@ -385,14 +385,14 @@ require (
385385
github.com/shoenig/go-m1cpu v0.1.6 // indirect
386386
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
387387
github.com/spf13/afero v1.14.0 // indirect
388-
github.com/spf13/cast v1.7.1 // indirect
388+
github.com/spf13/cast v1.8.0 // indirect
389389
github.com/spf13/cobra v1.9.1 // indirect
390390
github.com/spf13/jwalterweatherman v1.1.0 // indirect
391391
github.com/spf13/pflag v1.0.6 // indirect
392392
github.com/stormcat24/protodep v0.1.8 // indirect
393393
github.com/stretchr/objx v0.5.2 // indirect
394394
github.com/tilinna/clock v1.1.0 // indirect
395-
github.com/tinylib/msgp v1.2.5 // indirect
395+
github.com/tinylib/msgp v1.3.0 // indirect
396396
github.com/tklauser/go-sysconf v0.3.14 // indirect
397397
github.com/tklauser/numcpus v0.9.0 // indirect
398398
github.com/twmb/murmur3 v1.1.8 // indirect
@@ -468,8 +468,8 @@ require (
468468
go.opentelemetry.io/otel/sdk/log v0.12.2 // indirect
469469
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
470470
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
471-
go.uber.org/dig v1.18.1 // indirect
472-
go.uber.org/fx v1.23.0 // indirect
471+
go.uber.org/dig v1.19.0 // indirect
472+
go.uber.org/fx v1.24.0 // indirect
473473
go.uber.org/multierr v1.11.0 // indirect
474474
go.uber.org/zap/exp v0.3.0 // indirect
475475
golang.org/x/crypto v0.38.0 // indirect

exporter/datadogexporter/go.sum

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/datadogexporter/integrationtest/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ require (
5757
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.67.0-devel.0.20250507144401-a64863d1e01a // indirect
5858
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.67.0-devel.0.20250507144401-a64863d1e01a // indirect
5959
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.67.0-devel.0.20250507144401-a64863d1e01a // indirect
60-
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.67.0-devel.0.20250428143048-1cb2fe523d83 // indirect
60+
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.68.0-devel.0.20250604170009-feaecfbfd700 // indirect
6161
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.67.0-devel.0.20250422212611-65be868f4270 // indirect
6262
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
6363
github.com/DataDog/datadog-agent/comp/serializer/logscompression v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
@@ -270,7 +270,7 @@ require (
270270
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
271271
github.com/shoenig/go-m1cpu v0.1.6 // indirect
272272
github.com/spf13/afero v1.14.0 // indirect
273-
github.com/spf13/cast v1.7.1 // indirect
273+
github.com/spf13/cast v1.8.0 // indirect
274274
github.com/spf13/cobra v1.9.1 // indirect
275275
github.com/spf13/jwalterweatherman v1.1.0 // indirect
276276
github.com/spf13/pflag v1.0.6 // indirect
@@ -356,8 +356,8 @@ require (
356356
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
357357
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
358358
go.uber.org/atomic v1.11.0 // indirect
359-
go.uber.org/dig v1.18.1 // indirect
360-
go.uber.org/fx v1.23.0 // indirect
359+
go.uber.org/dig v1.19.0 // indirect
360+
go.uber.org/fx v1.24.0 // indirect
361361
go.uber.org/multierr v1.11.0 // indirect
362362
go.uber.org/zap v1.27.0 // indirect
363363
golang.org/x/crypto v0.38.0 // indirect

0 commit comments

Comments
 (0)