From 3b73cec2ccb5193e51601d5b1b786bb2e1c7c29d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 19 Nov 2024 22:03:08 +0100
Subject: [PATCH] opentelemetry-collector-contrib: alias to
 opentelemetry-collector-releases.otelcol-contrib

---
 .../misc/opentelemetry-collector/contrib.nix  | 68 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkgs/tools/misc/opentelemetry-collector/contrib.nix

diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
deleted file mode 100644
index 219f7b81c5f3..000000000000
--- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ buildGoModule
-, fetchFromGitHub
-, lib
-, stdenv
-, systemdMinimal
-, withSystemd ? false
-}:
-
-buildGoModule rec {
-  pname = "opentelemetry-collector-contrib";
-  version = "0.110.0";
-
-  src = fetchFromGitHub {
-    owner = "open-telemetry";
-    repo = "opentelemetry-collector-contrib";
-    rev = "v${version}";
-    hash = "sha256-bDtP7EFKus0NJpLccbD+HlzEusc+KAbKWmS/KGthtwY=";
-  };
-
-  # proxy vendor to avoid hash mismatches between linux and macOS
-  proxyVendor = true;
-  vendorHash = "sha256-pDDEqtXu167b+J1+k7rC1BE5/ehxzG0ZAkhxqmJpHsg=";
-
-  # there is a nested go.mod
-  sourceRoot = "${src.name}/cmd/otelcontribcol";
-
-  # upstream strongly recommends disabling CGO
-  # additionally dependencies have had issues when GCO was enabled that weren't caught upstream
-  # https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#using-cgo
-  CGO_ENABLED = 0;
-
-  # journalctl is required in-$PATH for the journald receiver tests.
-  nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal ];
-
-  # We don't inject the package into propagatedBuildInputs unless
-  # asked to avoid hard-requiring a large package. For the journald
-  # receiver to work, journalctl will need to be available in-$PATH,
-  # so expose this as an option for those who want more control over
-  # it instead of trusting the global $PATH.
-  propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ];
-
-  doCheck = false;
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}"
-  ];
-
-  meta = with lib; {
-    description = "OpenTelemetry Collector superset with additional community collectors";
-    longDescription = ''
-      The OpenTelemetry Collector offers a vendor-agnostic implementation on how
-      to receive, process and export telemetry data. In addition, it removes the
-      need to run, operate and maintain multiple agents/collectors in order to
-      support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.)
-      sending to multiple open-source or commercial back-ends. The Contrib
-      edition provides aditional vendor specific receivers/exporters and/or
-      components that are only useful to a relatively small number of users and
-      is multiple times larger as a result.
-    '';
-    homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib";
-    changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ uri-canva jk ];
-    mainProgram = "otelcontribcol";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b13a8ed50431..d9ea8c345f99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4795,7 +4795,7 @@ with pkgs;
 
   opentelemetry-collector = opentelemetry-collector-releases.otelcol;
   opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { };
-  opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };
+  opentelemetry-collector-contrib = opentelemetry-collector-releases.otelcol-contrib;
 
   openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; };