Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: run make generate for collectors and verify workdir clean #1985

Merged
merged 5 commits into from
Dec 14, 2024
Merged

ci: run make generate for collectors and verify workdir clean #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d59b48
ci: run make generate for collectors and verify workdir clean
blumamir Dec 13, 2024
fba0051
fix: make generate for odigosconditionalattributes processor
blumamir Dec 13, 2024
c673709
Merge remote-tracking branch 'upstream/main' into collector-generate
blumamir Dec 13, 2024
ce115f8
fix: add generate to ci message
blumamir Dec 13, 2024
fee837b
fix: metadata type for tests
blumamir Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/verify-collector-ocb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
go-version: "1.23.0"
- name: Generate collector with ocb
working-directory: ./collector
run: "make genodigoscol"
run: "make genodigoscol generate"
- name: Verify Generate
working-directory: ./collector
run: |
if [[ $(git diff --exit-code) ]]; then
git diff
echo "odigos collector distribution module is not in sync with builder config. Please run 'make genodigoscol' in 'collector' directory and commit the changes."
echo "odigos collector distribution module is not in sync with builder config. Please run 'make genodigoscol generate' in 'collector' directory and commit the changes."
exit 1
fi
0 ...alattributes/generated_components_test.go → ...nalattributes/generated_component_test.go
View file
Open in desktop
File renamed without changes.
15 changes: 15 additions & 0 deletions collector/processors/odigosconditionalattributes/internal/metadata/generated_status.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion collector/processors/odigosconditionalattributes/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: odigosconditionalattributesprocessor
type: odigosconditionalattributes
status:
class: processor
stability:
Expand Down
43 changes: 43 additions & 0 deletions collector/processors/odigossqldboperationprocessor/generated_component_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions collector/processors/odigossqldboperationprocessor/generated_package_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions collector/processors/odigossqldboperationprocessor/internal/metadata/generated_status.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading