diff --git a/docker/otel-collector/config.yaml b/docker/otel-collector/config.yaml index 19e006ac..cdcb2e97 100644 --- a/docker/otel-collector/config.yaml +++ b/docker/otel-collector/config.yaml @@ -63,6 +63,11 @@ processors: # Infer: else - set(log.severity_text, "info") where log.severity_number == 0 - set(log.severity_number, SEVERITY_NUMBER_INFO) where log.severity_number == 0 + - context: log + error_mode: ignore + statements: + # Normalize the severity_text case + - set(log.severity_text, ConvertCase(log.severity_text, "lower")) resourcedetection: detectors: - env diff --git a/smoke-tests/otel-collector/README.md b/smoke-tests/otel-collector/README.md index cb80376f..c34c5a8b 100644 --- a/smoke-tests/otel-collector/README.md +++ b/smoke-tests/otel-collector/README.md @@ -29,22 +29,29 @@ bats hdx-1453-auto-parse-json.bats ## Test Structure - `*.bats` - Test files written in Bats +- `setup_suite.bash` - Contains global setup_suite and teardown_suite functions that run once for the entire test suite - `data/` - Test data used by the tests - `test_helpers/` - Utility functions for the tests - `docker-compose.yaml` - Docker Compose configuration for the test environment +The test suite uses Bats' `setup_suite` and `teardown_suite` hooks to initialize the environment only once, regardless of how many test files are run. This optimizes test execution by: + +1. Validating the environment once +2. Starting Docker containers once at the beginning of the test suite +3. Cleaning up containers once at the end of the test suite + ## Debugging If you need to debug the tests, you can set the `SKIP_CLEANUP` environment variable to prevent the Docker containers from being torn down after the tests complete: ```bash -SKIP_CLEANUP=1 bats hdx-1453-auto-parse-json.bats +SKIP_CLEANUP=1 bats *.bats ``` or ```bash -SKIP_CLEANUP=true bats hdx-1453-auto-parse-json.bats +SKIP_CLEANUP=true bats *.bats ``` With `SKIP_CLEANUP` enabled, the test containers will remain running after the tests complete, allowing you to inspect logs, connect to the containers, and debug issues. diff --git a/smoke-tests/otel-collector/hdx-1453-auto-parse-json.bats b/smoke-tests/otel-collector/auto-parse-json.bats similarity index 57% rename from smoke-tests/otel-collector/hdx-1453-auto-parse-json.bats rename to smoke-tests/otel-collector/auto-parse-json.bats index b4f8401f..a4c346cb 100644 --- a/smoke-tests/otel-collector/hdx-1453-auto-parse-json.bats +++ b/smoke-tests/otel-collector/auto-parse-json.bats @@ -3,29 +3,19 @@ load 'test_helpers/utilities.bash' load 'test_helpers/assertions.bash' -setup_file() { - validate_env - docker compose up --build --detach - wait_for_ready "otel-collector" -} - -teardown_file() { - attempt_env_cleanup -} - -@test "JSON string body content should be parsed and stored as log attributes" { +@test "HDX-1453: JSON string body content should be parsed and stored as log attributes" { emit_otel_data "http://localhost:4318" "data/auto-parse/json-string" sleep 1 assert_test_data "data/auto-parse/json-string" } -@test "OTEL map content should be stored as log attributes" { +@test "HDX-1453: OTEL map content should be stored as log attributes" { emit_otel_data "http://localhost:4318" "data/auto-parse/otel-map" sleep 1 assert_test_data "data/auto-parse/otel-map" } -@test "all other content should skip storing values in log attributes" { +@test "HDX-1453: all other content should skip storing values in log attributes" { emit_otel_data "http://localhost:4318" "data/auto-parse/default" sleep 1 assert_test_data "data/auto-parse/default" diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/assert_query.sql deleted file mode 100644 index 3d3ebf07..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'infer-debug' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/assert_query.sql deleted file mode 100644 index e52bed26..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'infer-error' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/assert_query.sql deleted file mode 100644 index 05159d9e..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'infer-fatal' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/assert_query.sql deleted file mode 100644 index aedc999d..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'infer-info' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/assert_query.sql deleted file mode 100644 index 1e258bac..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'infer-trace' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/assert_query.sql deleted file mode 100644 index 9b2d8ba4..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'infer-warn' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/assert_query.sql b/smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/assert_query.sql deleted file mode 100644 index 1f70446f..00000000 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'hdx-1514' AND ResourceAttributes['test-id'] = 'skip-infer' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/normalize-severity/text-case/assert_query.sql b/smoke-tests/otel-collector/data/normalize-severity/text-case/assert_query.sql new file mode 100644 index 00000000..f1524232 --- /dev/null +++ b/smoke-tests/otel-collector/data/normalize-severity/text-case/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'normalize-severity' AND ResourceAttributes['test-id'] = 'text-case' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/normalize-severity/text-case/expected.snap b/smoke-tests/otel-collector/data/normalize-severity/text-case/expected.snap new file mode 100644 index 00000000..d3c1c1ac --- /dev/null +++ b/smoke-tests/otel-collector/data/normalize-severity/text-case/expected.snap @@ -0,0 +1,22 @@ +"trace" +"trace" +"trace" +"debug" +"debug" +"debug" +"info" +"info" +"info" +"warn" +"warn" +"warn" +"warning" +"warning" +"error" +"error" +"error" +"fatal" +"fatal" +"fatal" +"critical" +"critical" \ No newline at end of file diff --git a/smoke-tests/otel-collector/data/normalize-severity/text-case/input.json b/smoke-tests/otel-collector/data/normalize-severity/text-case/input.json new file mode 100644 index 00000000..0e24a989 --- /dev/null +++ b/smoke-tests/otel-collector/data/normalize-severity/text-case/input.json @@ -0,0 +1,205 @@ +{ + "resourceLogs": [ + { + "resource": { + "attributes": [ + { + "key": "suite-id", + "value": { + "stringValue": "normalize-severity" + } + }, + { + "key": "test-id", + "value": { + "stringValue": "text-case" + } + } + ] + }, + "scopeLogs": [ + { + "scope": {}, + "logRecords": [ + { + "timeUnixNano": "1901999580000000000", + "severity_number": 1, + "severity_text": "TrAcE", + "body": { + "stringValue": "trace log message" + } + }, + { + "timeUnixNano": "1901999580000000001", + "severity_number": 1, + "severity_text": "trace", + "body": { + "stringValue": "trace log message" + } + }, + { + "timeUnixNano": "1901999580000000002", + "severity_number": 1, + "severity_text": "TRACE", + "body": { + "stringValue": "trace log message" + } + }, + { + "timeUnixNano": "1901999580000000003", + "severity_number": 5, + "severity_text": "DeBuG", + "body": { + "stringValue": "debug log message" + } + }, + { + "timeUnixNano": "1901999580000000004", + "severity_number": 5, + "severity_text": "debug", + "body": { + "stringValue": "debug log message" + } + }, + { + "timeUnixNano": "1901999580000000005", + "severity_number": 5, + "severity_text": "DEBUG", + "body": { + "stringValue": "debug log message" + } + }, + { + "timeUnixNano": "1901999580000000006", + "severity_number": 9, + "severity_text": "InFo", + "body": { + "stringValue": "info log message" + } + }, + { + "timeUnixNano": "1901999580000000007", + "severity_number": 9, + "severity_text": "info", + "body": { + "stringValue": "info log message" + } + }, + { + "timeUnixNano": "1901999580000000008", + "severity_number": 9, + "severity_text": "INFO", + "body": { + "stringValue": "info log message" + } + }, + { + "timeUnixNano": "1901999580000000009", + "severity_number": 13, + "severity_text": "WaRn", + "body": { + "stringValue": "warn log message" + } + }, + { + "timeUnixNano": "1901999580000000010", + "severity_number": 13, + "severity_text": "warn", + "body": { + "stringValue": "warn log message" + } + }, + { + "timeUnixNano": "1901999580000000011", + "severity_number": 13, + "severity_text": "WARN", + "body": { + "stringValue": "warn log message" + } + }, + { + "timeUnixNano": "1901999580000000012", + "severity_number": 13, + "severity_text": "warning", + "body": { + "stringValue": "warn log message" + } + }, + { + "timeUnixNano": "1901999580000000013", + "severity_number": 13, + "severity_text": "WARNING", + "body": { + "stringValue": "warn log message" + } + }, + { + "timeUnixNano": "1901999580000000014", + "severity_number": 17, + "severity_text": "ErRoR", + "body": { + "stringValue": "error log message" + } + }, + { + "timeUnixNano": "1901999580000000015", + "severity_number": 17, + "severity_text": "error", + "body": { + "stringValue": "error log message" + } + }, + { + "timeUnixNano": "1901999580000000016", + "severity_number": 17, + "severity_text": "ERROR", + "body": { + "stringValue": "error log message" + } + }, + { + "timeUnixNano": "1901999580000000017", + "severity_number": 21, + "severity_text": "FaTaL", + "body": { + "stringValue": "fatal log message" + } + }, + { + "timeUnixNano": "1901999580000000018", + "severity_number": 21, + "severity_text": "fatal", + "body": { + "stringValue": "fatal log message" + } + }, + { + "timeUnixNano": "1901999580000000019", + "severity_number": 21, + "severity_text": "FATAL", + "body": { + "stringValue": "fatal log message" + } + }, + { + "timeUnixNano": "1901999580000000020", + "severity_number": 21, + "severity_text": "critical", + "body": { + "stringValue": "fatal log message" + } + }, + { + "timeUnixNano": "1901999580000000021", + "severity_number": 21, + "severity_text": "CRITICAL", + "body": { + "stringValue": "fatal log message" + } + } + ] + } + ] + } + ] +} diff --git a/smoke-tests/otel-collector/data/severity-inference/infer-debug/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/infer-debug/assert_query.sql new file mode 100644 index 00000000..37fc65a0 --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/infer-debug/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'infer-debug' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/expected.snap b/smoke-tests/otel-collector/data/severity-inference/infer-debug/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/infer-debug/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/input.json b/smoke-tests/otel-collector/data/severity-inference/infer-debug/input.json similarity index 94% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/input.json rename to smoke-tests/otel-collector/data/severity-inference/infer-debug/input.json index 1a74d7c6..934cc54d 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-debug/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/infer-debug/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/data/severity-inference/infer-error/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/infer-error/assert_query.sql new file mode 100644 index 00000000..b8a32fa1 --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/infer-error/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'infer-error' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/expected.snap b/smoke-tests/otel-collector/data/severity-inference/infer-error/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/infer-error/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/input.json b/smoke-tests/otel-collector/data/severity-inference/infer-error/input.json similarity index 94% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/input.json rename to smoke-tests/otel-collector/data/severity-inference/infer-error/input.json index 6f72ffd4..c73ed3ac 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-error/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/infer-error/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/data/severity-inference/infer-fatal/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/infer-fatal/assert_query.sql new file mode 100644 index 00000000..81137c7a --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/infer-fatal/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'infer-fatal' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/expected.snap b/smoke-tests/otel-collector/data/severity-inference/infer-fatal/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/infer-fatal/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/input.json b/smoke-tests/otel-collector/data/severity-inference/infer-fatal/input.json similarity index 96% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/input.json rename to smoke-tests/otel-collector/data/severity-inference/infer-fatal/input.json index 7f7c29df..3085f1c1 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-fatal/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/infer-fatal/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/data/severity-inference/infer-info/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/infer-info/assert_query.sql new file mode 100644 index 00000000..cc77ad84 --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/infer-info/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'infer-info' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/expected.snap b/smoke-tests/otel-collector/data/severity-inference/infer-info/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/infer-info/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/input.json b/smoke-tests/otel-collector/data/severity-inference/infer-info/input.json similarity index 95% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/input.json rename to smoke-tests/otel-collector/data/severity-inference/infer-info/input.json index a7896032..8ee4b96b 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-info/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/infer-info/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/data/severity-inference/infer-trace/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/infer-trace/assert_query.sql new file mode 100644 index 00000000..702238aa --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/infer-trace/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'infer-trace' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/expected.snap b/smoke-tests/otel-collector/data/severity-inference/infer-trace/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/infer-trace/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/input.json b/smoke-tests/otel-collector/data/severity-inference/infer-trace/input.json similarity index 92% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/input.json rename to smoke-tests/otel-collector/data/severity-inference/infer-trace/input.json index 2ebcbba6..3d564d7f 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-trace/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/infer-trace/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/data/severity-inference/infer-warn/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/infer-warn/assert_query.sql new file mode 100644 index 00000000..6568fcd0 --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/infer-warn/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'infer-warn' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/expected.snap b/smoke-tests/otel-collector/data/severity-inference/infer-warn/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/infer-warn/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/input.json b/smoke-tests/otel-collector/data/severity-inference/infer-warn/input.json similarity index 94% rename from smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/input.json rename to smoke-tests/otel-collector/data/severity-inference/infer-warn/input.json index 190a2ee9..8fd73984 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/infer-warn/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/infer-warn/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/data/severity-inference/skip-infer/assert_query.sql b/smoke-tests/otel-collector/data/severity-inference/skip-infer/assert_query.sql new file mode 100644 index 00000000..d1ce54c4 --- /dev/null +++ b/smoke-tests/otel-collector/data/severity-inference/skip-infer/assert_query.sql @@ -0,0 +1 @@ +SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'severity-inference' AND ResourceAttributes['test-id'] = 'skip-infer' ORDER BY TimestampTime FORMAT CSV diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/expected.snap b/smoke-tests/otel-collector/data/severity-inference/skip-infer/expected.snap similarity index 100% rename from smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/expected.snap rename to smoke-tests/otel-collector/data/severity-inference/skip-infer/expected.snap diff --git a/smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/input.json b/smoke-tests/otel-collector/data/severity-inference/skip-infer/input.json similarity index 95% rename from smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/input.json rename to smoke-tests/otel-collector/data/severity-inference/skip-infer/input.json index 83735565..fd49bcaf 100644 --- a/smoke-tests/otel-collector/data/hdx-1514-inference/skip-infer/input.json +++ b/smoke-tests/otel-collector/data/severity-inference/skip-infer/input.json @@ -6,7 +6,7 @@ { "key": "suite-id", "value": { - "stringValue": "hdx-1514" + "stringValue": "severity-inference" } }, { diff --git a/smoke-tests/otel-collector/hdx-1514-inference.bats b/smoke-tests/otel-collector/hdx-1514-inference.bats deleted file mode 100644 index 5005620d..00000000 --- a/smoke-tests/otel-collector/hdx-1514-inference.bats +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bats - -load 'test_helpers/utilities.bash' -load 'test_helpers/assertions.bash' - -setup_file() { - validate_env - docker compose up --build --detach - wait_for_ready "otel-collector" -} - -teardown_file() { - attempt_env_cleanup -} - -@test "should infer fatal log level" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/infer-fatal" - sleep 1 - assert_test_data "data/hdx-1514-inference/infer-fatal" -} - -@test "should infer error log level" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/infer-error" - sleep 1 - assert_test_data "data/hdx-1514-inference/infer-error" -} - -@test "should infer warn log level" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/infer-warn" - sleep 1 - assert_test_data "data/hdx-1514-inference/infer-warn" -} - -@test "should infer debug log level" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/infer-debug" - sleep 1 - assert_test_data "data/hdx-1514-inference/infer-debug" -} - -@test "should infer trace log level" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/infer-trace" - sleep 1 - assert_test_data "data/hdx-1514-inference/infer-trace" -} - -@test "should infer info log level" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/infer-info" - sleep 1 - assert_test_data "data/hdx-1514-inference/infer-info" -} - -@test "should skip inference if severity values are defined on the input" { - emit_otel_data "http://localhost:4318" "data/hdx-1514-inference/skip-infer" - sleep 1 - assert_test_data "data/hdx-1514-inference/skip-infer" -} diff --git a/smoke-tests/otel-collector/normalize-severity.bats b/smoke-tests/otel-collector/normalize-severity.bats new file mode 100644 index 00000000..be59c510 --- /dev/null +++ b/smoke-tests/otel-collector/normalize-severity.bats @@ -0,0 +1,10 @@ +#!/usr/bin/env bats + +load 'test_helpers/utilities.bash' +load 'test_helpers/assertions.bash' + +@test "HDX-1422: normalize the text case for severity text" { + emit_otel_data "http://localhost:4318" "data/normalize-severity/text-case" + sleep 1 + assert_test_data "data/normalize-severity/text-case" +} \ No newline at end of file diff --git a/smoke-tests/otel-collector/setup_suite.bash b/smoke-tests/otel-collector/setup_suite.bash new file mode 100644 index 00000000..783e1966 --- /dev/null +++ b/smoke-tests/otel-collector/setup_suite.bash @@ -0,0 +1,14 @@ +#!/usr/bin/env bats + +load 'test_helpers/utilities.bash' +load 'test_helpers/assertions.bash' + +setup_suite() { + validate_env + docker compose up --build --detach + wait_for_ready "otel-collector" +} + +teardown_suite() { + attempt_env_cleanup +} \ No newline at end of file diff --git a/smoke-tests/otel-collector/severity-inference.bats b/smoke-tests/otel-collector/severity-inference.bats new file mode 100644 index 00000000..ba4c3288 --- /dev/null +++ b/smoke-tests/otel-collector/severity-inference.bats @@ -0,0 +1,46 @@ +#!/usr/bin/env bats + +load 'test_helpers/utilities.bash' +load 'test_helpers/assertions.bash' + +@test "HDX-1514: should infer fatal log level" { + emit_otel_data "http://localhost:4318" "data/severity-inference/infer-fatal" + sleep 1 + assert_test_data "data/severity-inference/infer-fatal" +} + +@test "HDX-1514: should infer error log level" { + emit_otel_data "http://localhost:4318" "data/severity-inference/infer-error" + sleep 1 + assert_test_data "data/severity-inference/infer-error" +} + +@test "HDX-1514: should infer warn log level" { + emit_otel_data "http://localhost:4318" "data/severity-inference/infer-warn" + sleep 1 + assert_test_data "data/severity-inference/infer-warn" +} + +@test "HDX-1514: should infer debug log level" { + emit_otel_data "http://localhost:4318" "data/severity-inference/infer-debug" + sleep 1 + assert_test_data "data/severity-inference/infer-debug" +} + +@test "HDX-1514: should infer trace log level" { + emit_otel_data "http://localhost:4318" "data/severity-inference/infer-trace" + sleep 1 + assert_test_data "data/severity-inference/infer-trace" +} + +@test "HDX-1514: should infer info log level" { + emit_otel_data "http://localhost:4318" "data/severity-inference/infer-info" + sleep 1 + assert_test_data "data/severity-inference/infer-info" +} + +@test "HDX-1514: should skip inference if severity values are defined on the input" { + emit_otel_data "http://localhost:4318" "data/severity-inference/skip-infer" + sleep 1 + assert_test_data "data/severity-inference/skip-infer" +}