Skip to content

Commit efff81e

Browse files
committed
Merge branch 'main' into tyler/kafka
# Conflicts: # cmd/otelcontribcol/go.mod # exporter/kafkaexporter/go.mod # receiver/kafkareceiver/go.mod
2 parents 7c1d4bf + 1b03346 commit efff81e

File tree

1,008 files changed

+36987
-29874
lines changed

Some content is hidden

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

1,008 files changed

+36987
-29874
lines changed

.chloggen/apachereceiver_fix_panic_on_invalid_endpoint.yaml renamed to .chloggen/35081-fix-iops-search.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
change_type: 'bug_fix'
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: apachereceiver
7+
component: splunkenterprise
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Fix panic on invalid endpoint configuration
10+
note: Fix a flaky search related to iops metrics.
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34992]
13+
issues: [35081]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/elasticsearchexporter_encode-double-as-double.yaml renamed to .chloggen/azuremonitorexporter-ignore-endpoint.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
change_type: bug_fix
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: elasticsearchexporter
7+
component: azuremonitorexporter
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Fix dynamic mapping for double values storing integers
10+
note: fix issue for property endpoint is ignored when using instrumentation_key
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34680]
13+
issues: [33971]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/clickhouse-upgrade-statuscode-kind.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.chloggen/deltatocumulative-apitest.yaml renamed to .chloggen/container_parser_featuregate_beta.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: bug_fix
4+
change_type: breaking
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: deltatocumulative
7+
component: pkg/stanza
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: drop bad samples
10+
note: Move `filelog.container.removeOriginalTimeField` feature gate to beta
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34979]
13+
issues: [33389]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
1818
subtext: |
19-
removes bad (rejected) samples from output. previously identified and metric-tracked those as such, but didn't actually drop them.
19+
- Disable the `filelog.container.removeOriginalTimeField` feature gate to get the old behavior.
2020
2121
# If your change doesn't affect end users or the exported elements of any package,
2222
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

.chloggen/ottl-remove-tracing.yaml renamed to .chloggen/cpu_stepping_fg_stable.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
change_type: breaking
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: ottl
7+
component: resourcedetectionprocessor
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Remove tracing from OTTL due to performance concerns
10+
note: Move `processor.resourcedetection.hostCPUSteppingAsString` feature gate to stable.
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34910]
13+
issues: [31136]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/dd-conn-peer-tags.yaml renamed to .chloggen/dd-con-new-env-conv.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ change_type: enhancement
77
component: datadogconnector
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: "Optimize Datadog connector when there are many peer tags and `connector.datadogconnector.NativeIngest` is enabled"
10+
note: "Map the new OTel semantic convention `deployment.environment.name` to `env` for OTLP traces in APM stats."
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34945]
13+
issues: [35147]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
18-
subtext: "`connector.datadogconnector.NativeIngest` is currently enabled by default"
18+
subtext: "The old convention `deployment.environment` still works"
1919

2020
# If your change doesn't affect end users or the exported elements of any package,
2121
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

.chloggen/githubreceiver-alpha.yaml renamed to .chloggen/dd-exp-new-env-conv.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
change_type: enhancement
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: githubreceiver
7+
component: datadogexporter
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Promote GitHub receiver metrics to alpha status.
10+
note: "Map the new OTel semantic convention `deployment.environment.name` to `env` for OTLP traces, metrics and logs."
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34960]
13+
issues: [35147]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
18-
subtext:
18+
subtext: "The old convention `deployment.environment` still works"
1919

2020
# If your change doesn't affect end users or the exported elements of any package,
2121
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

.chloggen/elasticsearchexporter_exponential-histogram.yaml renamed to .chloggen/dinesh.gurumurthy_datadog-config-pkg.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
change_type: enhancement
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: elasticsearchexporter
7+
component: pkg/datadog
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add exponential histogram support
10+
note: |
11+
Create a new module for Datadog exporter configuration.
1112
1213
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34813]
14+
issues: [35067]
1415

1516
# (Optional) One or more lines of additional information to render under the primary note.
1617
# These lines will be padded with 2 spaces and then inserted directly into the document.
1718
# Use pipe (|) for multiline entries.
18-
subtext:
19+
subtext: |
20+
This change introduces a new module for Datadog exporter configuration. The module is shared between the Datadog exporter and the Datadog Connector.
1921
2022
# If your change doesn't affect end users or the exported elements of any package,
2123
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
@@ -24,4 +26,4 @@ subtext:
2426
# Include 'user' if the change is relevant to end users.
2527
# Include 'api' if there is a change to a library API.
2628
# Default: '[user]'
27-
change_logs: []
29+
change_logs: [api]
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: enhancement
4+
change_type: deprecation
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: splunkhecexporter
7+
component: datadogexporter
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Drop empty log events
10+
note: |
11+
The datadog exporter config has been deprecated in favor of the new `datadog/config` package. The new package is shared between the Datadog exporter and the Datadog Connector.
1112
1213
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34871]
14+
issues: [35067]
1415

1516
# (Optional) One or more lines of additional information to render under the primary note.
1617
# These lines will be padded with 2 spaces and then inserted directly into the document.
1718
# Use pipe (|) for multiline entries.
1819
subtext: |
19-
Log records with no body are dropped by Splunk on reception
20-
as they contain no log message, albeit they may have attributes.
21-
22-
This PR removes those logs from consideration to be exported.
23-
24-
This is in tune with the behavior of splunkhecreceiver, which refuses HEC events with no event (#19769)
25-
20+
The new `datadog/config` package is a shared module for Datadog exporter configuration. The module is shared between the Datadog exporter and the Datadog Connector.
2621
2722
# If your change doesn't affect end users or the exported elements of any package,
2823
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
@@ -31,4 +26,4 @@ subtext: |
3126
# Include 'user' if the change is relevant to end users.
3227
# Include 'api' if there is a change to a library API.
3328
# Default: '[user]'
34-
change_logs: []
29+
change_logs: [api]
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: 'bug_fix'
4+
change_type: new_component
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: otlpjsonconnector
7+
component: dorisexporter
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Handle OTLPJSON unmarshal error
10+
note: traces implementation
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34782]
13+
issues: [33479]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
18-
subtext:
18+
subtext:
1919

2020
# If your change doesn't affect end users or the exported elements of any package,
2121
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
@@ -24,4 +24,4 @@ subtext:
2424
# Include 'user' if the change is relevant to end users.
2525
# Include 'api' if there is a change to a library API.
2626
# Default: '[user]'
27-
change_logs: []
27+
change_logs: [user]

.chloggen/elasticsearchexporter_otel-mode-traces-span-events.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.chloggen/gitprovider-rename.yaml renamed to .chloggen/exporterhelper-rename-config.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,26 @@
44
change_type: breaking
55

66
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7-
component: gitproviderreceiver
7+
component: all
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: The Git Provider Receiver has been renamed to GitHub Receiver.
10+
note: TimeoutSettings/QueueSettings fields in various Config structs are no longer embedded
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [34731]
13+
issues: [35158]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
1818
subtext: |
19-
This rename was to better match the OpenTelemetry semantic convention changes in v1.27.0
20-
and allows for Traces and Log signals to be added to this component. Traces
21-
as mentioned in issue #27460 will be added in a future release to this component.
19+
Structs in which .TimeoutSettings is no longer embedded:
20+
* carbonexporter.Config
21+
* googlecloudpubsubreceiver.Config
22+
Structs in which .TimeoutSettings and .QueueSettings are no longer embedded:
23+
* alertmanagerexporter.Config
24+
* googlecloudexporter.Config
25+
* googlemanagedprometheusexporter.Config
26+
* otelarrowexporter.Config
2227
2328
# If your change doesn't affect end users or the exported elements of any package,
2429
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
@@ -27,4 +32,4 @@ subtext: |
2732
# Include 'user' if the change is relevant to end users.
2833
# Include 'api' if there is a change to a library API.
2934
# Default: '[user]'
30-
change_logs: []
35+
change_logs: [api]

.chloggen/feat_33227.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.chloggen/feature_solarwindsapmsettingsetension-impl-2.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)