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

datadog-agent: 6.11.2 -> 7.30.2 #136109

Merged
merged 8 commits into from
Sep 12, 2021
Merged

Conversation

john-consumable
Copy link
Contributor

@john-consumable john-consumable commented Aug 29, 2021

Motivation for this change

#105221 and #101964

Plus, datadog-agent failed to build on master (for me).

Things done

datadog-agent is now built as a go module. However, the build process
is now to be driven by the python invoke tool. While datadog-agent
builds with buildGoModule, some investigation should be done to ensure
we are not missing any integrations or features from the invoke build
system.

This also updates datadog-agent from python 2.7 to 3.x.

One other issue of note: most of the invoke tasks seem to use some git parsing to get version numbers and the like. This package may need to be checked for reproducibility issues now.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin (unsupported platform)
    • aarch64-darwin (unsupported platform)
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant (service changes documented)
    • (Module addition) Added a release notes entry if adding a new NixOS module (no additional NixOS module)
  • Fits CONTRIBUTING.md.

@r-rmcgibbo

This comment has been minimized.

@john-consumable
Copy link
Contributor Author

Looks like I don't understand the integrations very well. Any help would be appreciated to help CI.

datadog-agent is now built as a go module.  However, the build process
is now to be driven by the python invoke tool.  While datadog-agent
builds with buildGoModule, some investigation should be done to ensure
we are not missing any integrations or features from the invoke build
system.

This also updates datadog-agent from python 2.7 to 3.x.

One other issue of note: most of the invoke tasks seem to use some git
parsing to get version numbers and the like. This package may need to
be checked for reproducibility issues now.
@john-consumable
Copy link
Contributor Author

@ofborg build datadog-agent datadog-process-agent

@@ -41,10 +41,10 @@ let
src = pkgs.fetchFromGitHub {
owner = "DataDog";
repo = "integrations-core";
rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4";
sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb";
rev = "7.30.1";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
rev = "7.30.1";
rev = version;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! Done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants