Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

chore(appliance): split otel collector and agent#63989

Merged
craigfurman merged 1 commit into
mainfrom
appliance-split-otel-agent-collector
Jul 23, 2024
Merged

chore(appliance): split otel collector and agent#63989
craigfurman merged 1 commit into
mainfrom
appliance-split-otel-agent-collector

Conversation

@craigfurman

Copy link
Copy Markdown
Contributor

Relates to
https://linear.app/sourcegraph/issue/REL-81/service-definition-otel-collector but does not close it.

Some of the StandardConfig features (notably PodTemplateConfig) assume that there is only one pod template "thing" per service. The otel service contains an agent daemonset and a collector deployment, which have quite different characteristics. We're less likely to paint ourselves into a corner if we split these services at the config level.

testdata refactoring was done using:

find internal/appliance/reconciler/testdata/sg -name '*.yaml'  | xargs sed -Ei 's/openTelemetry:/openTelemetryAgent:/g'
find internal/appliance/reconciler/testdata/sg -name '*.yaml'  | xargs sed -Ei '/openTelemetryAgent:/i\  openTelemetryCollector:\n    disabled: true\n'
go test ./internal/appliance/reconciler -args appliance-update-golden-files

Test plan

Golden tests included. No behavioural changes are shown.

Changelog

Relates to
https://linear.app/sourcegraph/issue/REL-81/service-definition-otel-collector
but does not close it.

Some of the StandardConfig features (notably PodTemplateConfig) assume
that there is only one pod template "thing" per service. The otel
service contains an agent daemonset and a collector deployment, which
have quite different characteristics. We're less likely to paint
ourselves into a corner if we split these services at the config level.
@craigfurman craigfurman added the no-changelog Exclude this PR from the next changelog. label Jul 22, 2024
@cla-bot cla-bot Bot added the cla-signed label Jul 22, 2024
@craigfurman craigfurman requested review from a team, DaedalusG and jdpleiness and removed request for a team and DaedalusG July 22, 2024 15:44
@craigfurman craigfurman merged commit daae9ad into main Jul 23, 2024
@craigfurman craigfurman deleted the appliance-split-otel-agent-collector branch July 23, 2024 08:38
craigfurman pushed a commit that referenced this pull request Jul 31, 2024
Relates to

https://linear.app/sourcegraph/issue/REL-81/service-definition-otel-collector
but does not close it.

Some of the StandardConfig features (notably PodTemplateConfig) assume
that there is only one pod template "thing" per service. The otel
service contains an agent daemonset and a collector deployment, which
have quite different characteristics. We're less likely to paint
ourselves into a corner if we split these services at the config level.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed no-changelog Exclude this PR from the next changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants