Accounting for data stream type == traces

ycombinator · ycombinator · commit 3b846374527d · 2021-02-19T08:15:50.000-08:00
diff --git a/internal/packages/assets.go b/internal/packages/assets.go
@@ -120,7 +120,7 @@ func loadElasticsearchAssets(pkgRootPath string) ([]Asset, error) {
 		}
 		assets = append(assets, asset)
 
-		if dsManifest.Type == dataStreamTypeLogs {
+		if dsManifest.Type == dataStreamTypeLogs || dsManifest.Type == dataStreamTypeTraces {
 			elasticsearchDirPath := filepath.Join(filepath.Dir(dsManifestPath), "elasticsearch", "ingest_pipeline")
 			pipelineFiles, _ := ioutil.ReadDir(elasticsearchDirPath)
 			if pipelineFiles == nil || len(pipelineFiles) == 0 {
diff --git a/internal/packages/packages.go b/internal/packages/packages.go
@@ -25,6 +25,7 @@ const (
 
 	dataStreamTypeLogs    = "logs"
 	dataStreamTypeMetrics = "metrics"
+	dataStreamTypeTraces  = "traces"
 )
 
 // VarValue represents a variable value as defined in a package or data stream
@@ -248,5 +249,7 @@ func isDataStreamManifest(path string) (bool, error) {
 	if err != nil {
 		return false, errors.Wrapf(err, "reading package manifest failed (path: %s)", path)
 	}
-	return m.Title != "" && (m.Type == dataStreamTypeLogs || m.Type == dataStreamTypeMetrics), nil
+	return m.Title != "" &&
+			(m.Type == dataStreamTypeLogs || m.Type == dataStreamTypeMetrics || m.Type == dataStreamTypeTraces),
+		nil
 }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func loadElasticsearchAssets(pkgRootPath string) ([]Asset, error) {`
`120`	`120`	`}`
`121`	`121`	`assets = append(assets, asset)`
`122`	`122`
`123`		`- if dsManifest.Type == dataStreamTypeLogs {`
	`123`	`+ if dsManifest.Type == dataStreamTypeLogs \|\| dsManifest.Type == dataStreamTypeTraces {`
`124`	`124`	`elasticsearchDirPath := filepath.Join(filepath.Dir(dsManifestPath), "elasticsearch", "ingest_pipeline")`
`125`	`125`	`pipelineFiles, _ := ioutil.ReadDir(elasticsearchDirPath)`
`126`	`126`	`if pipelineFiles == nil \|\| len(pipelineFiles) == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ const (`
`25`	`25`
`26`	`26`	`dataStreamTypeLogs = "logs"`
`27`	`27`	`dataStreamTypeMetrics = "metrics"`
	`28`	`+ dataStreamTypeTraces = "traces"`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`// VarValue represents a variable value as defined in a package or data stream`
`@@ -248,5 +249,7 @@ func isDataStreamManifest(path string) (bool, error) {`
`248`	`249`	`if err != nil {`
`249`	`250`	`return false, errors.Wrapf(err, "reading package manifest failed (path: %s)", path)`
`250`	`251`	`}`
`251`		`- return m.Title != "" && (m.Type == dataStreamTypeLogs \|\| m.Type == dataStreamTypeMetrics), nil`
	`252`	`+ return m.Title != "" &&`
	`253`	`+ (m.Type == dataStreamTypeLogs \|\| m.Type == dataStreamTypeMetrics \|\| m.Type == dataStreamTypeTraces),`
	`254`	`+ nil`
`252`	`255`	`}`