Add ResourceAttributes to Splunk Event

open-telemetry · Mar 24, 2021 · 6b7a968 · 6b7a968
1 parent fa90892
commit 6b7a968
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/exporter/splunkhecexporter/logdata_to_splunk.go b/exporter/splunkhecexporter/logdata_to_splunk.go
@@ -32,20 +32,36 @@ func logDataToSplunk(logger *zap.Logger, ld pdata.Logs, config *Config) []*splun
 		for j := 0; j < ills.Len(); j++ {
 			logs := ills.At(j).Logs()
 			for k := 0; k < logs.Len(); k++ {
-				splunkEvents = append(splunkEvents, mapLogRecordToSplunkEvent(logs.At(k), config, logger))
+				splunkEvents = append(splunkEvents, mapLogRecordToSplunkEvent(rls.At(i), logs.At(k), config, logger))
 			}
 		}
 	}
 
 	return splunkEvents
 }
 
-func mapLogRecordToSplunkEvent(lr pdata.LogRecord, config *Config, logger *zap.Logger) *splunk.Event {
+func mapLogRecordToSplunkEvent(rls pdata.ResourceLogs, lr pdata.LogRecord, config *Config, logger *zap.Logger) *splunk.Event {
 	host := unknownHostName
 	source := config.Source
 	sourcetype := config.SourceType
 	index := config.Index
 	fields := map[string]interface{}{}
+	rls.Resource().Attributes().ForEach(func(k string, v pdata.AttributeValue) {
+		switch k {
+		case conventions.AttributeHostName:
+			host = v.StringVal()
+			fields[k] = v.StringVal()
+		case conventions.AttributeServiceName:
+			source = v.StringVal()
+			fields[k] = v.StringVal()
+		case splunk.SourcetypeLabel:
+			sourcetype = v.StringVal()
+		case splunk.IndexLabel:
+			index = v.StringVal()
+		default:
+			fields[k] = convertAttributeValue(v, logger)
+		}
+	})
 	lr.Attributes().ForEach(func(k string, v pdata.AttributeValue) {
 		switch k {
 		case conventions.AttributeHostName:

diff --git a/processor/k8sprocessor/config.go b/processor/k8sprocessor/config.go
@@ -96,13 +96,14 @@ type ExtractConfig struct {
 //
 //   procesors:
 //     k8s-tagger:
-//       annotations:
-//         - name: git.sha
-//           key: kubernetes.io/change-cause
-//           regex: GIT_SHA=(?P<value>\w+)
-//         - name: ci.build
-//	         key: kubernetes.io/change-cause
-//           regex: JENKINS=(?P<value>[\w]+)
+//       extract:
+//         annotations:
+//           - tag_name: git.sha
+//             key: kubernetes.io/change-cause
+//             regex: GIT_SHA=(?P<value>\w+)
+//           - tag_name: ci.build
+//	           key: kubernetes.io/change-cause
+//             regex: JENKINS=(?P<value>[\w]+)
 //
 //   this will add the `git.sha` and `ci.build` tags to the spans or metrics.
 type FieldExtractConfig struct {