Skip to content

Commit

Permalink
Merge branch 'main' into merge-main-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
songy23 committed Jan 5, 2024
2 parents b3c6145 + b275884 commit c633ecb
Show file tree
Hide file tree
Showing 114 changed files with 1,912 additions and 5,981 deletions.
18 changes: 18 additions & 0 deletions .chloggen/datadog-connector-memory-issue.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: "bug_fix"
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: "datadogconnector"
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add feature flag to address memory issue with Datadog Connector
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [29755]
# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
27 changes: 27 additions & 0 deletions .chloggen/deprecate_configschema.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: deprecation

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: configschema

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Deprecating configschema to prefer generating documentation as part of its metadata generation with mdatagen

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30187]

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

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
22 changes: 22 additions & 0 deletions .chloggen/rmtanzu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'breaking'

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: "tanzuexporter"

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove tanzuexporter, user can still use versions 0.91.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30184]

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
27 changes: 27 additions & 0 deletions .chloggen/sparkmarshaluperror.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: apachesparkreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: propagate application list errors to reveal underlying issue

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30278]

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

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
27 changes: 27 additions & 0 deletions .chloggen/support_empty_values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: haproxyreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Support empty values in haproxy stats.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30252]

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

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
27 changes: 27 additions & 0 deletions .chloggen/swap-mssqldriver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: sqlqueryreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Swap MS SQL Server driver from legacy 'denisenkom' to official Microsoft fork

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [27200]

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

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
33 changes: 33 additions & 0 deletions .chloggen/time-zulu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: time

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: The `%z` strptime format now correctly parses `Z` as a valid timezone

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues:
- 29929

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
`strptime(3)` says that `%z` is "an RFC-822/ISO 8601 standard
timezone specification", but the previous code did not allow the
string "Z" to signify UTC time, as required by ISO 8601. Now, both
`+0000` and `Z` are recognized as UTC times in all components that
handle `strptime` format strings.
# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
27 changes: 27 additions & 0 deletions .chloggen/use_testing_tb_golden.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: golden

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Use testing.TB for golden.WriteMetrics, golden.WriteTraces and golden.WriteLogs over *testing.T

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30277]

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

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
5 changes: 2 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ exporter/skywalkingexporter/ @open-telemetry/collect
exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @sumo-drosiek
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kkujawa-sumo @rnishtala-sumo @astencel-sumo
exporter/tanzuobservabilityexporter/ @open-telemetry/collector-contrib-approvers @oppegard @thepeterstone @keep94
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1

Expand Down Expand Up @@ -159,7 +158,7 @@ processor/logstransformprocessor/ @open-telemetry/collect
processor/metricsgenerationprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9
processor/metricstransformprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax
processor/probabilisticsamplerprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/redactionprocessor/ @open-telemetry/collector-contrib-approvers @leonsp-ai @dmitryax @mx-psi @TylerHelmuth
processor/redactionprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @mx-psi @TylerHelmuth
processor/remotetapprocessor/ @open-telemetry/collector-contrib-approvers @pmcollins
processor/resourcedetectionprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
processor/resourcedetectionprocessor/internal/azure/ @open-telemetry/collector-contrib-approvers @mx-psi
Expand Down Expand Up @@ -192,7 +191,7 @@ receiver/bigipreceiver/ @open-telemetry/collect
receiver/carbonreceiver/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
receiver/chronyreceiver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @jamesmoessis
receiver/cloudflarereceiver/ @open-telemetry/collector-contrib-approvers @dehaansa @djaglowski
receiver/cloudfoundryreceiver/ @open-telemetry/collector-contrib-approvers @agoallikmaa @pellared @crobert-1
receiver/cloudfoundryreceiver/ @open-telemetry/collector-contrib-approvers @pellared @crobert-1
receiver/collectdreceiver/ @open-telemetry/collector-contrib-approvers @atoulme
receiver/couchdbreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
receiver/datadogreceiver/ @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @jpkrohling @MovieStoreGuy
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ body:
- exporter/splunkhec
- exporter/sumologic
- exporter/syslog
- exporter/tanzuobservability
- exporter/tencentcloudlogservice
- exporter/zipkin
- extension/asapauth
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ body:
- exporter/splunkhec
- exporter/sumologic
- exporter/syslog
- exporter/tanzuobservability
- exporter/tencentcloudlogservice
- exporter/zipkin
- extension/asapauth
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ body:
- exporter/splunkhec
- exporter/sumologic
- exporter/syslog
- exporter/tanzuobservability
- exporter/tencentcloudlogservice
- exporter/zipkin
- extension/asapauth
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,6 @@ issues:
- text: "G402:"
linters:
- gosec
- text: "SA1019: \"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema"
linters:
- staticcheck
3 changes: 3 additions & 0 deletions cmd/configschema/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> Deprecated: [v0.92.0] This tool is deprecated and will be removed in a future release.
> See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
# ConfigSchema API

This package contains an API that can be used to introspect the configuration
Expand Down
3 changes: 3 additions & 0 deletions cmd/configschema/cfgmetadatagen/cfgmetadatagen/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> Deprecated: [v0.92.0] This tool is deprecated and will be removed in a future release.
> See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
# Config Metadata YAML Generator (alpha)

This CLI application creates a configuration metadata YAML file for each
Expand Down
4 changes: 4 additions & 0 deletions cmd/configschema/cfgmetadatagen/cfgmetadatagen/cli.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
package cfgmetadatagen

import (
Expand All @@ -15,6 +17,8 @@ import (

// GenerateFiles is the entry point for cfgmetadatagen. Component factories are
// passed in so it can be used by other distros.
// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
func GenerateFiles(factories otelcol.Factories, sourceDir string, outputDir string) error {
dr := configschema.NewDirResolver(sourceDir, configschema.DefaultModule)
writer := newMetadataFileWriter(outputDir)
Expand Down
3 changes: 3 additions & 0 deletions cmd/configschema/cfgmetadatagen/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
package main

import (
Expand All @@ -14,6 +16,7 @@ import (
)

func main() {

sourceDir, outputDir := getFlags()
c, err := components.Components()
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions cmd/configschema/comments.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
package configschema // import "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema"

import (
Expand Down
3 changes: 3 additions & 0 deletions cmd/configschema/docsgen/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> Deprecated: [v0.92.0] This tool is deprecated and will be removed in a future release.
> See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
# Docsgen CLI Tool

This package contains a CLI tool that generates markdown files for collector
Expand Down
4 changes: 4 additions & 0 deletions cmd/configschema/docsgen/docsgen/cli.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
package docsgen // import "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema/docsgen/docsgen"

import (
Expand All @@ -23,6 +25,8 @@ const mdFileName = "config.md"
// CLI is the entrypoint for this package's functionality. It handles command-
// line arguments for the docsgen executable and produces config documentation
// for the specified components.
// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
func CLI(factories otelcol.Factories, dr configschema.DirResolver) {
tableTmpl, err := tableTemplate()
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions cmd/configschema/docsgen/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Deprecated: [v0.92.0] This package is deprecated and will be removed in a future release.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30187
package main

import (
Expand Down
Loading

0 comments on commit c633ecb

Please sign in to comment.