Skip to content

Commit

Permalink
[connector/datadog] Remove feature gate connector.datadogconnector.pe…
Browse files Browse the repository at this point in the history
…rformance (#31770)

This restores
#31638.


#31638
was reverted initially because we thought it led to
#31663,
but it turns out
#31663
is still happening without
#31638
so it is probably a different issue. It should be safe to roll forward
#31638.

---------

Co-authored-by: Pablo Baeyens <[email protected]>
  • Loading branch information
songy23 and mx-psi authored Mar 15, 2024
1 parent 0d9b1b0 commit 8a29fa4
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 14 deletions.
27 changes: 27 additions & 0 deletions .chloggen/dd-feature-gate-removal.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: breaking

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove feature gate `connector.datadogconnector.performance`

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

# (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: []
8 changes: 0 additions & 8 deletions internal/datadog/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"github.com/DataDog/datadog-agent/pkg/trace/timing"
"github.com/DataDog/datadog-go/v5/statsd"
"github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/pdata/ptrace"
)

Expand All @@ -38,13 +37,6 @@ type TraceAgent struct {
exit chan struct{}
}

var _ = featuregate.GlobalRegistry().MustRegister(
"connector.datadogconnector.performance",
featuregate.StageStable,
featuregate.WithRegisterDescription("Datadog Connector will use optimized code"),
featuregate.WithRegisterToVersion("0.97.0"),
)

// newAgent creates a new unstarted traceagent using the given context. Call Start to start the traceagent.
// The out channel will receive outoing stats payloads resulting from spans ingested using the Ingest method.
func NewAgent(ctx context.Context, out chan *pb.StatsPayload, metricsClient statsd.ClientInterface, timingReporter timing.Reporter) *TraceAgent {
Expand Down
2 changes: 0 additions & 2 deletions internal/datadog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.4
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.96.1-0.20240306115632-b2693620eff6
go.opentelemetry.io/collector/featuregate v1.3.1-0.20240306115632-b2693620eff6
go.opentelemetry.io/collector/pdata v1.3.1-0.20240306115632-b2693620eff6
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/metric v1.24.0
Expand Down Expand Up @@ -46,7 +45,6 @@ require (
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
Expand Down
4 changes: 0 additions & 4 deletions internal/datadog/go.sum

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

0 comments on commit 8a29fa4

Please sign in to comment.