Skip to content

Commit

Permalink
Remove unnecessary logic (#34616)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mackjmr
mackjmr authored Mar 3, 2025
1 parent 762bde5 commit 504e88a
Show file tree
Hide file tree
Showing 38 changed files with 33 additions and 247 deletions.
6 changes: 0 additions & 6 deletions comp/otelcol/converter/impl/converter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,6 @@ func TestConvert(t *testing.T) {
expectedResult: "dd-core-cfg/apikey/no-api-key-section/config-result.yaml",
agentConfig: "dd-core-cfg/apikey/no-api-key-section/acfg.yaml",
},
{
name: "dd-core-cfg/apikey/no-api-no-add",
provided: "dd-core-cfg/apikey/no-api-no-add/config.yaml",
expectedResult: "dd-core-cfg/apikey/no-api-no-add/config-result.yaml",
agentConfig: "dd-core-cfg/apikey/no-api-no-add/acfg.yaml",
},
{
name: "dd-core-cfg/apikey/multiple-dd-exporter",
provided: "dd-core-cfg/apikey/multiple-dd-exporter/config.yaml",
Expand Down
1 change: 0 additions & 1 deletion comp/otelcol/converter/impl/coreconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ func addCoreAgentConfig(conf *confmap.Conf, coreCfg config.Component) {
return
}
addAPIKeySite(conf, coreCfg, "exporters", "datadog")
addAPIKeySite(conf, coreCfg, "extensions", "ddprofiling")
addEnv(conf, coreCfg)
}

Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,10 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ggggg77777
site: datadoghq.eu


service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
4 changes: 1 addition & 3 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:


service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ggggg77777
site: datadoghq.eu

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key:
site:

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
3 changes: 1 addition & 2 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
3 changes: 1 addition & 2 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-overrides/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: abc123
site: us1.datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ggggg77777
site: datadoghq.eu

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
5 changes: 1 addition & 4 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
site: datadoghq.eu

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ggggg77777
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ""
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
11 changes: 1 addition & 10 deletions ...telcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling/1:
api:
key: ggggg77777
site: datadoghq.com
ddprofiling/2:
api:
key: ggggg77777
site: datadoghq.com


service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling/1, ddprofiling/2]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
10 changes: 1 addition & 9 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling/1:
api:
key:
site: datadoghq.com
ddprofiling/2:
api:
key:
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling/1, ddprofiling/2]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
3 changes: 1 addition & 2 deletions .../otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
3 changes: 1 addition & 2 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
1 change: 0 additions & 1 deletion comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-no-add/acfg.yaml
View file

This file was deleted.

39 changes: 0 additions & 39 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-no-add/config-result.yaml
View file

This file was deleted.

39 changes: 0 additions & 39 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-no-add/config.yaml
View file

This file was deleted.

6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ggggg77777
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: "ENC[my-secret]"
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key: ggggg77777
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
4 changes: 1 addition & 3 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
6 changes: 1 addition & 5 deletions comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config-result.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ extensions:
zpages/user-defined:
endpoint: "localhost:55679"
ddflare/user-defined:
ddprofiling:
api:
key:
site: datadoghq.com

service:
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined, ddprofiling]
extensions: [pprof/user-defined, zpages/user-defined, health_check/user-defined, ddflare/user-defined]
pipelines:
traces:
receivers: [otlp]
Expand Down
Loading

0 comments on commit 504e88a

Please sign in to comment.