From 3000754f50f02abf066727ef35789d1684789b45 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Thu, 18 Jan 2024 16:57:14 +0100
Subject: [PATCH 1/2] opentelemetry-collector-contrib: 0.87.0 -> 0.96.0

Skip some extra failing tests
---
 .../misc/opentelemetry-collector/contrib.nix      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
index e928544d240a..7668bf0a8daa 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";
@@ -41,9 +41,12 @@ buildGoModule rec {
 
   preCheck = "export CGO_ENABLED=1";
 
-  # This test fails on darwin for mysterious reasons.
-  checkFlags = lib.optionals stdenv.isDarwin
-    [ "-skip" "TestDefaultExtensions/memory_ballast" ];
+  checkFlags = [
+    # collectd test tries and fails to bind to port 8081
+    # mezo test tries to reach external service
+    # memory_ballast test fails on darwin for mysterious reasons.
+    "-skip=TestDefaultReceivers/collectd|TestDefaultExporters/mezmo${lib.optionalString stdenv.isDarwin "|TestDefaultExtensions/memory_ballast"}"
+  ];
 
   ldflags = [
     "-s"

From 08b58d78541aee8dd6e203070012e871971aed19 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Mon, 11 Mar 2024 13:22:17 +0100
Subject: [PATCH 2/2] opentelemetry-collector-contrib: disable check

As discussed in
https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31678,
the tests inside cmd/otelcontrib can't be run any more.
---
 pkgs/tools/misc/opentelemetry-collector/contrib.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
index 7668bf0a8daa..bad1051fcc64 100644
--- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
@@ -39,14 +39,7 @@ buildGoModule rec {
   # it instead of trusting the global $PATH.
   propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ];
 
-  preCheck = "export CGO_ENABLED=1";
-
-  checkFlags = [
-    # collectd test tries and fails to bind to port 8081
-    # mezo test tries to reach external service
-    # memory_ballast test fails on darwin for mysterious reasons.
-    "-skip=TestDefaultReceivers/collectd|TestDefaultExporters/mezmo${lib.optionalString stdenv.isDarwin "|TestDefaultExtensions/memory_ballast"}"
-  ];
+  doCheck = false;
 
   ldflags = [
     "-s"