Skip to content

Commit

Permalink
Merge branch 'main' into codeboten/graduate-pkgs-confignet
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Boten authored Jan 25, 2024
2 parents 8574dba + d2e35bd commit c1fcd53
Show file tree
Hide file tree
Showing 558 changed files with 23,925 additions and 7,595 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement
change_type: bug_fix

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Generated Semantic conventions 1.22.0.
note: fix opencensus bridge configuration in periodic readers

# One or more tracking issues or pull requests related to the change
issues: [8686]
issues: [9361]

# (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.
Expand All @@ -22,4 +22,4 @@ subtext:
# 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: []
change_logs: []
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: cmd/otelcorecol
component: confignet

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix the code detecting if the collector is running as a service on Windows.
note: Remove deprecated `DialContext` and `ListenContext` functions

# One or more tracking issues or pull requests related to the change
issues: [7350]
issues: [9363]

# (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: Removed the `NO_WINDOWS_SERVICE` environment variable given it is not needed anymore.
subtext:

# 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: [user]
change_logs: [api]
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: "enhancement"
change_type: "breaking"

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Add RetrySettings validation function"
note: "Remove deprecated funcs and types"

# One or more tracking issues or pull requests related to the change
issues: [9089]
issues: [9283]

# 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: [api]
25 changes: 25 additions & 0 deletions .chloggen/deprecate_toListener.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: deprecation

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Deprecate `ToListener` function in favor of `ToListenerContext`

# One or more tracking issues or pull requests related to the change
issues: [9389]

# (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:

# 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: [api]
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: processor/memory_limiter
component: component

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Update config validation errors
note: "Add `component.UseLocalHostAsDefaultHost` feature gate that changes default endpoints from 0.0.0.0 to localhost"

# One or more tracking issues or pull requests related to the change
issues: [9059]
issues: [8510]

# (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: |
- Fix names of the config fields that are validated in the error messages
- Move the validation from start to the initialization phrase
subtext: |
The only component in this repository affected by this is the OTLP receiver.
# 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: [user]
change_logs: []

Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@
change_type: enhancement

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Enable `telemetry.useOtelForInternalMetrics` by updating the flag to beta"
note: "Add the `featuregate.ErrAlreadyRegistered` error, which is returned by `featuregate.Registry`'s `Register` when adding a feature gate that is already registered."

# One or more tracking issues or pull requests related to the change
issues: [7454]
issues: [8622]

# (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: |
The metrics generated should be consistent with the metrics generated
previously with OpenCensus. Users can disable the behaviour
by setting `--feature-gates -telemetry.useOtelForInternalMetrics` at
collector start.
subtext: |
Use `errors.Is` to check for this error.
# 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: []
change_logs: [api]
1 change: 1 addition & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ coverage:

ignore:
- "pdata/internal/data/protogen/**/*"
- "cmd/mdatagen/third_party/**/*"
18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ assignees: ''
---

**Describe the bug**
A clear and concise description of what the bug is.
<!-- A clear and concise description of what the bug is. -->

**Steps to reproduce**
If possible, provide a recipe for reproducing the error.
<!-- If possible, provide a recipe for reproducing the error. -->

**What did you expect to see?**
A clear and concise description of what you expected to see.
<!-- A clear and concise description of what you expected to see. -->

**What did you see instead?**
A clear and concise description of what you saw instead.
<!-- A clear and concise description of what you saw instead. -->

**What version did you use?**
Version: (e.g., `v0.4.0`, `1eb551b`, etc)
<!-- Version: (e.g., `v0.4.0`, `1eb551b`, etc) -->

**What config did you use?**
Config: (e.g. the yaml config file)
<!-- Config: (e.g. the yaml config file) -->

**Environment**
OS: (e.g., "Ubuntu 20.04")
Compiler(if manually compiled): (e.g., "go 14.2")
<!-- OS: (e.g., "Ubuntu 20.04") -->
<!-- Compiler(if manually compiled): (e.g., "go 14.2") -->

**Additional context**
Add any other context about the problem here.
<!-- Add any other context about the problem here. -->
12 changes: 6 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ We are currently preparing for the upcoming 1.0 GA release. Pull requests that a
the current roadmap and are not aimed at stabilizing and preparing the Collector for the release will
not be accepted.

_Delete this paragraph before submitting._
_Delete the preceding paragraph before submitting._

**Description:** <Describe what has changed.
Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.>
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

**Link to tracking Issue:** <Issue number if applicable>

**Testing:** < Describe what testing was performed and which tests were added.>
**Testing:** <Describe what testing was performed and which tests were added.>

**Documentation:** < Describe the documentation added.>
**Documentation:** <Describe the documentation added.>

_Please delete paragraphs that you did not use before submitting._
11 changes: 6 additions & 5 deletions .github/workflows/api-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
name: "Inform Incompatible PRs"
on:
pull_request:
paths-ignore:
- 'cmd/builder/**'
branches:
- main

permissions:
contents: read

jobs:
Check-Compatibility:
runs-on: macos-latest
Expand All @@ -21,18 +22,18 @@ jobs:
steps:

- name: Checkout-Main
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: ${{ github.base_ref }}
path: ${{ github.base_ref }}

- name: Checkout-HEAD
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
path: ${{ github.head_ref }}

- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: ~1.20.12

Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build-and-test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,22 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
windows-unittest:
runs-on: windows-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: ~1.20.12
cache: false
- name: Cache Go
uses: actions/cache@v3
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
env:
cache-name: cache-go-modules
with:
Expand Down
Loading

0 comments on commit c1fcd53

Please sign in to comment.