Skip to content

Commit 0b10c79

Browse files
authored
Merge branch 'main' into renovate/github.com-alexkohler-prealloc-1.x
2 parents 266e48a + 8797cc5 commit 0b10c79

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove deprecated `service.noopTracerProvider` feature gate.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14374]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [user]

internal/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ require (
9696
github.com/firefart/nonamedreturns v1.0.6 // indirect
9797
github.com/fsnotify/fsnotify v1.9.0 // indirect
9898
github.com/fzipp/gocyclo v0.6.0 // indirect
99-
github.com/ghostiam/protogetter v0.3.17 // indirect
99+
github.com/ghostiam/protogetter v0.3.18 // indirect
100100
github.com/go-critic/go-critic v0.14.2 // indirect
101101
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
102102
github.com/go-git/go-billy/v5 v5.6.2 // indirect
103-
github.com/go-git/go-git/v5 v5.16.3 // indirect
103+
github.com/go-git/go-git/v5 v5.16.4 // indirect
104104
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b // indirect
105105
github.com/go-toolsmith/astcast v1.1.0 // indirect
106106
github.com/go-toolsmith/astcopy v1.1.0 // indirect

internal/tools/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

service/telemetry/otelconftelemetry/tracer.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@ import (
1919

2020
"go.opentelemetry.io/collector/component"
2121
"go.opentelemetry.io/collector/config/configtelemetry"
22-
"go.opentelemetry.io/collector/featuregate"
2322
"go.opentelemetry.io/collector/service/telemetry"
2423
)
2524

26-
var _ = featuregate.GlobalRegistry().MustRegister("service.noopTracerProvider",
27-
featuregate.StageDeprecated,
28-
featuregate.WithRegisterFromVersion("v0.107.0"),
29-
featuregate.WithRegisterToVersion("v0.109.0"),
30-
featuregate.WithRegisterDescription("Sets a Noop OpenTelemetry TracerProvider to reduce memory allocations. This featuregate is incompatible with the zPages extension."))
31-
3225
const (
3326
// supported trace propagators
3427
traceContextPropagator = "tracecontext"

0 commit comments

Comments
 (0)