Skip to content

Conversation

rafaelwestphal
Copy link
Contributor

Description

Building and packing the new ops-agent-plugin binary.

Related issue

b/393166773

How has this been tested?

DNA

Checklist:

  • Unit tests
    • Unit tests do not apply.
    • Unit tests have been added/modified and passed for this PR.
  • Integration tests
    • Integration tests do not apply.
    • Integration tests have been added/modified and passed for this PR.
  • Documentation
    • This PR introduces no user visible changes.
    • This PR introduces user visible changes and the corresponding documentation change has been made.
  • Minor version bump
    • This PR introduces no new features.
    • This PR introduces new features, and there is a separate PR to bump the minor version since the last release already.
    • This PR bumps the version.

Copy link
Contributor

@XuechunHou XuechunHou left a comment

Choose a reason for hiding this comment

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

A few things I have noticed:

  1. Please include google_cloud_ops_agent_engine (the conf generator) binary in the tarball.
  2. Currently the tarfile has the following structure:
tar -tzf google-cloud-ops-agent-plugin_2.54.0.tar.gz
./
./var/
./var/lib/
./var/lib/google-guest-agent/
./var/lib/google-guest-agent/plugins/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/libexec/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/libexec/google_cloud_ops_agent_wrapper
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/libexec/google_cloud_ops_agent_diagnostics
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/plugin
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/THIRD_PARTY_LICENSES/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/subagents/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/subagents/opentelemetry-collector/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/subagents/opentelemetry-collector/otelopscol
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/subagents/fluent-bit/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/subagents/fluent-bit/bin/
./var/lib/google-guest-agent/plugins/ops-agent-plugin_2.54.0/subagents/fluent-bit/bin/fluent-bit

What I expect is the following:

tar -tzf ops-agent-plugin.tar.gz
THIRD_PARTY_LICENSES/
THIRD_PARTY_LICENSES/text1.txt
libexec/
libexec/google_cloud_ops_agent_engine
libexec/google_cloud_ops_agent_wrapper
libexec/google_cloud_ops_agent_diagnostics
plugin
subagents/
subagents/opentelemetry-collector/
subagents/opentelemetry-collector/otelopscol
subagents/fluent-bit/
subagents/fluent-bit/bin/
subagents/fluent-bit/bin/fluent-bit

libexec, subagents and THIRD_PARTY_LICENSES dirs need to be at the top level, so as the plugin executable.

  1. THIRD_PARTY_LICENSES should not be an empty directory; otherwise, the tarball will be rejected by UAP. For example, see this demo plugin: https://source.corp.google.com/piper///depot/google3/cloud/cluster/guestplatform/demo_plugin/THIRD_PARTY_LICENSES/.
    For now, we can place an empty text file in the directory. However, could you please send a message to the UAP group chat regarding the required license content and format? Eventually we will have to add the real license to the tarball.

@rafaelwestphal rafaelwestphal added the kokoro:force-run Forces kokoro to run integration tests on a CL label Jan 31, 2025
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label Jan 31, 2025
@rafaelwestphal rafaelwestphal merged commit a88eff2 into master Feb 3, 2025
69 checks passed
@rafaelwestphal rafaelwestphal deleted the westphalrafael-docker-plugin branch February 3, 2025 15:04
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.

4 participants