From 1bf646623578f45ef871edc680f7428befde2f55 Mon Sep 17 00:00:00 2001
From: Jesse Szwedko <jesse@szwedko.me>
Date: Sat, 17 Oct 2020 13:39:06 -0400
Subject: [PATCH] chore(ci): Add transforms-metric_to_log transform dependency
 to sink-humio

Given that the humio metrics sink depends on the log_to_metric
transform.

Also fix Makefile to run humio integration tests. I couldn't find a good
way to use a wildcard for the module (like
"::humio::*::integration_tests") so I just did the logs submodule for
now. It seems like there are plans to add regex support for test
filters: https://github.com/rust-lang/rust/issues/53278

Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
---
 Cargo.toml | 2 +-
 Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 37f26875b688d..595a720817844 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -430,7 +430,7 @@ sinks-file = []
 sinks-gcp = ["base64", "bytesize", "goauth", "smpl_jwt"]
 sinks-honeycomb = ["bytesize"]
 sinks-http = ["bytesize"]
-sinks-humio = ["sinks-splunk_hec"]
+sinks-humio = ["transforms-metric_to_log", "sinks-splunk_hec"]
 sinks-influxdb = ["bytesize"]
 sinks-kafka = []
 sinks-logdna = ["bytesize"]
diff --git a/Makefile b/Makefile
index edd7e37fb01bf..56a70a66b41b2 100644
--- a/Makefile
+++ b/Makefile
@@ -488,7 +488,7 @@ ifeq ($(AUTOSPAWN), true)
 	$(MAKE) start-integration-humio
 	sleep 10 # Many services are very slow... Give them a sec..
 endif
-	${MAYBE_ENVIRONMENT_EXEC} cargo test --no-fail-fast --no-default-features --features humio-integration-tests --lib ::humio_logs::integration_tests:: -- --nocapture
+	${MAYBE_ENVIRONMENT_EXEC} cargo test --no-fail-fast --no-default-features --features humio-integration-tests --lib "::humio::.*::integration_tests::" -- --nocapture
 ifeq ($(AUTODESPAWN), true)
 	$(MAKE) -k stop-integration-humio
 endif