Skip to content

Commit 1d0643a

Browse files
committed
host-profiler: remove app_key from symbol uploader config
SymbolUploader no longer needs an app key.
1 parent e147206 commit 1d0643a

15 files changed

Lines changed: 3 additions & 92 deletions

File tree

cmd/host-profiler/docker-compose.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@ services:
4141
- agent-ipc:/etc/datadog-agent:ro
4242
secrets:
4343
- dd-api-key
44-
- dd-app-key
4544

4645
volumes:
4746
agent-ipc:
4847

4948
secrets:
5049
dd-api-key:
5150
environment: DD_API_KEY
52-
dd-app-key:
53-
environment: DD_APP_KEY

comp/host-profiler/collector/impl/converters/converter_table_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ func TestConverterWithoutAgent(t *testing.T) {
163163
provided: "no_agent/conv-nonstr-apikey/in.yaml",
164164
expected: "no_agent/conv-nonstr-apikey/out.yaml",
165165
},
166-
{
167-
name: "converts-non-string-app-key",
168-
provided: "no_agent/conv-nonstr-appkey/in.yaml",
169-
expected: "no_agent/conv-nonstr-appkey/out.yaml",
170-
},
171166
{
172167
name: "adds-profiling-to-pipeline",
173168
provided: "no_agent/add-prof-to-pipe/in.yaml",

comp/host-profiler/collector/impl/converters/converter_without_agent.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type internalHealthMetricsPipelineResolution struct {
5353
// - remove infraattributes processor from metrics processors pipeline
5454
// - At least one otlp_http exporter with dd-api-key declared & used
5555
// - Check if used otlp_http exporter has dd-api-key as string, if not string convert it, if not at all notify user
56-
// - If profiling::symbol_uploader::enabled == true, convert api_key/app_key to strings in each endpoint
56+
// - If profiling::symbol_uploader::enabled == true, convert api_key to string in each endpoint
5757
// - If no profiling is used & configured, add minimal one with symbol_uploader: false
5858
// - remove hpflare extensions
5959
type converterWithoutAgent struct{}
@@ -335,7 +335,7 @@ func (c *converterWithoutAgent) fixReceiversPipeline(conf confMap, receiverNames
335335

336336
// checkProfilingReceiverConfig validates and normalizes a profiling receiver configuration.
337337
// It ensures that if symbol_uploader is enabled, symbol_endpoints is properly configured
338-
// and all api_key/app_key values are strings.
338+
// and all api_key values are strings.
339339
func (c *converterWithoutAgent) checkProfilingReceiverConfig(profiling confMap) error {
340340
if isEnabled, ok := confmaputils.Get[bool](profiling, pathSymbolUploaderEnabled); !ok || !isEnabled {
341341
return nil
@@ -354,7 +354,6 @@ func (c *converterWithoutAgent) checkProfilingReceiverConfig(profiling confMap)
354354
for _, epAny := range endpoints {
355355
if ep, ok := epAny.(confMap); ok {
356356
ensureKeyStringValue(ep, fieldAPIKey)
357-
ensureKeyStringValue(ep, fieldAppKey)
358357
}
359358
}
360359
return nil

comp/host-profiler/collector/impl/converters/converters.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ const (
7474
fieldDDOtelMetricConfig = "dd-otel-metric-config"
7575
fieldDDOtelMetricConfigValue = `{"resource_attributes_as_tags": true}`
7676
fieldAPIKey = "api_key"
77-
fieldAppKey = "app_key"
7877
)
7978

8079
// OTEL config path prefixes

comp/host-profiler/collector/impl/converters/testdata/no_agent/conv-nonstr-apikey/in.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ receivers:
44
enabled: true
55
symbol_endpoints:
66
- api_key: 12345
7-
app_key: test-app-key
87
service:
98
pipelines:
109
profiles:

comp/host-profiler/collector/impl/converters/testdata/no_agent/conv-nonstr-apikey/out.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ receivers:
3333
enabled: true
3434
symbol_endpoints:
3535
- api_key: "12345"
36-
app_key: test-app-key
3736
service:
3837
pipelines:
3938
profiles:

comp/host-profiler/collector/impl/converters/testdata/no_agent/conv-nonstr-appkey/in.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

comp/host-profiler/collector/impl/converters/testdata/no_agent/conv-nonstr-appkey/out.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

comp/host-profiler/collector/impl/converters/testdata/no_agent/multi-profiling-recv/in.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ receivers:
44
enabled: true
55
symbol_endpoints:
66
- api_key: 11111
7-
app_key: 22222
87
profiling/custom:
98
symbol_uploader:
109
enabled: true
1110
symbol_endpoints:
1211
- api_key: 33333
13-
app_key: string-app
1412
service:
1513
pipelines:
1614
profiles:

comp/host-profiler/collector/impl/converters/testdata/no_agent/multi-profiling-recv/out.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ receivers:
3333
enabled: true
3434
symbol_endpoints:
3535
- api_key: "11111"
36-
app_key: "22222"
3736
profiling/custom:
3837
symbol_uploader:
3938
enabled: true
4039
symbol_endpoints:
4140
- api_key: "33333"
42-
app_key: string-app
4341
service:
4442
pipelines:
4543
profiles:

0 commit comments

Comments
 (0)