opensource/alloy
1
0
Fork 0
mirror of https://github.com/grafana/alloy.git synced 2025-11-05 13:28:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: flatten config structure

Browse Source
This commit is contained in:
x1unix
2025-11-04 20:24:21 -05:00
parent 1616558e5a
commit a2e36bf75f
2 changed files with 59 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
internal/component/otelcol/receiver/cloudflare/cloudflare.go
View File

@@ -32,7 +32,7 @@ func init() {
})
}
type LogsConfig struct {
type Arguments struct {
Secret string `alloy:"secret,attr"`
Endpoint string `alloy:"endpoint,attr"`
TLS *otelcol.TLSServerArguments `alloy:"tls,block,optional"`
@@ -42,47 +42,37 @@ type LogsConfig struct {
Separator string `alloy:"separator,attr,optional"`
}
func (lc LogsConfig) Convert() cloudflarereceiver.LogsConfig {
tlsCfg := lc.TLS.Convert()
return cloudflarereceiver.LogsConfig{
Secret: lc.Secret,
Endpoint: lc.Endpoint,
TLS: tlsCfg.Get(),
Attributes: lc.Attributes,
TimestampField: lc.TimestampField,
TimestampFormat: lc.TimestampFormat,
Separator: lc.Separator,
}
}
func (lc *LogsConfig) SetToDefault() {
// Although otel's receiver already initializes defaults of downstream config,
// let's do it as well to avoid breaking changes if defauls are changed in upstream.
if lc.TimestampField == "" {
lc.TimestampField = "EdgeStartTimestamp"
}
if lc.TimestampFormat == "" {
lc.TimestampFormat = "rfc3339"
}
if lc.Separator == "" {
lc.Separator = "."
}
}
type Arguments struct {
Logs LogsConfig `alloy:"logs,block"`
}
// SetToDefault implements syntax.Defaulter.
func (args *Arguments) SetToDefault() {
args.Logs.SetToDefault()
// Although otel's receiver already initializes defaults of downstream config,
// let's do it as well to avoid breaking changes if defauls are changed in upstream.
if args.TimestampField == "" {
args.TimestampField = "EdgeStartTimestamp"
}
if args.TimestampFormat == "" {
args.TimestampFormat = "rfc3339"
}
if args.Separator == "" {
args.Separator = "."
}
}
func (args Arguments) receiverConfig() *cloudflarereceiver.Config {
tlsCfg := args.TLS.Convert()
logCfg := cloudflarereceiver.LogsConfig{
Secret: args.Secret,
Endpoint: args.Endpoint,
TLS: tlsCfg.Get(),
Attributes: args.Attributes,
TimestampField: args.TimestampField,
TimestampFormat: args.TimestampFormat,
Separator: args.Separator,
}
return &cloudflarereceiver.Config{
Logs: args.Logs.Convert(),
Logs: logCfg,
}
}

84
internal/component/otelcol/receiver/cloudflare/cloudflare_test.go
View File

@@ -20,10 +20,8 @@ func TestArguments_UnmarshalAlloy(t *testing.T) {
{
testName: "minimal configuration",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8080/webhook"
}
secret = "my-secret"
endpoint = "localhost:8080/webhook"
`,
expected: cloudflarereceiver.Config{
Logs: cloudflarereceiver.LogsConfig{
@@ -38,17 +36,15 @@ func TestArguments_UnmarshalAlloy(t *testing.T) {
{
testName: "full configuration without TLS",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8080/cloudflare-webhook"
attributes = {
"service.name" = "cloudflare-logs",
"environment" = "production",
}
timestamp_field = "EdgeStartTimestamp"
timestamp_format = "unix"
separator = "_"
secret = "my-secret"
endpoint = "localhost:8080/cloudflare-webhook"
attributes = {
"service.name" = "cloudflare-logs",
"environment" = "production",
}
timestamp_field = "EdgeStartTimestamp"
timestamp_format = "unix"
separator = "_"
`,
expected: cloudflarereceiver.Config{
Logs: cloudflarereceiver.LogsConfig{
@@ -67,15 +63,13 @@ func TestArguments_UnmarshalAlloy(t *testing.T) {
{
testName: "configuration with TLS",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8443/secure-webhook"
tls {
cert_file = "/path/to/cert.pem"
key_file = "/path/to/key.pem"
}
timestamp_format = "unixnano"
secret = "my-secret"
endpoint = "localhost:8443/secure-webhook"
tls {
cert_file = "/path/to/cert.pem"
key_file = "/path/to/key.pem"
}
timestamp_format = "unixnano"
`,
expected: cloudflarereceiver.Config{
Logs: cloudflarereceiver.LogsConfig{
@@ -96,12 +90,10 @@ func TestArguments_UnmarshalAlloy(t *testing.T) {
{
testName: "configuration with custom timestamp field",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8080/webhook"
timestamp_field = "RequestTimestamp"
timestamp_format = "rfc3339"
}
secret = "my-secret"
endpoint = "localhost:8080/webhook"
timestamp_field = "RequestTimestamp"
timestamp_format = "rfc3339"
`,
expected: cloudflarereceiver.Config{
Logs: cloudflarereceiver.LogsConfig{
@@ -139,23 +131,19 @@ func TestArguments_Validate(t *testing.T) {
{
testName: "invalid timestamp format",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8080/webhook"
timestamp_format = "invalid"
}
secret = "my-secret"
endpoint = "localhost:8080/webhook"
timestamp_format = "invalid"
`,
expectedError: `invalid timestamp_format "invalid"`,
},
{
testName: "TLS with missing cert file",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8080/webhook"
tls {
key_file = "/path/to/key.pem"
}
secret = "my-secret"
endpoint = "localhost:8080/webhook"
tls {
key_file = "/path/to/key.pem"
}
`,
expectedError: "tls was configured, but no cert file was specified",
@@ -163,12 +151,10 @@ func TestArguments_Validate(t *testing.T) {
{
testName: "TLS with missing key file",
cfg: `
logs {
secret = "my-secret"
endpoint = "localhost:8080/webhook"
tls {
cert_file = "/path/to/cert.pem"
}
secret = "my-secret"
endpoint = "localhost:8080/webhook"
tls {
cert_file = "/path/to/cert.pem"
}
`,
expectedError: "tls was configured, but no key file was specified",
@@ -176,18 +162,14 @@ func TestArguments_Validate(t *testing.T) {
{
testName: "missing secret",
cfg: `
logs {
endpoint = "localhost:8080/webhook"
}
endpoint = "localhost:8080/webhook"
`,
expectedError: `missing required attribute "secret"`,
},
{
testName: "missing endpoint",
cfg: `
logs {
secret = "my-secret"
}
secret = "my-secret"
`,
expectedError: `missing required attribute "endpoint"`,
},