Skip to content

Commit 79b876b

Browse files
authored
Merge branch 'main' into mx-psi/rfc-feature-gates
2 parents e2a3ae2 + 0550b08 commit 79b876b

File tree

161 files changed

+1137
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+1137
-267
lines changed

.chloggen/add-metrics-scraper.yaml

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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/scraperhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Introduce `AddMetricsScraper` to be more explicit than `AddScraper`.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14428]
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: [api]
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: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/scraperhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Deprecate the `AddScraper` method.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14428]
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: [api]
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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix reference count bug in partition batcher
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14444]
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]
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: receiver/otlp
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add metrics tracking the number of receiver, refused and failed profile samples
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14226]
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: [api]
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/receiverhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add support for profile samples metrics
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14226]
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: [api]
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: cmd/mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Validate stability level for entities
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14425]
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: []

cmd/mdatagen/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
go.opentelemetry.io/collector/connector/connectortest v0.143.0
1515
go.opentelemetry.io/collector/consumer v1.49.0
1616
go.opentelemetry.io/collector/consumer/consumertest v0.143.0
17+
go.opentelemetry.io/collector/featuregate v1.49.0
1718
go.opentelemetry.io/collector/filter v0.143.0
1819
go.opentelemetry.io/collector/pdata v1.49.0
1920
go.opentelemetry.io/collector/pdata/xpdata v0.143.0
@@ -40,7 +41,7 @@ require (
4041
github.com/davecgh/go-spew v1.1.1 // indirect
4142
github.com/go-logr/logr v1.4.3 // indirect
4243
github.com/go-logr/stdr v1.2.2 // indirect
43-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
44+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
4445
github.com/gobwas/glob v0.2.3 // indirect
4546
github.com/google/uuid v1.6.0 // indirect
4647
github.com/hashicorp/go-version v1.8.0 // indirect
@@ -60,8 +61,7 @@ require (
6061
go.opentelemetry.io/collector/connector/xconnector v0.143.0 // indirect
6162
go.opentelemetry.io/collector/consumer/consumererror v0.143.0 // indirect
6263
go.opentelemetry.io/collector/consumer/xconsumer v0.143.0 // indirect
63-
go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
64-
go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
64+
go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260119102301-ba2b601a7080 // indirect
6565
go.opentelemetry.io/collector/internal/fanoutconsumer v0.143.0 // indirect
6666
go.opentelemetry.io/collector/pdata/pprofile v0.143.0 // indirect
6767
go.opentelemetry.io/collector/pdata/testdata v0.143.0 // indirect

cmd/mdatagen/go.sum

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

cmd/mdatagen/internal/command.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ func run(ymlPath string) error {
203203
toGenerate[filepath.Join(tmplDir, "logs_test.go.tmpl")] = filepath.Join(codeDir, "generated_logs_test.go")
204204
}
205205

206+
if len(md.FeatureGates) > 0 { // only generate feature gates if feature gates are present
207+
toGenerate[filepath.Join(tmplDir, "feature_gates.go.tmpl")] = filepath.Join(codeDir, "generated_feature_gates.go")
208+
}
209+
206210
// If at least one file to generate, will need the codeDir
207211
if len(toGenerate) > 0 {
208212
if err = os.MkdirAll(codeDir, 0o700); err != nil {

cmd/mdatagen/internal/embedded_templates_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func TestEnsureTemplatesLoaded(t *testing.T) {
4141
path.Join(rootDir, "telemetrytest_test.go.tmpl"): {},
4242
path.Join(rootDir, "helper.tmpl"): {},
4343
path.Join(rootDir, "feature_gates.md.tmpl"): {},
44+
path.Join(rootDir, "feature_gates.go.tmpl"): {},
4445
}
4546
count = 0
4647
)

0 commit comments

Comments
 (0)