diff --git a/committed.toml b/committed.toml index d6c3ede..ccab6a9 100644 --- a/committed.toml +++ b/committed.toml @@ -1,24 +1,25 @@ -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 # 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 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..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 @@ -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 ("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. + # 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