From b34595b35938d462baed49d9f3eb48c810a27378 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 11 Aug 2026 19:10:52 +0200 Subject: [PATCH 1/4] feat(run-integration-test/kustomize): Recombine multi-line exception logs --- .../opentelemetrycollector.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml b/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml index 2fa557e..4e4035c 100644 --- a/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml +++ b/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml @@ -57,6 +57,21 @@ spec: type: container format: containerd add_metadata_from_filepath: true + # Recombine multi-line application output (eg: Java stack traces). The container + # runtime writes one physical line per CRI entry, so a stack trace arrives as many + # separate log records. Here a new record starts at column 0 (non-whitespace); + # indented continuation lines ("\tat ...", "\t... N more", "\tSuppressed:") plus the + # column-0 "Caused by:" lines are appended to it. Keying on indentation keeps this + # robust across Java versions/loggers. Runs before the format parsers below, so normal + # single-line logs (each starting at column 0) are emitted unchanged. + # NOTE: a leading log line that introduces the exception (eg: "... ERROR Foo - msg") + # stays as its own record; add your log-line start pattern to is_first_entry to merge + # it too, but that reintroduces log-format coupling this deliberately avoids. + - id: recombine-multiline + type: recombine + combine_field: body + source_identifier: 'attributes["log.file.path"]' + is_first_entry: 'body matches "^\\S" and not (body matches "^Caused by:")' - id: klog-parser type: regex_parser on_error: send_quiet From 53c2ad2341d649f1e9448a2eae68ab8f386c1c84 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 11 Aug 2026 19:14:37 +0200 Subject: [PATCH 2/4] chore: Loosen the PR title length --- committed.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/committed.toml b/committed.toml index d6c3ede..cb7ea2a 100644 --- a/committed.toml +++ b/committed.toml @@ -1,4 +1,4 @@ -subject_length = 65 +subject_length = 100 style = "conventional" allowed_types = ["refactor", "chore", "feat", "docs", "fix", "ci"] # Generated using `cargo boil image list --pretty never | jq 'keys'` + boil, patchable From 84adf44e06d7ed3ee2729b56cb3c096effcf3942 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 12 Aug 2026 11:19:43 +0200 Subject: [PATCH 3/4] chore: Disabling allowed_scopes for now It isn't flexible enough yet. --- committed.toml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/committed.toml b/committed.toml index cb7ea2a..ccab6a9 100644 --- a/committed.toml +++ b/committed.toml @@ -3,22 +3,23 @@ style = "conventional" allowed_types = ["refactor", "chore", "feat", "docs", "fix", "ci"] # Generated using `cargo boil image list --pretty never | jq 'keys'` + boil, patchable # start:scopes: autogenerated by .scripts/local/update_allowed_scopes.sh -allowed_scopes = [ - "build-container-image", - "build-product-image", - "check-pr-title", - "detect-changes", - "free-disk-space", - "publish-helm-chart", - "publish-image", - "publish-image-index-manifest", - "run-integration-test", - "run-openshift-preflight", - "run-pre-commit", - "run-prek", - "send-slack-notification", - "setup-k8s-tools", - "setup-tools", - "shard", -] +# Disabling for onw until we can allow '/*' +# allowed_scopes = [ +# "build-container-image", +# "build-product-image", +# "check-pr-title", +# "detect-changes", +# "free-disk-space", +# "publish-helm-chart", +# "publish-image", +# "publish-image-index-manifest", +# "run-integration-test", +# "run-openshift-preflight", +# "run-pre-commit", +# "run-prek", +# "send-slack-notification", +# "setup-k8s-tools", +# "setup-tools", +# "shard", +# ] # end:scopes From 8c39e335380d7460fc499e622f74530d5f52680a Mon Sep 17 00:00:00 2001 From: Nick <10092581+NickLarsenNZ@users.noreply.github.com> Date: Wed, 12 Aug 2026 11:35:18 +0200 Subject: [PATCH 4/4] Update run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml --- .../container-log-scrape/opentelemetrycollector.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml b/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml index 4e4035c..695ca81 100644 --- a/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml +++ b/run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml @@ -60,7 +60,7 @@ spec: # Recombine multi-line application output (eg: Java stack traces). The container # runtime writes one physical line per CRI entry, so a stack trace arrives as many # separate log records. Here a new record starts at column 0 (non-whitespace); - # indented continuation lines ("\tat ...", "\t... N more", "\tSuppressed:") plus the + # indented continuation lines ("at ...", "... N more", "Suppressed:") plus the # column-0 "Caused by:" lines are appended to it. Keying on indentation keeps this # robust across Java versions/loggers. Runs before the format parsers below, so normal # single-line logs (each starting at column 0) are emitted unchanged.