Unverified Commit aad53103 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #281809 from bouk/bouk/bump-otelcontrib

opentelemetry-collector-contrib: 0.87.0 -> 0.96.0
parents 16b73e86 08b58d78
Loading
Loading
Loading
Loading
+4 −8
Original line number Diff line number Diff line
@@ -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"