Skip to content

Commit a41e8ee

Browse files
flo-canvaflo-canva
committed
Merge upstream v0.137.0
# Conflicts: # config/confighttp/confighttp.go
2 parents f20d9b6 + 3b55554 commit a41e8ee

2,077 files changed

Lines changed: 131302 additions & 109666 deletions

File tree

Some content is hidden

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

‎.checkapi.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ignored_paths:
2+
- confmap/doc_test.go
3+
excluded_files:
4+
- example_*.go
5+
- "*_test.go"
6+
unkeyed_literal_initialization:
7+
enabled: true
8+
limit: 6

‎.chloggen/README.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
### Changelog folder
2+
3+
This repo uses `chloggen` to manage its changelog files. You can find the source code for the tool [here](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/chloggen).
4+
5+
Here is a quick explanation of the `config.yaml` file for chloggen:
6+
7+
```yaml
8+
# The directory that stores individual changelog entries.
9+
# Each entry is stored in a dedicated yaml file.
10+
# - 'chloggen new' will copy the 'template_yaml' to this directory as a new entry file.
11+
# - 'chloggen validate' will validate that all entry files are valid.
12+
# - 'chloggen update' will read and delete all entry files in this directory, and update 'changelog_md'.
13+
# Specify as relative path from root of repo.
14+
# (Optional) Default: .chloggen
15+
entries_dir: .chloggen
16+
17+
# This file is used as the input for individual changelog entries.
18+
# Specify as relative path from root of repo.
19+
# (Optional) Default: .chloggen/TEMPLATE.yaml
20+
template_yaml: .chloggen/TEMPLATE.yaml
21+
22+
summary_template: .chloggen/summary.tmpl
23+
24+
# The CHANGELOG file or files to which 'chloggen update' will write new entries
25+
# (Optional) Default filename: CHANGELOG.md
26+
change_logs:
27+
user: CHANGELOG.md
28+
api: CHANGELOG-API.md
29+
30+
# The default change_log or change_logs to which an entry should be added.
31+
# If 'change_logs' is specified in this file, and no value is specified for 'default_change_logs',
32+
# then 'change_logs' MUST be specified in every entry file.
33+
default_change_logs: [user]
34+
```

‎.chloggen/config.yaml‎

Lines changed: 51 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,53 @@
1-
# The directory that stores individual changelog entries.
2-
# Each entry is stored in a dedicated yaml file.
3-
# - 'chloggen new' will copy the 'template_yaml' to this directory as a new entry file.
4-
# - 'chloggen validate' will validate that all entry files are valid.
5-
# - 'chloggen update' will read and delete all entry files in this directory, and update 'changelog_md'.
6-
# Specify as relative path from root of repo.
7-
# (Optional) Default: .chloggen
1+
change_logs:
2+
api: CHANGELOG-API.md
3+
user: CHANGELOG.md
4+
default_change_logs:
5+
- user
86
entries_dir: .chloggen
9-
10-
# This file is used as the input for individual changelog entries.
11-
# Specify as relative path from root of repo.
12-
# (Optional) Default: .chloggen/TEMPLATE.yaml
137
template_yaml: .chloggen/TEMPLATE.yaml
14-
15-
# The CHANGELOG file or files to which 'chloggen update' will write new entries
16-
# (Optional) Default filename: CHANGELOG.md
17-
change_logs:
18-
user: CHANGELOG.md
19-
api: CHANGELOG-API.md
20-
21-
# The default change_log or change_logs to which an entry should be added.
22-
# If 'change_logs' is specified in this file, and no value is specified for 'default_change_logs',
23-
# then 'change_logs' MUST be specified in every entry file.
24-
default_change_logs: [user]
8+
summary_template: .chloggen/summary.tmpl
9+
components:
10+
- all
11+
- cmd/builder
12+
- cmd/mdatagen
13+
- connector/forward
14+
- connector/sample
15+
- consumer/xconsumer
16+
- docs/rfcs
17+
- exporter/debug
18+
- exporter/nop
19+
- exporter/otlp
20+
- exporter/otlphttp
21+
- extension/memory_limiter
22+
- extension/xextension
23+
- extension/xextension
24+
- extension/zpages
25+
- pdata/pprofile
26+
- pkg/confmap
27+
- pkg/exporterhelper
28+
- pkg/pdata
29+
- pkg/processorhelper
30+
- pkg/queuebatch
31+
- pkg/receiverhelper
32+
- pkg/scraper
33+
- pkg/scraperhelper
34+
- pkg/service
35+
- pkg/xconnector
36+
- pkg/xexporter
37+
- pkg/xexporterhelper
38+
- pkg/xprocessor
39+
- pkg/xreceiver
40+
- processor/batch
41+
- processor/memory_limiter
42+
- processor/sample
43+
- provider/env
44+
- provider/file
45+
- provider/http
46+
- provider/https
47+
- provider/yaml
48+
- receiver/nop
49+
- receiver/otlp
50+
- receiver/sample
51+
- receiver/sample
52+
- scraper/sample
53+
- service/graph

‎.chloggen/fix_cmd_mdata-gen-metrics.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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. otlpreceiver)
7+
component: cmd/mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix mdatagen generated_metrics for connectors
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12402]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

‎.chloggen/summary.tmpl‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{{- define "entry" -}}
2+
- `{{ .Component }}`: {{ .Note }} (
3+
{{- range $i, $issue := .Issues }}
4+
{{- if $i }}, {{ end -}}
5+
#{{ $issue }}
6+
{{- end -}}
7+
)
8+
9+
{{- if .SubText }}
10+
{{ .SubText | indent 2 }}
11+
{{- end }}
12+
{{- end }}
13+
## {{ .Version }}
14+
15+
{{- if .BreakingChanges }}
16+
17+
### 🛑 Breaking changes 🛑
18+
19+
{{- range $i, $change := .BreakingChanges }}
20+
{{- if eq $i 0}}
21+
{{end}}
22+
{{ template "entry" $change }}
23+
{{- end }}
24+
{{- end }}
25+
26+
{{- if .Deprecations }}
27+
28+
### 🚩 Deprecations 🚩
29+
30+
{{- range $i, $change := .Deprecations }}
31+
{{- if eq $i 0}}
32+
{{end}}
33+
{{ template "entry" $change }}
34+
{{- end }}
35+
{{- end }}
36+
37+
{{- if .NewComponents }}
38+
39+
### 🚀 New components 🚀
40+
41+
{{- range $i, $change := .NewComponents }}
42+
{{- if eq $i 0}}
43+
{{end}}
44+
{{ template "entry" $change }}
45+
{{- end }}
46+
{{- end }}
47+
48+
{{- if .Enhancements }}
49+
50+
### 💡 Enhancements 💡
51+
52+
{{- range $i, $change := .Enhancements }}
53+
{{- if eq $i 0}}
54+
{{end}}
55+
{{ template "entry" $change }}
56+
{{- end }}
57+
{{- end }}
58+
59+
{{- if .BugFixes }}
60+
61+
### 🧰 Bug fixes 🧰
62+
63+
{{- range $i, $change := .BugFixes }}
64+
{{- if eq $i 0}}
65+
{{end}}
66+
{{ template "entry" $change }}
67+
{{- end }}
68+
{{- end }}
69+
70+
<!-- previous-version -->

‎.codecov.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ coverage:
1919

2020
ignore:
2121
- "pdata/internal/data/protogen/**/*"
22+
- "**/*.pb.go"
2223
- "cmd/mdatagen/third_party/**/*"

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
# https://github.com/github/linguist.
44

55
go.sum linguist-generated=true
6+
7+
# Avoid git status and other tools (lint, fmt) reporting whitespace differences
8+
# on Windows machines by ensuring that `lf` on text files are not converted to `crlf`.
9+
* text=auto eol=lf

‎.github/ALLOWLIST‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Code generated by githubgen. DO NOT EDIT.
2+
#####################################################
3+
#
4+
# List of components
5+
# waiting on owners to be assigned
6+
#
7+
#####################################################
8+
#
9+
# Learn about CODEOWNERS file format:
10+
# https://help.github.com/en/articles/about-code-owners
11+
#
12+
13+
##
14+
# NOTE: New components MUST have one or more codeowners. Add codeowners to the component metadata.yaml and run make gengithub
15+
##
16+
17+
## COMMON & SHARED components
18+
internal/common
19+
20+
## DEPRECATED components
21+
# Start deprecated components list
22+
23+
24+
25+
# End deprecated components list
26+
27+
## UNMAINTAINED components
28+
29+
# Start unmaintained components list
30+
31+
32+
33+
# End unmaintained components list

‎.github/CODEOWNERS‎

Lines changed: 82 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,91 @@
1+
# Code generated by githubgen. DO NOT EDIT.
12
#####################################################
23
#
3-
# List of approvers for OpenTelemetry Collector
4+
# List of codeowners
45
#
56
#####################################################
67
#
7-
# Learn about membership in OpenTelemetry community:
8-
# https://github.com/open-telemetry/community/blob/main/community-membership.md
9-
#
10-
#
11-
# Learn about CODEOWNERS file format:
12-
# https://help.github.com/en/articles/about-code-owners
8+
# Learn about CODEOWNERS file format:
9+
# https://help.github.com/en/articles/about-code-owners
1310
#
1411

1512
* @open-telemetry/collector-approvers
1613

17-
# List all maintainers individually so all of them are notified
18-
.github/CODEOWNERS @open-telemetry/collector-approvers @codeboten @BogdanDrutu @dmitryax @mx-psi
19-
docs/rfc @open-telemetry/collector-approvers @codeboten @BogdanDrutu @dmitryax @mx-psi
20-
21-
confmap/ @open-telemetry/collector-approvers @mx-psi @evan-bradley
22-
exporter/debugexporter @open-telemetry/collector-approvers @andrzej-stencel
23-
exporter/exporterhelper @open-telemetry/collector-approvers @BogdanDrutu @dmitryax
24-
exporter/nopexporter @open-telemetry/collector-approvers @evan-bradley
25-
pdata/ @open-telemetry/collector-approvers @BogdanDrutu @dmitryax
26-
receiver/nopreceiver @open-telemetry/collector-approvers @evan-bradley
27-
service/internal/graph @open-telemetry/collector-approvers @djaglowski
28-
extension/experimental/storage @open-telemetry/collector-approvers @swiatekm
29-
30-
# Profiling-related modules
31-
pdata/pprofile @open-telemetry/collector-approvers @mx-psi @dmathieu
32-
consumer/consumerprofiles @open-telemetry/collector-approvers @mx-psi @dmathieu
33-
consumer/xconsumer @open-telemetry/collector-approvers @mx-psi @dmathieu
34-
connector/connectorprofiles @open-telemetry/collector-approvers @mx-psi @dmathieu
35-
connector/xconnector @open-telemetry/collector-approvers @mx-psi @dmathieu
36-
exporter/exporterhelper/exporterhelperprofiles @open-telemetry/collector-approvers @mx-psi @dmathieu
37-
exporter/exporterhelper/xexporterhelper @open-telemetry/collector-approvers @mx-psi @dmathieu
38-
exporter/exporterprofiles @open-telemetry/collector-approvers @mx-psi @dmathieu
39-
exporter/xexporter @open-telemetry/collector-approvers @mx-psi @dmathieu
40-
processor/processorprofiles @open-telemetry/collector-approvers @mx-psi @dmathieu
41-
processor/xprocessor @open-telemetry/collector-approvers @mx-psi @dmathieu
42-
receiver/receiverprofiles @open-telemetry/collector-approvers @mx-psi @dmathieu
43-
receiver/xreceiver @open-telemetry/collector-approvers @mx-psi @dmathieu
14+
# Files owned by collector-releases-approvers
15+
.github/workflows/prepare-release.yml @open-telemetry/collector-approvers @open-telemetry/collector-releases-approvers
16+
.github/workflows/sourcecode-release.yml @open-telemetry/collector-approvers @open-telemetry/collector-releases-approvers
17+
.github/workflows/scripts/release-*.sh @open-telemetry/collector-approvers @open-telemetry/collector-releases-approvers
18+
19+
# Start components list
20+
21+
cmd/builder/ @open-telemetry/collector-approvers
22+
cmd/mdatagen/ @open-telemetry/collector-approvers @dmitryax
23+
cmd/mdatagen/internal/sampleconnector/ @open-telemetry/collector-approvers
24+
cmd/mdatagen/internal/sampleprocessor/ @open-telemetry/collector-approvers
25+
cmd/mdatagen/internal/samplereceiver/ @open-telemetry/collector-approvers @dmitryax
26+
cmd/mdatagen/internal/samplescraper/ @open-telemetry/collector-approvers @dmitryax
27+
confmap/ @open-telemetry/collector-approvers @mx-psi @evan-bradley
28+
confmap/provider/envprovider/ @open-telemetry/collector-approvers
29+
confmap/provider/fileprovider/ @open-telemetry/collector-approvers
30+
confmap/provider/httpprovider/ @open-telemetry/collector-approvers
31+
confmap/provider/httpsprovider/ @open-telemetry/collector-approvers
32+
confmap/provider/yamlprovider/ @open-telemetry/collector-approvers
33+
connector/forwardconnector/ @open-telemetry/collector-approvers
34+
connector/xconnector/ @open-telemetry/collector-approvers @mx-psi @dmathieu
35+
consumer/xconsumer/ @open-telemetry/collector-approvers @mx-psi @dmathieu
36+
docs/rfcs/ @open-telemetry/collector-approvers @codeboten @bogdandrutu @dmitryax @mx-psi
37+
exporter/debugexporter/ @open-telemetry/collector-approvers @andrzej-stencel
38+
exporter/exporterhelper/ @open-telemetry/collector-approvers @bogdandrutu @dmitryax
39+
exporter/exporterhelper/internal/queuebatch/ @open-telemetry/collector-approvers
40+
exporter/exporterhelper/xexporterhelper/ @open-telemetry/collector-approvers @mx-psi @dmathieu
41+
exporter/nopexporter/ @open-telemetry/collector-approvers @evan-bradley
42+
exporter/otlpexporter/ @open-telemetry/collector-approvers
43+
exporter/otlphttpexporter/ @open-telemetry/collector-approvers
44+
exporter/xexporter/ @open-telemetry/collector-approvers @mx-psi @dmathieu
45+
extension/memorylimiterextension/ @open-telemetry/collector-approvers
46+
extension/xextension/ @open-telemetry/collector-approvers
47+
extension/xextension/storage/ @open-telemetry/collector-approvers @swiatekm
48+
extension/zpagesextension/ @open-telemetry/collector-approvers
49+
pdata/ @open-telemetry/collector-approvers @bogdandrutu @dmitryax
50+
pdata/pprofile/ @open-telemetry/collector-approvers @mx-psi @dmathieu
51+
processor/batchprocessor/ @open-telemetry/collector-approvers
52+
processor/memorylimiterprocessor/ @open-telemetry/collector-approvers
53+
processor/processorhelper/ @open-telemetry/collector-approvers
54+
processor/xprocessor/ @open-telemetry/collector-approvers @mx-psi @dmathieu
55+
receiver/nopreceiver/ @open-telemetry/collector-approvers @evan-bradley
56+
receiver/otlpreceiver/ @open-telemetry/collector-approvers
57+
receiver/receiverhelper/ @open-telemetry/collector-approvers
58+
receiver/xreceiver/ @open-telemetry/collector-approvers @mx-psi @dmathieu
59+
scraper/ @open-telemetry/collector-approvers
60+
scraper/scraperhelper/ @open-telemetry/collector-approvers
61+
service/ @open-telemetry/collector-approvers
62+
service/internal/graph/ @open-telemetry/collector-approvers
63+
64+
# End components list
65+
66+
#####################################################
67+
#
68+
# List of distribution maintainers
69+
#
70+
#####################################################
71+
72+
# Start distribution list
73+
74+
reports/distributions/core.yaml @open-telemetry/collector-approvers
75+
reports/distributions/contrib.yaml @open-telemetry/collector-approvers
76+
reports/distributions/k8s.yaml @open-telemetry/collector-approvers
77+
reports/distributions/otlp.yaml @open-telemetry/collector-approvers
78+
79+
# End distribution list
80+
81+
#####################################################
82+
#
83+
## UNMAINTAINED components
84+
#
85+
#####################################################
86+
87+
# Start unmaintained components list
88+
89+
90+
91+
# End unmaintained components list

0 commit comments

Comments
 (0)
⚡