pyrox.dev
Merge pull request #230746 from tylerjl/otel-collector-contrib-76
opentelemetry-collector-contrib: 0.66.0 -> 0.76.1
authored by Uri Baghin and committed by GitHub ff1f622c abae3131
+21
-4
pkgs/tools/misc/opentelemetry-collector/contrib.nix
+21
-4
pkgs/tools/misc/opentelemetry-collector/contrib.nix
···
2
2
, fetchFromGitHub
3
3
, lib
4
4
, stdenv
5
+
, systemdMinimal
6
+
, withSystemd ? false
5
7
}:
6
8
7
9
buildGoModule rec {
8
10
pname = "opentelemetry-collector-contrib";
9
-
version = "0.66.0";
11
+
version = "0.76.1";
10
12
11
13
src = fetchFromGitHub {
12
14
owner = "open-telemetry";
13
15
repo = "opentelemetry-collector-contrib";
14
16
rev = "v${version}";
15
-
sha256 = "sha256-FT5AoqCHNf2sdKyejALOsL/zHrrxP7vdntagR9vA00I=";
17
+
sha256 = "sha256-Aeiq9IJReUxJUpeq5mSReK5foC5aY4fMSZli0ZUjYPc=";
16
18
};
17
19
# proxy vendor to avoid hash missmatches between linux and macOS
18
20
proxyVendor = true;
19
-
vendorSha256 = "sha256-65bfTCMRJ8iL5ABGPqvkayw4zSn4KkCriEkWYa0Pe68=";
21
+
vendorSha256 = "sha256-vLbx/qmSZuteuvChnyA/wcEcIjU3zWkxSjfk8VBdgU4=";
20
22
21
-
subPackages = [ "cmd/otelcontribcol" ];
23
+
# there is a nested go.mod
24
+
sourceRoot = "source/cmd/otelcontribcol";
22
25
23
26
# CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0"
24
27
# https://github.com/shirou/gopsutil/issues/976
25
28
CGO_ENABLED = if stdenv.isLinux then 1 else 0;
29
+
30
+
# journalctl is required in-$PATH for the journald receiver tests.
31
+
nativeCheckInputs = lib.optionals stdenv.isLinux [ systemdMinimal ];
32
+
33
+
# We don't inject the package into propagatedBuildInputs unless
34
+
# asked to avoid hard-requiring a large package. For the journald
35
+
# receiver to work, journalctl will need to be available in-$PATH,
36
+
# so expose this as an option for those who want more control over
37
+
# it instead of trusting the global $PATH.
38
+
propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ];
39
+
40
+
# This test fails on darwin for mysterious reasons.
41
+
checkFlags = lib.optionals stdenv.isDarwin
42
+
[ "-skip" "TestDefaultExtensions/memory_ballast" ];
26
43
27
44
ldflags = [
28
45
"-s"