Skip to content

Commit d1135ca

Browse files
yurishkurosongy23
andauthored
[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 <[email protected]> Co-authored-by: Yang Song <[email protected]>
1 parent a8821cd commit d1135ca

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: jaegerreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove ineffectual warning from jaegerreceiver
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [35894]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

receiver/jaegerreceiver/factory.go

-12
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package jaegerreceiver // import "github.com/open-telemetry/opentelemetry-collec
77

88
import (
99
"context"
10-
"sync"
1110

1211
"go.opentelemetry.io/collector/component"
1312
"go.opentelemetry.io/collector/config/configgrpc"
@@ -16,7 +15,6 @@ import (
1615
"go.opentelemetry.io/collector/consumer"
1716
"go.opentelemetry.io/collector/featuregate"
1817
"go.opentelemetry.io/collector/receiver"
19-
"go.uber.org/zap"
2018

2119
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
2220
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/metadata"
@@ -42,14 +40,6 @@ var disableJaegerReceiverRemoteSampling = featuregate.GlobalRegistry().MustRegis
4240
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."),
4341
)
4442

45-
var once sync.Once
46-
47-
func logDeprecation(logger *zap.Logger) {
48-
once.Do(func() {
49-
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.")
50-
})
51-
}
52-
5343
// NewFactory creates a new Jaeger receiver factory.
5444
func NewFactory() receiver.Factory {
5545
return receiver.NewFactory(
@@ -90,8 +80,6 @@ func createTracesReceiver(
9080
cfg component.Config,
9181
nextConsumer consumer.Traces,
9282
) (receiver.Traces, error) {
93-
logDeprecation(set.Logger)
94-
9583
// Convert settings in the source config to configuration struct
9684
// that Jaeger receiver understands.
9785
// Error handling for the conversion is done in the Validate function from the Config object itself.

receiver/jaegerreceiver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ require (
2727
go.opentelemetry.io/collector/semconv v0.115.1-0.20241206185113-3f3e208e71b8
2828
go.uber.org/goleak v1.3.0
2929
go.uber.org/multierr v1.11.0
30-
go.uber.org/zap v1.27.0
3130
google.golang.org/grpc v1.68.1
3231
)
3332

@@ -76,6 +75,7 @@ require (
7675
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
7776
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
7877
go.opentelemetry.io/otel/trace v1.32.0 // indirect
78+
go.uber.org/zap v1.27.0 // indirect
7979
golang.org/x/net v0.31.0 // indirect
8080
golang.org/x/sys v0.28.0 // indirect
8181
golang.org/x/text v0.21.0 // indirect

0 commit comments

Comments
 (0)