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

Sync grafana/agent:0e36aa2 into grafana/alloy:main #14

Merged
merged 10 commits into from
Feb 29, 2024
Merged

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 29, 2024

Process followed:

git remote add grafana-agent [email protected]:grafana/agent.git 
git fetch grafana-agent main 
git checkout -b sync-grafana-agent origin/main 
git merge grafana-agent/main 
# (fix merge conflicts)
git commit  

thampiotr and others added 6 commits February 28, 2024 15:00
* Update loki dep to k190

* port renames

* fix loki push api
* Add windows build for boring crypto

* add changelog

* add details on cngcrypto and fips

* put some jsonnet into a function

Signed-off-by: erikbaranowski <[email protected]>

---------

Signed-off-by: erikbaranowski <[email protected]>
Co-authored-by: erikbaranowski <[email protected]>
* fix issue with 64 bit registry

* fix issue with 64 bit registry
wildum and others added 4 commits February 29, 2024 16:26
* fix wiring of custom component nodes by checking import before local declares

* update changelog

* add comment in loader to explain why the imports should be checked before the local declare
There may be situations where the flow mode logger receivers a nil
value, potentially due to misconfiguration or a component which exports
its values only after being ran.

Fixes #6557.
Our backwards compatibility guarantees[1] cover importable Go code. This applies once we cut the 1.0 release, which we are rapidly approaching. 

The Grafana Agent maintainers have agreed that it is more important for 1.0 to focus on stability of the configuration file and usage of the Grafana Agent binaries rather than on the stability of importable code. 

This PR moves all importable Go code to `internal/` so that it is no longer externally importable. This gives us time to finalize Go APIs without blocking the 1.0 release or removing our commitment to having Go APIs follow semantic versioning. Some time after the 1.0 release, we will have public Go APIs available for consumption. 

There are some slightly odd artifacts in this PR for the purposes of making sure we have no public Go API surface:

* Non-binary tools have been moved to `internal/tools`:
  * Code for generating documentation has been moved to `internal/tools/docs_generator`. 
  * Code for integration testing system packages has been moved to `internal/tools/packaging_test`. 
* Binaries (i.e., `package main`) not a part of our release assets have similarly moved to `internal/cmd`:
  * Code for integration testing Flow components has been moved to `internal/cmd/integration-tests` 
  * Code for linting the codebase has been moved to `internal/cmd/agentlint` 
  * Code for evaluating River files has been moved to `internal/cmd/rivereval`
* All flow mode UI code has been moved from `web` to `internal/web`. 

I don't know if all of these changes are necessary, or if they have been moved to a sensible location. However, for the scope of this PR, I would like to keep the folders in their new location, and follow-up PRs and discussions can be used to reorganize `internal/` as needed. 

[1]: https://github.com/grafana/agent/blob/main/docs/rfcs/0008-backwards-compatibility.md
@rfratto rfratto requested review from a team and clayton-cornell as code owners February 29, 2024 16:59
@rfratto rfratto changed the title Sync grafana/agent:b691a44 into grafana/alloy:main Sync grafana/agent:0e36aa2 into grafana/alloy:main Feb 29, 2024
@rfratto
Copy link
Member Author

rfratto commented Feb 29, 2024

After the experimentations in #11, #12, and #13, I'm settling on using merge commits for these re-syncs.

@rfratto rfratto merged commit dfb917a into main Feb 29, 2024
9 checks passed
@rfratto rfratto deleted the sync-grafana-agent branch February 29, 2024 17:04
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 31, 2024
@rfratto rfratto added the backport-to-agent:no PR should NOT be backported to the agent repo. label Apr 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport-to-agent:no PR should NOT be backported to the agent repo. frozen-due-to-age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants