Skip to content

Commit 2a41899

Browse files
omzmarlonomzmarlon
authored
Merge branch 'main' into telemetry-async-err-ch
2 parents f8ac8cf + 689d43e commit 2a41899

File tree

114 files changed

+2055
-1102
lines changed

Some content is hidden

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

114 files changed

+2055
-1102
lines changed

‎.chloggen/components_cmd_add_providers.yaml

+25
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. otlpreceiver)
7+
component: otelcol
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Adds support for listing config providers in components command's output
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11570]
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]

‎.chloggen/confighttp-errorlog-update.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
change_type: bug_fix
2+
3+
component: confighttp
4+
5+
note: "confighttp.ToServer now sets ErrorLog with a default logger backed by Zap"
6+
7+
issues: [11820]
8+
9+
subtext: |
10+
11+
This change ensures that the http.Server's ErrorLog is correctly set using Zap's logger at the error level, addressing the issue of error logs being printed using a different logger.
12+
13+
change_logs: []

‎.chloggen/extracttesttel.yaml

+25
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. otlpreceiver)
7+
component: componenttest
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Extract componenttest.Telemetry as generic struct for telemetry testing
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12151]
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]

‎.chloggen/fix-bug-histogram-aggregation.yaml

+25
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. otlpreceiver)
7+
component: mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix bug where Histograms were marked as not supporting temporaly aggregation
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12168]
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, user]

‎.chloggen/main.yaml

+25
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. otlpreceiver)
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: Allow passing OTel Metric SDK options to the generated `SetupTelemetry` function.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12166]
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]

‎.chloggen/opbexp.yaml

+25
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. otlpreceiver)
7+
component: exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Change exporter ID to be a Span level attribute instead on each event.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12164]
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: This does not have an impact on the level of information emitted, but on the structure of the Span.
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]

‎.chloggen/set-new-queue-batching-to-beta.yaml

+25
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. otlpreceiver)
7+
component: exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Set the feature gate UsePullingBasedExporterQueueBatcher to beta
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [8122]
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]

‎.chloggen/setup-telemetry-options.yaml

+25
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. otlpreceiver)
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: Remove `level` field from metrics definition
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12145]
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: This mechanism will be added back once a new views mechanism is implemented.
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: []

‎.chloggen/support-logs-scraper.yaml

+25
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. otlpreceiver)
7+
component: scraper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Support logs scraper
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12116]
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]

‎.chloggen/toplevel-component-validateconfig.yaml

+25
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. otlpreceiver)
7+
component: component
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Allow `component.ValidateConfig` to recurse through all fields in a config object
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11524]
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]

‎cmd/builder/internal/builder/templates/main.go.tmpl

+5-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ func main() {
4545
DefaultScheme: "{{ .ConfResolver.DefaultURIScheme }}",
4646
{{- end }}
4747
},
48-
},
48+
}, ProviderModules: map[string]string{
49+
{{- range .ConfmapProviders}}
50+
{{.Name}}.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "{{.GoMod}}",
51+
{{- end}}
52+
},
4953
}
5054

5155
if err := run(set); err != nil {

‎cmd/mdatagen/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/stretchr/testify v1.10.0
99
go.opentelemetry.io/collector/component v0.118.0
1010
go.opentelemetry.io/collector/component/componenttest v0.118.0
11-
go.opentelemetry.io/collector/config/configtelemetry v0.118.0
1211
go.opentelemetry.io/collector/confmap v1.24.0
1312
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.24.0
1413
go.opentelemetry.io/collector/consumer v1.24.0
@@ -23,11 +22,9 @@ require (
2322
go.opentelemetry.io/collector/scraper/scrapertest v0.118.0
2423
go.opentelemetry.io/collector/semconv v0.118.0
2524
go.opentelemetry.io/otel/metric v1.34.0
26-
go.opentelemetry.io/otel/sdk v1.34.0
2725
go.opentelemetry.io/otel/sdk/metric v1.34.0
2826
go.opentelemetry.io/otel/trace v1.34.0
2927
go.uber.org/goleak v1.3.0
30-
go.uber.org/multierr v1.11.0
3128
go.uber.org/zap v1.27.0
3229
golang.org/x/text v0.21.0
3330
)
@@ -52,6 +49,7 @@ require (
5249
github.com/spf13/pflag v1.0.5 // indirect
5350
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
5451
go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect
52+
go.opentelemetry.io/collector/config/configtelemetry v0.118.0 // indirect
5553
go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect
5654
go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect
5755
go.opentelemetry.io/collector/pdata/pprofile v0.118.0 // indirect
@@ -60,6 +58,8 @@ require (
6058
go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect
6159
go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect
6260
go.opentelemetry.io/otel v1.34.0 // indirect
61+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
62+
go.uber.org/multierr v1.11.0 // indirect
6363
golang.org/x/net v0.33.0 // indirect
6464
golang.org/x/sys v0.29.0 // indirect
6565
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect

‎cmd/mdatagen/internal/metric.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"golang.org/x/text/language"
1313

1414
"go.opentelemetry.io/collector/component"
15-
"go.opentelemetry.io/collector/config/configtelemetry"
1615
"go.opentelemetry.io/collector/confmap"
1716
"go.opentelemetry.io/collector/pdata/pmetric"
1817
)
@@ -60,11 +59,6 @@ type Metric struct {
6059

6160
// Attributes is the list of attributes that the metric emits.
6261
Attributes []AttributeName `mapstructure:"attributes"`
63-
64-
// Level specifies the minimum `configtelemetry.Level` for which
65-
// the metric will be emitted. This only applies to internal telemetry
66-
// configuration.
67-
Level configtelemetry.Level `mapstructure:"level"`
6862
}
6963

7064
type Stability struct {
@@ -356,7 +350,7 @@ func (d *Histogram) HasMonotonic() bool {
356350
}
357351

358352
func (d *Histogram) HasAggregated() bool {
359-
return false
353+
return true
360354
}
361355

362356
func (d *Histogram) Instrument() string {

‎cmd/mdatagen/internal/metric_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestMetricData(t *testing.T) {
2929
{&Sum{Async: true}, "Sum", true, true, "ObservableUpDownCounter", true},
3030
{&Sum{MetricValueType: MetricValueType{pmetric.NumberDataPointValueTypeInt}, Async: true}, "Sum", true, true, "Int64ObservableUpDownCounter", true},
3131
{&Sum{MetricValueType: MetricValueType{pmetric.NumberDataPointValueTypeDouble}, Async: true}, "Sum", true, true, "Float64ObservableUpDownCounter", true},
32-
{&Histogram{}, "Histogram", false, false, "Histogram", false},
32+
{&Histogram{}, "Histogram", true, false, "Histogram", false},
3333
} {
3434
assert.Equal(t, arg.wantType, arg.metricData.Type())
3535
assert.Equal(t, arg.wantHasAggregated, arg.metricData.HasAggregated())

‎cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go

+5-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)