Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] fieldalignment for internal/splunk #37317

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −10
Open

[chore] fieldalignment for internal/splunk #37317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporter/splunkhecexporter/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ func TestReceiveTracesBatches(t *testing.T) {
z.Close()
require.NoError(t, err)
}
timeStr := fmt.Sprintf(`"time":%d,`, i+1)
timeStr := fmt.Sprintf(`"time":%d}`, i+1)
if strings.Contains(string(batchBody), timeStr) {
assert.False(t, eventFound, "span event %d found in multiple batches", i)
eventFound = true
Expand Down
25 changes: 16 additions & 9 deletions internal/splunk/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,20 @@ type AccessTokenPassthroughConfig struct {

// Event represents a metric in Splunk HEC format
type Event struct {
Time float64 `json:"time,omitempty"` // optional epoch time - set to zero if the event timestamp is missing or unknown (will be added at indexing time)
Host string `json:"host"` // hostname
Source string `json:"source,omitempty"` // optional description of the source of the event; typically the app's name
SourceType string `json:"sourcetype,omitempty"` // optional name of a Splunk parsing configuration; this is usually inferred by Splunk
Index string `json:"index,omitempty"` // optional name of the Splunk index to store the event in; not required if the token has a default index set in Splunk
Event any `json:"event"` // type of event: set to "metric" or nil if the event represents a metric, or is the payload of the event.
Fields map[string]any `json:"fields,omitempty"` // dimensions and metric data
// type of event: set to "metric" or nil if the event represents a metric, or is the payload of the event.
Event any `json:"event"`
// dimensions and metric data
Fields map[string]any `json:"fields,omitempty"`
// hostname
Host string `json:"host"`
// optional description of the source of the event; typically the app's name
Source string `json:"source,omitempty"`
// optional name of a Splunk parsing configuration; this is usually inferred by Splunk
SourceType string `json:"sourcetype,omitempty"`
// optional name of the Splunk index to store the event in; not required if the token has a default index set in Splunk
Index string `json:"index,omitempty"`
// optional epoch time - set to zero if the event timestamp is missing or unknown (will be added at indexing time)
Time float64 `json:"time,omitempty"`
}

// IsMetric returns true if the Splunk event is a metric.
Expand Down Expand Up @@ -93,12 +100,12 @@ func (e *Event) GetMetricValues() map[string]any {
func (e *Event) UnmarshalJSON(b []byte) error {
rawEvent := struct {
Time any `json:"time,omitempty"`
Event any `json:"event"`
Fields map[string]any `json:"fields,omitempty"`
Host string `json:"host"`
Source string `json:"source,omitempty"`
SourceType string `json:"sourcetype,omitempty"`
Index string `json:"index,omitempty"`
Event any `json:"event"`
Fields map[string]any `json:"fields,omitempty"`
}{}
err := json.Unmarshal(b, &rawEvent)
if err != nil {
Expand Down
Loading