Skip to content

Commit 6eaaf89

Browse files
authored
Merge branch 'open-telemetry:main' into main
2 parents 3fbff01 + f091619 commit 6eaaf89

File tree

860 files changed

+11973
-8300
lines changed

Some content is hidden

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

860 files changed

+11973
-8300
lines changed

.checkapi.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ ignored_paths:
3636
- receiver/pulsarreceiver # 38930
3737
- exporter/pulsarexporter # 38929
3838
- exporter/elasticsearchexporter/integrationtest
39-
- scraper/zookeeperscraper
4039
- testbed/mockdatasenders/mockdatadogagentexporter
4140
- extension/sumologicextension # 40655
4241
allowed_functions:
@@ -64,6 +63,10 @@ allowed_functions:
6463
classes:
6564
- receiver
6665
return_types: [receiver.Factory]
66+
- name: NewFactory
67+
classes:
68+
- scraper
69+
return_types: [scraper.Factory]
6770

6871
ignored_functions:
6972
- ^Test.*

.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+
```
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: 'extension/encoding'
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: 'Add user_agent.original, destination.address, destination.port, url.domain to ELB access logs'
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: [43141]
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: []

0 commit comments

Comments
 (0)