Skip to content

Commit

Permalink
Merge branch 'main' into mx-psi/configopaque-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
mx-psi authored Feb 1, 2024
2 parents b79e526 + 203ae9b commit dc71a3e
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 3 deletions.
25 changes: 25 additions & 0 deletions .chloggen/add_generated_tests_check_config.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: enhancement

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add a generated test that checks the config struct using `componenttest.CheckConfigStruct`

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

# (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: []
35 changes: 32 additions & 3 deletions .github/workflows/contrib-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,22 @@ permissions:
contents: read

jobs:
contrib_tests:
contrib-tests-matrix:
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.labels.*.name, 'Skip Contrib Tests') }}

strategy:
matrix:
group:
- receiver-0
- receiver-1
- processor
- exporter
- extension
- connector
- internal
- pkg
- cmd
- other
steps:
- name: Checkout Repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -32,4 +44,21 @@ jobs:
run: |
contrib_path=/tmp/opentelemetry-collector-contrib
git clone --depth=1 https://github.com/open-telemetry/opentelemetry-collector-contrib.git $contrib_path
make CONTRIB_PATH=$contrib_path SKIP_RESTORE_CONTRIB=true check-contrib
make CONTRIB_PATH=$contrib_path SKIP_RESTORE_CONTRIB=true GROUP=${{ matrix.group }} check-contrib
contrib_tests:
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.labels.*.name, 'Skip Contrib Tests') }}
needs: [ contrib-tests-matrix ]
steps:
- name: Print result
run: echo ${{ needs.contrib-tests-matrix.result }}
- name: Interpret result
run: |
if [[ success == ${{ needs.contrib-tests-matrix.result }} ]]
then
echo "All matrix jobs passed!"
else
echo "One or more matrix jobs failed."
false
fi
4 changes: 4 additions & 0 deletions cmd/mdatagen/templates/component_test.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ func (aneh *assertNoErrorHost) ReportFatalError(err error) {
}


func TestCheckConfigStruct(t *testing.T) {
componenttest.CheckConfigStruct(NewFactory().CreateDefaultConfig())
}

{{ if isExporter }}
func Test_ComponentLifecycle(t *testing.T) {
factory := NewFactory()
Expand Down

0 comments on commit dc71a3e

Please sign in to comment.