From 292ee77c817b5b0d00d096e28a6cf9825dc5c466 Mon Sep 17 00:00:00 2001
From: Evan Mattiza <nix@mattiza.dev>
Date: Thu, 28 Oct 2021 19:42:51 +0000
Subject: [PATCH 1/2] maintainers: add emattiza

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d51ea84e9efb..cb0235957140 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4132,6 +4132,12 @@
     githubId = 1365692;
     name = "Will Fancher";
   };
+  emattiza = {
+    email = "nix@mattiza.dev";
+    github = "emattiza";
+    githubId = 11719476;
+    name = "Evan Mattiza";
+  };
   emmabastas = {
     email = "emma.bastas@protonmail.com";
     matrix = "@emmabastas:matrix.org";

From 56a9ace9335180b6702f039c770e561478f428db Mon Sep 17 00:00:00 2001
From: Evan Mattiza <nix@mattiza.dev>
Date: Thu, 28 Oct 2021 19:42:51 +0000
Subject: [PATCH 2/2] otel-cli: init at 0.0.20

Fixes #143471
Closes #143475
---
 pkgs/tools/misc/otel-cli/default.nix | 30 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/misc/otel-cli/default.nix

diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix
new file mode 100644
index 000000000000..68d89d1a6e4a
--- /dev/null
+++ b/pkgs/tools/misc/otel-cli/default.nix
@@ -0,0 +1,30 @@
+{ lib, bash, buildGoModule, fetchFromGitHub, getent, stdenv }:
+
+buildGoModule rec {
+  pname = "otel-cli";
+  version = "0.0.20";
+
+  src = fetchFromGitHub {
+    owner = "equinix-labs";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-bWdkuw0uEE75l9YCo2Dq1NpWXuMH61RQ6p7m65P1QCE=";
+  };
+
+  vendorHash = "sha256-IJ2Gq5z1oNvcpWPh+BMs46VZMN1lHyE+M7kUinTSRr8=";
+
+  preCheck = ''
+    ln -s $GOPATH/bin/otel-cli .
+  '' + lib.optionalString (!stdenv.isDarwin) ''
+    substituteInPlace main_test.go \
+      --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`'
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/equinix-labs/otel-cli";
+    description = "A command-line tool for sending OpenTelemetry traces";
+    changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ emattiza urandom ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 887b29613371..dd2bc0fa1786 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10308,6 +10308,8 @@ with pkgs;
 
   ostree = callPackage ../tools/misc/ostree { };
 
+  otel-cli = callPackage ../tools/misc/otel-cli {};
+
   otfcc = callPackage ../tools/misc/otfcc { };
 
   otpclient = callPackage ../applications/misc/otpclient { };