Skip to content

Commit 7329470

Browse files
authored
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents 86aa8bf + be97cf9 commit 7329470

File tree

69 files changed

+2770
-83
lines changed

Some content is hidden

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

69 files changed

+2770
-83
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: countconnector
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add profiles support
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39577]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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: new_component
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogextension
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Introduce framework for Datadog Extension
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39589]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: filelogreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix frozen receiver when max_concurrent_files is 1
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39598]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

.chloggen/gh-queue-spans.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: githubreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: add dedicated job queue spans with cicd.pipeline.run.queue.duration attribute
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39081]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: sqlserverreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Accept `context_info` with `traceparent` format in query sample collection, setting log record with correct traceId and spanId.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39539]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

.chloggen/target-info.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: prometheusremotewritereceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Cache `target_info` metrics so it can be used to populate metrics' Resource Attributes.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37277]
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: You can read more about resource attributes handling in https://opentelemetry.io/docs/specs/otel/compatibility/prometheus_and_openmetrics/#resource-attributes-1
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

.chloggen/xsync-ptr.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: deltatocumulative
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: fixes misuse of xsync, leading to bad mutex unlock
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39106]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

.github/CODEOWNERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ extension/azureauthextension/ @open-telemetry
9191
extension/basicauthextension/ @open-telemetry/collector-contrib-approvers @frzifus
9292
extension/bearertokenauthextension/ @open-telemetry/collector-contrib-approvers @frzifus
9393
extension/cgroupruntimeextension/ @open-telemetry/collector-contrib-approvers @mx-psi @rogercoll
94+
extension/datadogextension/ @open-telemetry/collector-contrib-approvers @jackgopack4 @dineshg13 @mx-psi @songy23
9495
extension/encoding/ @open-telemetry/collector-contrib-approvers @atoulme @dao-jun @dmitryax @MovieStoreGuy @VihasMakwana
9596
extension/encoding/avrologencodingextension/ @open-telemetry/collector-contrib-approvers @thmshmm
9697
extension/encoding/awscloudwatchmetricstreamsencodingextension/ @open-telemetry/collector-contrib-approvers @axw @constanca-m
@@ -324,8 +325,8 @@ receiver/windowseventlogreceiver/ @open-telemetry
324325
receiver/windowsperfcountersreceiver/ @open-telemetry/collector-contrib-approvers @dashpole @alxbl @pjanotti
325326
receiver/windowsservicereceiver/ @open-telemetry/collector-contrib-approvers @pjanotti @shalper2
326327
receiver/zipkinreceiver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
327-
receiver/zookeeperreceiver/ @open-telemetry/collector-contrib-approvers @antonblock
328-
scraper/zookeeperscraper/ @open-telemetry/collector-contrib-approvers @antonblock
328+
receiver/zookeeperreceiver/ @open-telemetry/collector-contrib-approvers @antonblock @akats7
329+
scraper/zookeeperscraper/ @open-telemetry/collector-contrib-approvers @antonblock @akats7
329330
testbed/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
330331
testbed/mockdatasenders/mockdatadogagentexporter/ @open-telemetry/collector-contrib-approvers @boostchicken
331332

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ body:
9494
- extension/basicauth
9595
- extension/bearertokenauth
9696
- extension/cgroupruntime
97+
- extension/datadog
9798
- extension/encoding
9899
- extension/encoding/avrologencoding
99100
- extension/encoding/awscloudwatchmetricstreamsencoding

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ body:
8888
- extension/basicauth
8989
- extension/bearertokenauth
9090
- extension/cgroupruntime
91+
- extension/datadog
9192
- extension/encoding
9293
- extension/encoding/avrologencoding
9394
- extension/encoding/awscloudwatchmetricstreamsencoding

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ body:
8888
- extension/basicauth
8989
- extension/bearertokenauth
9090
- extension/cgroupruntime
91+
- extension/datadog
9192
- extension/encoding
9293
- extension/encoding/avrologencoding
9394
- extension/encoding/awscloudwatchmetricstreamsencoding

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ body:
9393
- extension/basicauth
9494
- extension/bearertokenauth
9595
- extension/cgroupruntime
96+
- extension/datadog
9697
- extension/encoding
9798
- extension/encoding/avrologencoding
9899
- extension/encoding/awscloudwatchmetricstreamsencoding

.github/component_labels.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ extension/azureauthextension extension/azureauth
7272
extension/basicauthextension extension/basicauth
7373
extension/bearertokenauthextension extension/bearertokenauth
7474
extension/cgroupruntimeextension extension/cgroupruntime
75+
extension/datadogextension extension/datadog
7576
extension/encoding extension/encoding
7677
extension/encoding/avrologencodingextension extension/encoding/avrologencoding
7778
extension/encoding/awscloudwatchmetricstreamsencodingextension extension/encoding/awscloudwatchmetricstreams

connector/countconnector/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
| traces | metrics | [alpha] |
1919
| metrics | metrics | [alpha] |
2020
| logs | metrics | [alpha] |
21+
| profiles | metrics | [alpha] |
2122

2223
[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type
2324
[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type

connector/countconnector/config.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ const (
2929

3030
defaultMetricNameLogs = "log.record.count"
3131
defaultMetricDescLogs = "The number of log records observed."
32+
33+
defaultMetricNameProfiles = "profile.count"
34+
defaultMetricDescProfiles = "The number of profiles observed."
3235
)
3336

3437
// Config for the connector
@@ -38,6 +41,7 @@ type Config struct {
3841
Metrics map[string]MetricInfo `mapstructure:"metrics"`
3942
DataPoints map[string]MetricInfo `mapstructure:"datapoints"`
4043
Logs map[string]MetricInfo `mapstructure:"logs"`
44+
Profiles map[string]MetricInfo `mapstructure:"profiles"`
4145
// prevent unkeyed literal initialization
4246
_ struct{}
4347
}
@@ -115,6 +119,17 @@ func (c *Config) Validate() error {
115119
return fmt.Errorf("logs attributes: metric %q: %w", name, err)
116120
}
117121
}
122+
for name, info := range c.Profiles {
123+
if name == "" {
124+
return errors.New("profiles: metric name missing")
125+
}
126+
if _, err := filterottl.NewBoolExprForProfile(info.Conditions, filterottl.StandardProfileFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()}); err != nil {
127+
return fmt.Errorf("profiles condition: metric %q: %w", name, err)
128+
}
129+
if err := info.validateAttributes(); err != nil {
130+
return fmt.Errorf("profiles attributes: metric %q: %w", name, err)
131+
}
132+
}
118133
return nil
119134
}
120135

@@ -155,6 +170,9 @@ func (c *Config) Unmarshal(componentParser *confmap.Conf) error {
155170
if !componentParser.IsSet("logs") {
156171
c.Logs = defaultLogsConfig()
157172
}
173+
if !componentParser.IsSet("profiles") {
174+
c.Profiles = defaultProfilesConfig()
175+
}
158176
return nil
159177
}
160178

@@ -197,3 +215,11 @@ func defaultLogsConfig() map[string]MetricInfo {
197215
},
198216
}
199217
}
218+
219+
func defaultProfilesConfig() map[string]MetricInfo {
220+
return map[string]MetricInfo{
221+
defaultMetricNameProfiles: {
222+
Description: defaultMetricDescProfiles,
223+
},
224+
}
225+
}

0 commit comments

Comments
 (0)