Skip to content

Commit f2c57e4

Browse files
authored
Merge branch 'main' into fix/vcenter-tls
2 parents df80937 + 0d6b220 commit f2c57e4

File tree

622 files changed

+17559
-18233
lines changed

Some content is hidden

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

622 files changed

+17559
-18233
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: datadogexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add a configurable `reporter_period` parameter to the Datadog exporter’s host metadata configuration to allow users to specify the frequency at which host metadata is sent to Datadog.
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: [36450]
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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: opencensusreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Do not report error message when OpenCensus receiver is shutdown cleanly.
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: [36622]
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ receiver/awss3receiver/ @open-telemetry/collector-cont
210210
receiver/awsxrayreceiver/ @open-telemetry/collector-contrib-approvers @wangzlei @srprash
211211
receiver/azureblobreceiver/ @open-telemetry/collector-contrib-approvers @eedorenko @mx-psi
212212
receiver/azureeventhubreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @cparkins
213-
receiver/azuremonitorreceiver/ @open-telemetry/collector-contrib-approvers @nslaughter @codeboten
213+
receiver/azuremonitorreceiver/ @open-telemetry/collector-contrib-approvers @nslaughter
214214
receiver/bigipreceiver/ @open-telemetry/collector-contrib-approvers @StefanKurek
215215
receiver/carbonreceiver/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
216216
receiver/chronyreceiver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @jamesmoessis
@@ -256,7 +256,7 @@ receiver/nsxtreceiver/ @open-telemetry/collector-cont
256256
receiver/ntpreceiver/ @open-telemetry/collector-contrib-approvers @atoulme
257257
receiver/opencensusreceiver/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
258258
receiver/oracledbreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1 @atoulme
259-
receiver/osqueryreceiver/ @open-telemetry/collector-contrib-approvers @codeboten @nslaughter @smithclay
259+
receiver/osqueryreceiver/ @open-telemetry/collector-contrib-approvers @nslaughter @smithclay
260260
receiver/otelarrowreceiver/ @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3
261261
receiver/otlpjsonfilereceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @atoulme
262262
receiver/podmanreceiver/ @open-telemetry/collector-contrib-approvers @rogercoll
@@ -282,7 +282,7 @@ receiver/splunkenterprisereceiver/ @open-telemetry/collector-cont
282282
receiver/splunkhecreceiver/ @open-telemetry/collector-contrib-approvers @atoulme
283283
receiver/sqlqueryreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
284284
receiver/sqlserverreceiver/ @open-telemetry/collector-contrib-approvers @StefanKurek
285-
receiver/sshcheckreceiver/ @open-telemetry/collector-contrib-approvers @nslaughter @codeboten
285+
receiver/sshcheckreceiver/ @open-telemetry/collector-contrib-approvers @nslaughter
286286
receiver/statsdreceiver/ @open-telemetry/collector-contrib-approvers @jmacd @dmitryax
287287
receiver/syslogreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @andrzej-stencel
288288
receiver/systemdreceiver/ @open-telemetry/collector-contrib-approvers @Hemansh31 @atoulme

cmd/githubgen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.22.0
44

55
require (
66
github.com/google/go-github/v66 v66.0.0
7-
go.opentelemetry.io/collector/confmap v1.20.1-0.20241130171227-c52d625647be
8-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.1-0.20241130171227-c52d625647be
7+
go.opentelemetry.io/collector/confmap v1.20.1-0.20241202231142-b9ff1bc54c99
8+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.1-0.20241202231142-b9ff1bc54c99
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

cmd/githubgen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/opampsupervisor/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/knadh/koanf/v2 v2.1.2
1414
github.com/open-telemetry/opamp-go v0.17.0
1515
github.com/stretchr/testify v1.10.0
16-
go.opentelemetry.io/collector/config/configopaque v1.20.1-0.20241130171227-c52d625647be
17-
go.opentelemetry.io/collector/config/configtls v1.20.1-0.20241130171227-c52d625647be
18-
go.opentelemetry.io/collector/semconv v0.114.1-0.20241130171227-c52d625647be
16+
go.opentelemetry.io/collector/config/configopaque v1.20.1-0.20241202231142-b9ff1bc54c99
17+
go.opentelemetry.io/collector/config/configtls v1.20.1-0.20241202231142-b9ff1bc54c99
18+
go.opentelemetry.io/collector/semconv v0.114.1-0.20241202231142-b9ff1bc54c99
1919
go.uber.org/goleak v1.3.0
2020
go.uber.org/zap v1.27.0
2121
golang.org/x/sys v0.26.0

cmd/opampsupervisor/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/builder-config.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dist:
1313
version: 0.114.0-dev
1414

1515
extensions:
16-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.114.0
16+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.114.1-0.20241202231142-b9ff1bc54c99
1717
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.114.0
1818
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.114.0
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.114.0
@@ -49,10 +49,10 @@ extensions:
4949
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.114.0
5050

5151
exporters:
52-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.114.0
53-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.114.0
54-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.114.0
55-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.114.0
52+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.114.1-0.20241202231142-b9ff1bc54c99
53+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.114.1-0.20241202231142-b9ff1bc54c99
54+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.114.1-0.20241202231142-b9ff1bc54c99
55+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.114.1-0.20241202231142-b9ff1bc54c99
5656
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.114.0
5757
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.114.0
5858
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.114.0
@@ -98,8 +98,8 @@ exporters:
9898
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.114.0
9999

100100
processors:
101-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.114.0
102-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.114.0
101+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.114.1-0.20241202231142-b9ff1bc54c99
102+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.114.1-0.20241202231142-b9ff1bc54c99
103103
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.114.0
104104
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.114.0
105105
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.114.0
@@ -125,8 +125,8 @@ processors:
125125
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.114.0
126126

127127
receivers:
128-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.114.0
129-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.114.0
128+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.114.1-0.20241202231142-b9ff1bc54c99
129+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.114.1-0.20241202231142-b9ff1bc54c99
130130
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.114.0
131131
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.114.0
132132
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.114.0
@@ -221,7 +221,7 @@ receivers:
221221
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.114.0
222222

223223
connectors:
224-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.114.0
224+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.114.1-0.20241202231142-b9ff1bc54c99
225225
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.114.0
226226
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.114.0
227227
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.114.0
@@ -235,11 +235,11 @@ connectors:
235235
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/sumconnector v0.114.0
236236

237237
providers:
238-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.20.0
239-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.0
240-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.20.0
241-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.0
242-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.20.0
238+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.20.1-0.20241202231142-b9ff1bc54c99
239+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.1-0.20241202231142-b9ff1bc54c99
240+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.20.1-0.20241202231142-b9ff1bc54c99
241+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.20.1-0.20241202231142-b9ff1bc54c99
242+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.20.1-0.20241202231142-b9ff1bc54c99
243243
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.114.0
244244
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.114.0
245245

0 commit comments

Comments
 (0)