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.

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

[pkg/stanza] Initialize with log-collection as a subtree #9922

Merged
merged 266 commits into from
May 12, 2022

Conversation

djaglowski
Copy link
Member

@djaglowski djaglowski commented May 10, 2022

This also temporarily excludes pkg/stanza from several validation checks. Checklist for reverting those changes:

  • Remove exclusion from Makefile's ALL_MODULES
  • Remove exclusion from .github/workflows/scripts/check-collector-module-version.sh's mod_files
  • Remove exclusion from versions.yaml

wph95 and others added 30 commits March 3, 2021 08:58
* Add some golden config tests to file_input operator
* makefile add check/add license feature
* file_input add mapstructure support

Co-authored-by: Daniel Jaglowski <[email protected]>
* Add additional golden config test cases to file_input
* Change entry.Labels to entry.Attributes
* Remove unused packages

* Remove separate module for k8sevent input
* Update changelog ahead of v0.16.0 release
* Require a namespace when using offsets database

This is necessary in order to allow multiple pipelines to run in the
same process without being at risk of overwriting offsets.
* Add mapstructure tests to Bytesize type
* Add mapstructure support to parsers
* Add mapstructure support and expand test cases
#60)

* use opentelemetry collect standard tls config instead of tc tls config
* fix golang ci yaml and improve makefile
* journalinput config support mapstructure
djaglowski and others added 6 commits April 8, 2022 15:43
The default value of parse_to was changed at the same time that
some new tests were added to the regex parser. The new tests did
not account for this, but no merge conflict existed.
* Update changelog ahead of v0.29.0 release

* Add upgrade guide to changelog
* Minor cleanup in docs

* Remove whitespace and move pipeline into types dir

* Whitespace in pipeline.md
* Complete removal of preserve_to setting

* Retain parse_from field in sub-parsers
* Update regex_parser docs

* Update regex_parser.md
* initial commit

* added separate fields for RenderingInfo and EventData

* changed xml.go to only populate output with necessary fields
Makefile.Common Outdated Show resolved Hide resolved
@djaglowski djaglowski marked this pull request as ready for review May 10, 2022 21:43
@djaglowski djaglowski requested review from a team and mx-psi May 10, 2022 21:43
Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't participate on the previous "move git history across repos" efforts, but this looks sensible to me. I think we should create an issue for follow-up steps. Also, I left a comment about when do we want to remove/move files related to Github Actions pipelines for log-collection

@@ -0,0 +1,24 @@
codecov:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this and other .github configuration files be removed in a follow-up PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, definitely. My next PR will be to do exactly that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created #9960 as an aggregate tracking issue.

@djaglowski
Copy link
Member Author

#9946 should be decided on before this PR is merged, since this PR includes that change.

Copy link
Contributor

@pmm-sumo pmm-sumo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Impressive collection of commits

@bogdandrutu
Copy link
Member

@djaglowski you need to manually cleanup all the commits (the last once) since we want to do a "merge" not squash commit and all commits will be kept forever. I think you can at least start by dropping the impi merge, and ping on this issue when list is clean.

@djaglowski djaglowski force-pushed the pkg-stanza-subtree branch from 8bf4841 to c9b6347 Compare May 11, 2022 20:38
@djaglowski
Copy link
Member Author

@bogdandrutu, this should be good to go now, if you want to have another look.

@bogdandrutu bogdandrutu merged commit e8ed9c1 into open-telemetry:main May 12, 2022
@djaglowski djaglowski deleted the pkg-stanza-subtree branch May 12, 2022 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.