geolocation: remove CLI flags for targets, parents, and allowed keys#3462
Merged
geolocation: remove CLI flags for targets, parents, and allowed keys#3462
Conversation
bf4c6d8 to
2ead31a
Compare
nikw9944
approved these changes
Apr 6, 2026
Contributor
nikw9944
left a comment
There was a problem hiding this comment.
Review Summary
Clean removal of CLI override flags (--additional-parent, --additional-targets, --additional-icmp-targets, --allowed-pubkeys, --additional-child-probes) from the geoprobe-agent and telemetry-agent, shifting all configuration to onchain state via parent and target discovery.
The PR is well-scoped: 17 files changed, ~1087 lines removed, ~123 added. All references to the removed flags, struct fields (CLIParents, CLITargets, CLIIcmpTargets, CLIAllowedKeys, InitialChildGeoProbes, InitialProbes), parsing functions (parseParentDZD, parseAllowedPubkeys, ParseProbeAddresses, ParseICMPProbeAddresses), and merge helpers (mergeProbes, mergeKeys) are fully cleaned up — no stale references remain.
Verification
- All tests pass:
geoprobe-agent(0.28s),geoprobeinternal (105s),telemetry(9.1s) - Both binaries compile cleanly
- Grep across the telemetry tree confirms zero remaining references to any removed identifiers
Notes
- The signed TWAMP reflector now starts with
nilauthorized keys and gets populated solely viaSetAuthorizedKeysfrom the target discovery channel — this is correct since the reflector'sLinuxReflectorhandles nil gracefully. - The
collector.gosimplification (gating geoprobe coordinator onGeolocationClient != nilinstead of also checkingInitialChildGeoProbes) is a clean consequence of the removal and correctly flattens the previously nested conditional. - Test updates properly adapt to the new initialization model (e.g.,
TestCoordinator_HandleProbeUpdate_Removenow seeds probes viahandleProbeUpdateinstead ofInitialProbes). - CHANGELOG entry is accurate and complete.
No issues found.
2ead31a to
ffaa31b
Compare
Remove --additional-parent, --additional-targets, --additional-icmp-targets, and --allowed-pubkeys from geoprobe-agent, and --additional-child-probes from telemetry-agent. All configuration now comes from onchain state.
ffaa31b to
4d5b0fe
Compare
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
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.
Resolves: #3453
Summary of Changes
--additional-parent,--additional-targets,--additional-icmp-targets,--allowed-pubkeysfrom geoprobe-agent now that onchain configuration is working--additional-child-probesfrom telemetry-agentParseProbeAddressesandParseICMPProbeAddresses(no longer needed)Depends on: #3454 (e2e container refactoring). The
e2e/geoprobe_test.gofile is taken from #3454's head to avoid conflicts at merge time.Diff Breakdown
Heavily deletion-weighted: removes ~800 lines of CLI plumbing and merge logic that onchain discovery makes unnecessary.
Key files (click to expand)
controlplane/telemetry/cmd/geoprobe-agent/main.go— removed 4 flag defs,parentDZDstruct, parse helpers, all CLI wiringcontrolplane/telemetry/internal/geoprobe/address.go— removedParseProbeAddresses,ParseICMPProbeAddressescontrolplane/telemetry/internal/geoprobe/target_discovery.go— removed CLI fields from config/struct, removedmergeKeys, simplifieddiscover()controlplane/telemetry/internal/geoprobe/onchain_discovery.go— removedCLIParents, CLI merge logic, renamedcliOnlyUpdate→emptyUpdatecontrolplane/telemetry/internal/geoprobe/discovery.go— removedInitialProbes,mergeProbescontrolplane/telemetry/internal/telemetry/collector.go— simplified geoprobe init toGeolocationClient != nilcontrolplane/telemetry/cmd/telemetry/main.go— removed--additional-child-probesflag and parsingTesting Verification
geoprobeandtelemetrypackages (including updated tests for discovery, coordinator, config validation)TestE2E_GeoprobeOnchainTargetspasses end-to-end (parent discovery, outbound TWAMP + ICMP measurement, inbound signed TWAMP probing) with onchain-only configuration-tags e2e