pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #230836 from 06kellyjac/opentelemetry-collector

opentelemetry-collector: 0.76.1 -> 0.77.0

authored by Uri Baghin and committed by GitHub 657214a0 586ef1fa

+64 -17
unified split
+12 -17
pkgs/tools/misc/opentelemetry-collector/default.nix
··· 1 - { buildGoModule 1 + { lib 2 + , buildGoModule 2 3 , fetchFromGitHub 3 - , lib 4 - , writeScript 5 4 }: 6 5 7 - let 8 - otelcontribcol = writeScript "otelcontribcol" '' 9 - echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2 10 - exit 1 11 - ''; 12 - in 13 6 buildGoModule rec { 14 7 pname = "opentelemetry-collector"; 15 - version = "0.76.1"; 8 + version = "0.77.0"; 16 9 17 10 src = fetchFromGitHub { 18 11 owner = "open-telemetry"; 19 12 repo = "opentelemetry-collector"; 20 13 rev = "v${version}"; 21 - sha256 = "sha256-e+IdEGrJzDRUaAViUSyXdkYv9Hfub0ytmh3pl1f/nGM="; 14 + hash = "sha256-koPkEOtB5KnePdx67hJ/WNBojNDqKvf9kqYb59bwh8k="; 22 15 }; 23 16 # there is a nested go.mod 24 17 sourceRoot = "source/cmd/otelcorecol"; 25 - vendorHash = "sha256-8OkKPrK0xLWK5hIPaI7hgCGY0g7sWbaS/1HHqoTuqxk="; 18 + vendorHash = "sha256-M1fLrQFrcfCRCcunkgEzUicVfi5Mz/Or6tFpcGfWf4E="; 19 + 20 + patches = [ 21 + # remove when fixed upstream 22 + # https://github.com/open-telemetry/opentelemetry-collector/issues/7668 23 + ./update_go-m1cpu_fix_aarch64-darwin.patch 24 + ]; 26 25 27 26 preBuild = '' 28 27 # set the build version, can't be done via ldflags ··· 31 30 32 31 ldflags = [ "-s" "-w" ]; 33 32 34 - postInstall = '' 35 - cp ${otelcontribcol} $out/bin/otelcontribcol 36 - ''; 37 - 38 33 meta = with lib; { 39 34 homepage = "https://github.com/open-telemetry/opentelemetry-collector"; 40 35 changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md"; 41 - description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data"; 36 + description = "A vendor-agnostic implementation on how to receive, process and export telemetry data"; 42 37 longDescription = '' 43 38 The OpenTelemetry Collector offers a vendor-agnostic implementation on how 44 39 to receive, process and export telemetry data. In addition, it removes the
+52
pkgs/tools/misc/opentelemetry-collector/update_go-m1cpu_fix_aarch64-darwin.patch
··· 1 + --- a/go.mod 2 + +++ b/go.mod 3 + @@ -19,7 +19,7 @@ require ( 4 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.77.0 5 + go.opentelemetry.io/collector/receiver v0.77.0 6 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0 7 + - golang.org/x/sys v0.7.0 8 + + golang.org/x/sys v0.8.0 9 + ) 10 + 11 + require ( 12 + @@ -60,8 +60,8 @@ require ( 13 + github.com/prometheus/procfs v0.9.0 // indirect 14 + github.com/prometheus/statsd_exporter v0.22.7 // indirect 15 + github.com/rs/cors v1.9.0 // indirect 16 + - github.com/shirou/gopsutil/v3 v3.23.3 // indirect 17 + - github.com/shoenig/go-m1cpu v0.1.4 // indirect 18 + + github.com/shirou/gopsutil/v3 v3.23.5-0.20230505121632-e045dc75ca1c // indirect 19 + + github.com/shoenig/go-m1cpu v0.1.6 // indirect 20 + github.com/spf13/cobra v1.7.0 // indirect 21 + github.com/spf13/pflag v1.0.5 // indirect 22 + github.com/tklauser/go-sysconf v0.3.11 // indirect 23 + --- a/go.sum 24 + +++ b/go.sum 25 + @@ -383,10 +383,18 @@ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIH 26 + github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= 27 + github.com/shirou/gopsutil/v3 v3.23.3 h1:Syt5vVZXUDXPEXpIBt5ziWsJ4LdSAAxF4l/xZeQgSEE= 28 + github.com/shirou/gopsutil/v3 v3.23.3/go.mod h1:lSBNN6t3+D6W5e5nXTxc8KIMMVxAcS+6IJlffjRRlMU= 29 + +github.com/shirou/gopsutil/v3 v3.23.4 h1:hZwmDxZs7Ewt75DV81r4pFMqbq+di2cbt9FsQBqLD2o= 30 + +github.com/shirou/gopsutil/v3 v3.23.4/go.mod h1:ZcGxyfzAMRevhUR2+cfhXDH6gQdFYE/t8j1nsU4mPI8= 31 + +github.com/shirou/gopsutil/v3 v3.23.5-0.20230505121632-e045dc75ca1c h1:ZYIGwnQEbcRHlzQRm/ns8iJQgJU+drtg4cX39shs9lE= 32 + +github.com/shirou/gopsutil/v3 v3.23.5-0.20230505121632-e045dc75ca1c/go.mod h1:LIiQgnFqJnplML7ahhMDo0wRqv6xMPNGNxGRDObehQ0= 33 + github.com/shoenig/go-m1cpu v0.1.4 h1:SZPIgRM2sEF9NJy50mRHu9PKGwxyyTTJIWvCtgVbozs= 34 + github.com/shoenig/go-m1cpu v0.1.4/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ= 35 + +github.com/shoenig/go-m1cpu v0.1.5/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ= 36 + +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= 37 + +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= 38 + github.com/shoenig/test v0.6.3 h1:GVXWJFk9PiOjN0KoJ7VrJGH6uLPnqxR7/fe3HUPfE0c= 39 + github.com/shoenig/test v0.6.3/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= 40 + +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= 41 + github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= 42 + github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= 43 + github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= 44 + @@ -627,6 +635,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 45 + golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 46 + golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= 47 + golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 48 + +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= 49 + +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 50 + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 51 + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= 52 + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=