Skip to content

Commit

Permalink
Merge branch 'main' into fix_set_data_race
Browse files Browse the repository at this point in the history
  • Loading branch information
rogercoll authored Sep 2, 2024
2 parents dc39494 + fd0e9ef commit 228658c
Show file tree
Hide file tree
Showing 623 changed files with 20,799 additions and 20,374 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix_memleak_obsreport.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: splunkhecreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix memory leak when the receiver is used for both metrics and logs at the same time

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

# (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: []
30 changes: 30 additions & 0 deletions .chloggen/gitprovider-rename.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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: gitproviderreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: The Git Provider Receiver has been renamed to GitHub Receiver.

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

# (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: |
This rename was to better match the OpenTelemetry semantic convention changes in v1.27.0
and allows for Traces and Log signals to be added to this component. Traces
as mentioned in issue #27460 will be added in a future release to this component.
# 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: []
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ exporter/sentryexporter/ @open-teleme
exporter/signalfxexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kkujawa-sumo @rnishtala-sumo @andrzej-stencel
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kasia-kujawa @rnishtala-sumo @andrzej-stencel
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1

Expand Down Expand Up @@ -236,7 +236,7 @@ receiver/filelogreceiver/ @open-teleme
receiver/filestatsreceiver/ @open-telemetry/collector-contrib-approvers @atoulme
receiver/flinkmetricsreceiver/ @open-telemetry/collector-contrib-approvers @JonathanWamsley @djaglowski
receiver/fluentforwardreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax
receiver/gitproviderreceiver/ @open-telemetry/collector-contrib-approvers @adrielp @andrzej-stencel @crobert-1
receiver/githubreceiver/ @open-telemetry/collector-contrib-approvers @adrielp @andrzej-stencel @crobert-1
receiver/googlecloudmonitoringreceiver/ @open-telemetry/collector-contrib-approvers @dashpole @TylerHelmuth @abhishek-at-cloudwerx
receiver/googlecloudpubsubreceiver/ @open-telemetry/collector-contrib-approvers @alexvanboxel
receiver/haproxyreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @MovieStoreGuy
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ body:
- receiver/filestats
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/gitprovider
- receiver/github
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ body:
- receiver/filestats
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/gitprovider
- receiver/github
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ body:
- receiver/filestats
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/gitprovider
- receiver/github
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/unmaintained.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ body:
- receiver/filestats
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/gitprovider
- receiver/github
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/o

Emeritus Triagers:

- [Alolita Sharma](https://github.com/alolita), AWS
- [Alolita Sharma](https://github.com/alolita), Apple
- [Gabriel Aszalos](https://github.com/gbbr), DataDog
- [Goutham Veeramachaneni](https://github.com/gouthamve), Grafana
- [Punya Biswal](https://github.com/punya), Google
Expand Down Expand Up @@ -109,7 +109,7 @@ Maintainers ([@open-telemetry/collector-contrib-maintainer](https://github.com/o
- [Evan Bradley](https://github.com/evan-bradley), Dynatrace
- [Juraci Paixão Kröhling](https://github.com/jpkrohling), Grafana Labs
- [Pablo Baeyens](https://github.com/mx-psi), DataDog
- [Sean Marciniak](https://github.com/MovieStoreGuy), Atlassian
- [Sean Marciniak](https://github.com/MovieStoreGuy), Splunk
- [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb

Emeritus Maintainers
Expand Down
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.0

require (
github.com/google/go-github/v63 v63.0.0
go.opentelemetry.io/collector/confmap v1.14.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1
go.opentelemetry.io/collector/confmap v1.14.2-0.20240829190554-7da6b618a7ee
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240829190554-7da6b618a7ee
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.14.1
go.opentelemetry.io/collector/config/configtls v1.14.1
go.opentelemetry.io/collector/semconv v0.108.1
go.opentelemetry.io/collector/config/configopaque v1.14.2-0.20240829190554-7da6b618a7ee
go.opentelemetry.io/collector/config/configtls v1.14.2-0.20240829190554-7da6b618a7ee
go.opentelemetry.io/collector/semconv v0.108.2-0.20240829190554-7da6b618a7ee
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.24.0
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dist:
otelcol_version: 0.108.1

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.108.0
Expand Down Expand Up @@ -53,10 +53,10 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.108.0
Expand Down Expand Up @@ -103,8 +103,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.108.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.1
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.108.0
Expand All @@ -130,8 +130,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.108.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.1
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.108.0
Expand Down Expand Up @@ -222,7 +222,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.108.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.1
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.108.0
Expand All @@ -235,11 +235,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.108.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.1
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.2-0.20240829190554-7da6b618a7ee
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.108.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.108.0

Expand Down
Loading

0 comments on commit 228658c

Please sign in to comment.