From 711b9fed715a707bb5684e1eead85c0e360d649a Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 1 Aug 2024 01:21:34 -0700 Subject: [PATCH 1/2] deprecate jaegergrpc --- CHANGELOG.md | 4 ++++ internal/signalfx-agent/pkg/monitors/jaegergrpc/metadata.yaml | 3 +++ internal/signalfx-agent/pkg/monitors/jaegergrpc/monitor.go | 1 + 3 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4be08730a..105815be31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### 🚩Deprecations 🚩 + +- (Splunk) Deprecate the jaegergrpc monitor ([#](https://github.com/signalfx/splunk-otel-collector/pull/)) + ## v0.110.0 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.110.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.110.0) and the [opentelemetry-collector-contrib v0.110.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.110.0) releases where appropriate. diff --git a/internal/signalfx-agent/pkg/monitors/jaegergrpc/metadata.yaml b/internal/signalfx-agent/pkg/monitors/jaegergrpc/metadata.yaml index 77671dc68b..d78cfa92fa 100644 --- a/internal/signalfx-agent/pkg/monitors/jaegergrpc/metadata.yaml +++ b/internal/signalfx-agent/pkg/monitors/jaegergrpc/metadata.yaml @@ -1,6 +1,9 @@ monitors: - dimensions: doc: | + The jaegergrpc monitor is deprecated and will be removed in a future release. + Use the jaegerreceiver instead. + Runs a GRPC server that listens for Jaeger trace batches and forwards them to SignalFx (or the configured ingest host in the `writer` section of the agent config). By default, the server listens on diff --git a/internal/signalfx-agent/pkg/monitors/jaegergrpc/monitor.go b/internal/signalfx-agent/pkg/monitors/jaegergrpc/monitor.go index 25abfd592c..fc6a46399b 100644 --- a/internal/signalfx-agent/pkg/monitors/jaegergrpc/monitor.go +++ b/internal/signalfx-agent/pkg/monitors/jaegergrpc/monitor.go @@ -144,6 +144,7 @@ func (m *Monitor) setupListener(ctx context.Context, conf *Config) (net.Listener // Configure the monitor and kick off volume metric syncing func (m *Monitor) Configure(conf *Config) error { m.logger = utils.NewThrottledLogger(log.WithFields(log.Fields{"monitorType": monitorType, "monitorID": conf.MonitorID}), 30*time.Second) + m.logger.Warn("[NOTICE] The jaegergrpc monitor is deprecated and will be removed in a future release. Use the jaegerreceiver instead.") ctx, cancel := context.WithCancel(context.Background()) m.cancel = cancel From dd8a98f8df644d939d865392eeb79281baa048d6 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Sun, 29 Sep 2024 23:33:50 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 105815be31..48481e46ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### 🚩Deprecations 🚩 -- (Splunk) Deprecate the jaegergrpc monitor ([#](https://github.com/signalfx/splunk-otel-collector/pull/)) +- (Splunk) Deprecate the jaegergrpc monitor ([#5428](https://github.com/signalfx/splunk-otel-collector/pull/5428)) ## v0.110.0