feat(config): ConfigWatcher tracks HOCON include files#610
Open
dsudomoin wants to merge 11 commits intokora-projects:1.0from
Open
feat(config): ConfigWatcher tracks HOCON include files#610dsudomoin wants to merge 11 commits intokora-projects:1.0from
dsudomoin wants to merge 11 commits intokora-projects:1.0from
Conversation
… paths Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- ContainerConfigOrigin(List) now flattens nested containers (consistency with 2-arg constructor) - ConfigWatcher removes stale files from watch list after refresh - Add comment explaining "merge of" filter origin Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…ConfigFactory Move extractIncludedFiles, collectFileOrigins, enrichOriginWithIncludes from the interface to the factory class where they belong. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace config tree walking approach with TrackingConfigIncluder that intercepts include file() calls during HOCON parsing. This is more correct because: - Catches all includes, even empty files or overridden values - No fragile "merge of" string filtering - Uses the proper Typesafe Config extension point Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
… HoconConfigFactory Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…luder
Handle include "filename" (not just include file("...")) by resolving
the path via ConfigIncludeContext.relativeTo() and recording it if it
points to a file on disk.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
GoodforGod
added
improvement
Squiry
reviewed
Mar 26, 2026
| closeable.close(); | ||
| return ConfigFactory.parseFile(file.path().toFile()); | ||
| } else if (origin instanceof ContainerConfigOrigin container) { | ||
| for (var o : container.origins()) { |
Contributor
There was a problem hiding this comment.
classpath отвалится.
Это надо сделать так: ContainerConfigOrigin сделать интерфейсом и брать у него в вотчере список.
Для хокона сделать ConfigOrigin, который реализует этот интерфейс и имеет какой-то openInputStream или что-то такое, чтобы считать то, что является источником.
Author
There was a problem hiding this comment.
Поправил: ContainerConfigOrigin теперь интерфейс с origins(). Для HOCON сделал HoconConfigOrigin, который реализует его и имеет openInputStream() — работает и с файлами, и с classpath. applicationUnresolved() упрощён, больше нет pattern-matching по типам origin. TrackingConfigIncluder теперь фильтрует не-файлы через Files.isRegularFile().
Squiry
reviewed
Mar 26, 2026
| * <p> | ||
| * Delegates actual include resolution to the fallback (default) includer. | ||
| */ | ||
| final class TrackingConfigIncluder implements ConfigIncluder, ConfigIncluderFile { |
Contributor
There was a problem hiding this comment.
Тут кажется надо фильтрануть не файлы.
Author
There was a problem hiding this comment.
Добавил проверку Files.isRegularFile(path) в обоих методах include() и includeFile() — теперь classpath ресурсы, URL и несуществующие пути отсеиваются.
…, HoconConfigOrigin with openInputStream - Convert ContainerConfigOrigin from class to interface with origins() method - Add SimpleContainerConfigOrigin for general use (MergeConfigFactory) - Add HoconConfigOrigin implementing ContainerConfigOrigin with openInputStream() to support both file and classpath sources polymorphically - Simplify HoconConfigModule.applicationUnresolved() — no more pattern-matching on origin types, just uses HoconConfigOrigin.openInputStream() - Filter non-file includes in TrackingConfigIncluder (Files.isRegularFile check) to ignore classpath resources and non-existent paths Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
includedirectivesTrackingConfigIncluder(ConfigIncluder+ConfigIncluderFile) to intercept include calls during parsing and record file pathsinclude file("path")and heuristicinclude "name"(resolved viaConfigIncludeContext.relativeTo())ConfigFactory.parseReader()toConfigFactory.parseFile()/parseURL()for correct include resolutionMotivation
When
application.confincludes external files (e.g.include file("/opt/app/config/override.conf")), changes to those files were invisible to ConfigWatcher. This is a common pattern in Kubernetes whereapplication.confstays in resources and per-environment overrides are mounted separately.Changes
ContainerConfigOrigin— addedList<ConfigOrigin>constructor with nested container flatteningTrackingConfigIncluder— new class implementingConfigIncluder+ConfigIncluderFile, intercepts include calls and records file pathsHoconConfigFactory— addedparseAndEnrichOrigin()andenrichOriginWithIncludes()for building enrichedConfigOriginwith all discovered include filesHoconConfigModule—applicationConfigOrigin()usesHoconConfigFactory.parseAndEnrichOrigin();applicationUnresolved()usesparseFile()/parseURL()ConfigWatcher— recalculates watched files after each refreshTest plan
include file("...")— included file path recordedinclude file()(main → level1 → level2) — all paths recordedinclude "name"— resolved file path recorded🤖 Generated with Claude Code