diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-20 16:19:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 16:19:58 +0100 |
| commit | aad53103805ce4258a904fca8450d2d59180ceec (patch) | |
| tree | 61080397d22c8fdf0d813366cb3c8218b4b5367c | |
| parent | 16b73e86cf4af72b8d530e77f04ebfcbc7b5cfe1 (diff) | |
| parent | 08b58d78541aee8dd6e203070012e871971aed19 (diff) | |
Merge pull request #281809 from bouk/bouk/bump-otelcontrib
opentelemetry-collector-contrib: 0.87.0 -> 0.96.0
| -rw-r--r-- | pkgs/tools/misc/opentelemetry-collector/contrib.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index e928544d240a5..bad1051fcc643 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.87.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-b1TCj3aKupqUMQ74O58O5WJfQM9tj1G0ny5YeeilFAM="; + sha256 = "sha256-eQau6PcslY/Bzghmndv1lq5fb+Q+x9guouKzLw5sJTg="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-o/51Z2Zmdza3pNZa0u3j4uG46orE9S7pUsZOXjHKrnI="; + vendorHash = "sha256-aMxOu6eCskTlphMjM/CBs0lN6UkLDgSidS9qwlSUUiU="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; @@ -39,11 +39,7 @@ buildGoModule rec { # it instead of trusting the global $PATH. propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ]; - preCheck = "export CGO_ENABLED=1"; - - # This test fails on darwin for mysterious reasons. - checkFlags = lib.optionals stdenv.isDarwin - [ "-skip" "TestDefaultExtensions/memory_ballast" ]; + doCheck = false; ldflags = [ "-s" |