From d1135ca75d475da357e4a0dcc7cbcf7be5b2f5e8 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Mon, 16 Dec 2024 11:12:42 -0400 Subject: [PATCH] [jaegerreceiver] Remove ineffectual warning log (#36831) #### Description The remote sampling functionality has been already removed from `jaegerreceiver` in #14163. The logged warning has no impact or meaning. #### Link to tracking issue Fixes #35894 #### Testing CI --------- Signed-off-by: Yuri Shkuro Co-authored-by: Yang Song --- .chloggen/remove-jaegerreceiver-warning.yaml | 27 ++++++++++++++++++++ receiver/jaegerreceiver/factory.go | 12 --------- receiver/jaegerreceiver/go.mod | 2 +- 3 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 .chloggen/remove-jaegerreceiver-warning.yaml diff --git a/.chloggen/remove-jaegerreceiver-warning.yaml b/.chloggen/remove-jaegerreceiver-warning.yaml new file mode 100644 index 000000000000..e75c281831bf --- /dev/null +++ b/.chloggen/remove-jaegerreceiver-warning.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: jaegerreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove ineffectual warning from jaegerreceiver + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [35894] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 6409641fc85f..7519e9148fbc 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -7,7 +7,6 @@ package jaegerreceiver // import "github.com/open-telemetry/opentelemetry-collec import ( "context" - "sync" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" @@ -16,7 +15,6 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/receiver" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/metadata" @@ -42,14 +40,6 @@ var disableJaegerReceiverRemoteSampling = featuregate.GlobalRegistry().MustRegis featuregate.WithRegisterDescription("When enabled, the Jaeger Receiver will fail to start when it is configured with remote_sampling config. When disabled, the receiver will start and the remote_sampling config will be no-op."), ) -var once sync.Once - -func logDeprecation(logger *zap.Logger) { - once.Do(func() { - logger.Warn("jaeger receiver will deprecate Thrift-gen and replace it with Proto-gen to be compatbible to jaeger 1.42.0 and higher. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/18485 for more details.") - }) -} - // NewFactory creates a new Jaeger receiver factory. func NewFactory() receiver.Factory { return receiver.NewFactory( @@ -90,8 +80,6 @@ func createTracesReceiver( cfg component.Config, nextConsumer consumer.Traces, ) (receiver.Traces, error) { - logDeprecation(set.Logger) - // Convert settings in the source config to configuration struct // that Jaeger receiver understands. // Error handling for the conversion is done in the Validate function from the Config object itself. diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 2923c7a4d5aa..723a4a317e3c 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -27,7 +27,6 @@ require ( go.opentelemetry.io/collector/semconv v0.115.1-0.20241206185113-3f3e208e71b8 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 - go.uber.org/zap v1.27.0 google.golang.org/grpc v1.68.1 ) @@ -76,6 +75,7 @@ require ( go.opentelemetry.io/otel/sdk v1.32.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect go.opentelemetry.io/otel/trace v1.32.0 // indirect + go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.31.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect