Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[receiver/jaeger] mark featuregates as stable #27636

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .chloggen/codeboten_rm-deprecatedjaegermods.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: jaegerreceiver,jaegerremotesamplingextension

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: mark featuregates to replace Thrift-gen with Proto-gen types for sampling strategies as stable

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [27636]

# (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: |
The following featuregates are stable:
- extension.jaegerremotesampling.replaceThriftWithProto
- receiver.jaegerreceiver.replaceThriftWithProto

# 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: []

2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ extension/headerssetterextension/ @open-te
extension/healthcheckextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
extension/httpforwarder/ @open-telemetry/collector-contrib-approvers @atoulme @rmfitzpatrick
extension/jaegerremotesampling/ @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
extension/jaegerremotesampling/internal/jaegerremotesamplingdeprecated/ @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
extension/oauth2clientauthextension/ @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
extension/observer/ @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
extension/observer/dockerobserver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
Expand Down Expand Up @@ -221,7 +220,6 @@ receiver/httpcheckreceiver/ @open-te
receiver/iisreceiver/ @open-telemetry/collector-contrib-approvers @Mrod1598 @djaglowski
receiver/influxdbreceiver/ @open-telemetry/collector-contrib-approvers @jacobmarble
receiver/jaegerreceiver/ @open-telemetry/collector-contrib-approvers @jpkrohling
receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/ @open-telemetry/collector-contrib-approvers @jpkrohling
receiver/jmxreceiver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick
receiver/journaldreceiver/ @open-telemetry/collector-contrib-approvers @sumo-drosiek @djaglowski
receiver/k8sclusterreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth @povilasv
Expand Down
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ body:
- extension/healthcheck
- extension/httpforwarder
- extension/jaegerremotesampling
- extension/jaegerremotesampling/internal/jaegerremotesamplingdeprecated
- extension/oauth2clientauth
- extension/observer
- extension/observer/dockerobserver
Expand Down Expand Up @@ -209,7 +208,6 @@ body:
- receiver/iis
- receiver/influxdb
- receiver/jaeger
- receiver/jaeger/internal/jaegerreceiverdeprecated
- receiver/jmx
- receiver/journald
- receiver/k8scluster
Expand Down
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ body:
- extension/healthcheck
- extension/httpforwarder
- extension/jaegerremotesampling
- extension/jaegerremotesampling/internal/jaegerremotesamplingdeprecated
- extension/oauth2clientauth
- extension/observer
- extension/observer/dockerobserver
Expand Down Expand Up @@ -203,7 +202,6 @@ body:
- receiver/iis
- receiver/influxdb
- receiver/jaeger
- receiver/jaeger/internal/jaegerreceiverdeprecated
- receiver/jmx
- receiver/journald
- receiver/k8scluster
Expand Down
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ body:
- extension/healthcheck
- extension/httpforwarder
- extension/jaegerremotesampling
- extension/jaegerremotesampling/internal/jaegerremotesamplingdeprecated
- extension/oauth2clientauth
- extension/observer
- extension/observer/dockerobserver
Expand Down Expand Up @@ -203,7 +202,6 @@ body:
- receiver/iis
- receiver/influxdb
- receiver/jaeger
- receiver/jaeger/internal/jaegerreceiverdeprecated
- receiver/jmx
- receiver/journald
- receiver/k8scluster
Expand Down
2 changes: 1 addition & 1 deletion exporter/logzioexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ require (
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/logzioexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/pulsarexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ require (
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/pulsarexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/sapmexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ require (
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.15.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/sapmexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions extension/jaegerremotesampling/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@ import (
"go.opentelemetry.io/collector/featuregate"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling/internal/jaegerremotesamplingdeprecated"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling/internal/metadata"
)

// NewFactory creates a factory for the jaeger remote sampling extension.
func NewFactory() extension.Factory {
if !protoGate.IsEnabled() {
return jaegerremotesamplingdeprecated.NewFactory()
}

return extension.NewFactory(
metadata.Type,
createDefaultConfig,
Expand Down Expand Up @@ -56,14 +51,14 @@ func logDeprecation(logger *zap.Logger) {
})
}

const protoInsteadOfThrift = "extension.jaegerremotesampling.replaceThriftWithProto"

// nolint
var protoGate = featuregate.GlobalRegistry().MustRegister(
protoInsteadOfThrift,
featuregate.StageBeta,
"extension.jaegerremotesampling.replaceThriftWithProto",
featuregate.StageStable,
featuregate.WithRegisterDescription(
"When enabled, the jaegerremotesampling will use Proto-gen over Thrift-gen.",
),
featuregate.WithRegisterToVersion("0.92.0"),
)

func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) {
Expand Down
2 changes: 1 addition & 1 deletion extension/jaegerremotesampling/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.20
require (
github.com/fortytw2/leaktest v1.3.0
github.com/jaegertracing/jaeger v1.48.0
github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
github.com/tilinna/clock v1.1.0
go.opentelemetry.io/collector/component v0.90.2-0.20231201205146-6e2fdc755b34
Expand Down Expand Up @@ -53,6 +52,7 @@ require (
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.17.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading