Skip to content

Commit

Permalink
[jaegerreceiver] Remove ineffectual warning log (#36831)
Browse files Browse the repository at this point in the history
#### 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 <[email protected]>
Co-authored-by: Yang Song <[email protected]>
  • Loading branch information
yurishkuro and songy23 authored Dec 16, 2024
1 parent a8821cd commit d1135ca
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
27 changes: 27 additions & 0 deletions .chloggen/remove-jaegerreceiver-warning.yaml
Original file line number Diff line number Diff line change
@@ -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: []
12 changes: 0 additions & 12 deletions receiver/jaegerreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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(
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion receiver/jaegerreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d1135ca

Please sign in to comment.