diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index d8b3dc1100e9..2516d6be2f48 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.144.0"; + version = "0.151.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-u7OVkRmSn0DomwkFByOHSNCmpPaLwQnMumJYKHbqdl0="; + hash = "sha256-X7Ke4X6t0HXKlf0hJb1CXE18T8Ov2GZwjX4HSGJ1gtw="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-W+Ap4JMQTI7g9s668VL1rMj4CErbyczW+nKh5ZW94/Y="; + vendorHash = "sha256-rRrLHqwLQQAB5u2vbtAjInUjvj6sGMyKPjOKVnwvQSM="; env.CGO_ENABLED = 0; ldflags = [ @@ -28,7 +28,7 @@ buildGoModule rec { # Some tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping. checkFlags = [ - "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning" + "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning|TestRunInit" ]; # Rename to ocb (it's generated as "builder") diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix index 656ee5fc0aa2..db447e24cddd 100644 --- a/pkgs/tools/misc/opentelemetry-collector/releases.nix +++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix @@ -26,7 +26,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-collector-releases"; rev = "v${version}"; - hash = "sha256-/I6kYm/j2hO2OAZaWVIRYI1ejBTGMI3PzTjRLcmwziQ="; + hash = "sha256-5AoUgGZEvxbvlksD1P84lxMrHPAP05cN21fABK4UXRg="; }; # Then from this src, we use the tool to generate some go code, including @@ -148,26 +148,26 @@ in lib.recurseIntoAttrs { otelcol = mkDistribution { name = "otelcol"; - sourceHash = "sha256-XGQIHkRfCSdEnZlhodN38BKZGkgOPuUnxveG4yX0rMw="; - vendorHash = "sha256-0i+eHVBwYvEKf4kXfyOuN/gEkDk2/5s7+3HQjYCtI94="; + sourceHash = "sha256-4PpZ6anKPkFyVcARJJSEpyy3duTCyrMnnAnh6CWwjUc="; + vendorHash = "sha256-OoXz9rFIipM0tc6kvkkPdUtYXVIfo0L40V4SUfwSF6M="; }; otelcol-contrib = mkDistribution { name = "otelcol-contrib"; - sourceHash = "sha256-87VmiafluGem4p5hRP+UmPuSJeXdXjZkubWzqhXtyJg="; - vendorHash = "sha256-/qSXvt8oQ0C3V49an7TNUw0bcNVnXd5Qmz5oCRp+KTE="; + sourceHash = "sha256-wUmpivqLSnRYGTJn3IIlpwFXORmK4FJrc8U472YPV2o="; + vendorHash = "sha256-7Rb3Ku0q+5cBvgtd/oZaLaFa4chv0b/MzaHEpJvJ6rE="; proxyVendor = true; # hash mismatch between linux and darwin }; otelcol-k8s = mkDistribution { name = "otelcol-k8s"; - sourceHash = "sha256-B5NbbQBIz3RZ/+jSxNhuY+zpfhHlg26cvUlMqlYXtq0="; - vendorHash = "sha256-2dGNrsskrCh76bTMuPYcRH+bMl/sE+KVn2mOqcF2PeI="; + sourceHash = "sha256-yNhE0CwMNus12QDSbP/x9irrIcOdez0e/RpXFFRQ2LE="; + vendorHash = "sha256-2ZzLCMTafbpmSpkpwvYgkP/Myg/QD1LHgiMigbj3x9I="; }; otelcol-otlp = mkDistribution { name = "otelcol-otlp"; - sourceHash = "sha256-c83fzhC4XbvRHZ3XwXQgwsyW1TDiDs0T/bX3h53n2RE="; - vendorHash = "sha256-QVNQFsaACvlByQWwpl2emSIrL+how78WtU51YJ2AvAU="; + sourceHash = "sha256-+cffC4sOlyPWtydkPZz7M0NF2Q3heQ04/pEB8d+942c="; + vendorHash = "sha256-WiP+TYj7VZBt3tP4C/ZvQwkDP8/b4F+Bc7Z95p0tBTI="; }; }