Skip to content

Commit 5d2cdeb

Browse files
committed
Merge main
2 parents 5aec726 + a2242f7 commit 5d2cdeb

File tree

150 files changed

+2633
-6608
lines changed

Some content is hidden

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

150 files changed

+2633
-6608
lines changed

.chloggen/TEMPLATE.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Use this changelog template to create an entry for release notes.
2+
13
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
24
change_type:
35

@@ -14,3 +16,10 @@ issues: []
1416
# These lines will be padded with 2 spaces and then inserted directly into the document.
1517
# Use pipe (|) for multiline entries.
1618
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: []

.chloggen/codeboten_add-periodic-internal-timeout.yaml renamed to .chloggen/add-exemplars-logging.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
change_type: enhancement
33

44
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
5-
component: service
5+
component: loggingexporter
66

77
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: "Add support for `interval` and `timeout` configuration in periodic reader"
8+
note: Adds exemplars logging to the logging exporter when `detailed` verbosity level is set.
99

1010
# One or more tracking issues or pull requests related to the change
11-
issues: [7641]
11+
issues: [7912]
1212

1313
# (Optional) One or more lines of additional information to render under the primary note.
1414
# These lines will be padded with 2 spaces and then inserted directly into the document.

.chloggen/codeboten_add-console-exporter.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.chloggen/codeboten_add-tracer-provider.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.chloggen/codeboten_jul7-otlp.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.chloggen/codeboten_may-29-otlp-export.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.chloggen/codeboten_update-jsonschema-0001b0391785d880ce052f4c6fd85c5a4e0474fa.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.chloggen/config.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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
8+
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
13+
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]

.chloggen/connector-validation.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.chloggen/exporter-helper-v2.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
5+
component: exporter/exporterhelper
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Introduce a new exporter helper that operates over client-provided requests instead of pdata
9+
10+
# One or more tracking issues or pull requests related to the change
11+
issues: [7874]
12+
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
13
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
24
change_type: enhancement
35

46
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
57
component: otlpreceiver
68

79
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: Add http url paths per signal config options to otlpreceiver
10+
note: Export HTTPConfig as part of the API for creating the otlpreceiver configuration.
911

1012
# One or more tracking issues or pull requests related to the change
11-
issues: [7511]
13+
issues: [8175]
1214

1315
# (Optional) One or more lines of additional information to render under the primary note.
1416
# These lines will be padded with 2 spaces and then inserted directly into the document.
1517
# Use pipe (|) for multiline entries.
16-
subtext:
18+
subtext: Changes signature of receiver/otlpreceiver/config.go type httpServerSettings to HTTPConfig.
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]
Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
13
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
24
change_type: enhancement
35

46
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
5-
component: scraperhelper
7+
component: configgrpc
68

79
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: Adding optional timeout field to scrapers
10+
note: "Add support for :authority pseudo-header in grpc client"
911

1012
# One or more tracking issues or pull requests related to the change
11-
issues: [7951]
13+
issues: [8228]
1214

1315
# (Optional) One or more lines of additional information to render under the primary note.
1416
# These lines will be padded with 2 spaces and then inserted directly into the document.
1517
# Use pipe (|) for multiline entries.
1618
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: []

.chloggen/otlphttpexporter-trailing-slash.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GitHub action is used to compare API state snapshots of Main
2-
# to Head of the PR in order to validate releases are not breaking
3-
# backwards compatibility.
2+
# to Head of the PR in order to validate releases are not breaking
3+
# backwards compatibility.
44
#
55
# This GitHub action will fail if there are incompatible changes.
66
#
@@ -15,44 +15,47 @@ on:
1515
jobs:
1616
Check-Compatibility:
1717
runs-on: macos-latest
18+
env:
19+
BASE_REF: ${{ github.base_ref }}
20+
HEAD_REF: ${{ github.head_ref }}
1821
steps:
1922

2023
- name: Checkout-Main
2124
uses: actions/checkout@v3
22-
with:
25+
with:
2326
ref: ${{ github.base_ref }}
2427
path: ${{ github.base_ref }}
2528

2629
- name: Checkout-HEAD
27-
uses: actions/checkout@v3
28-
with:
30+
uses: actions/checkout@v3
31+
with:
2932
path: ${{ github.head_ref }}
3033

3134
- name: Setup Go
3235
uses: actions/setup-go@v4
3336
with:
34-
go-version: ~1.19.11
35-
37+
go-version: ~1.20.7
38+
3639
# Generate apidiff states of Main
3740
- name: Generate-States
3841
run: |
39-
cd ${{ github.base_ref }}
42+
cd $BASE_REF
4043
make apidiff-build
41-
44+
4245
# Compare apidiff states of Main with PR
4346
- name: Compare-States
44-
env:
47+
env:
4548
CI: true
4649
COMPARE_OPTS: -d "../${{ github.base_ref }}/internal/data/apidiff"
4750
run: |
48-
cd ${{ github.head_ref }}
51+
cd $HEAD_REF
4952
make apidiff-compare
50-
53+
5154
# Fail GitHub Action if there are incompatible changes
5255
- name: Check-States
53-
env:
56+
env:
5457
CI: true
5558
COMPARE_OPTS: -d "../${{ github.base_ref }}/internal/data/apidiff" -c
5659
run: |
57-
cd ${{ github.head_ref }}
60+
cd $HEAD_REF
5861
make apidiff-compare

.github/workflows/build-and-test-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Go
2020
uses: actions/setup-go@v4
2121
with:
22-
go-version: ~1.19.11
22+
go-version: ~1.20.7
2323
- name: Cache Go
2424
uses: actions/cache@v3
2525
env:

0 commit comments

Comments
 (0)