Unverified Commit 6b374320 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

opentelemetry-cpp: 1.23.0 -> 1.24.0, opentelemetry-proto: 1.7.0 -> 1.8.0 (#470295)

parents b8c9e649 4c862381

pkgs/by-name/op/opentelemetry-cpp/0001-Disable-tests-requiring-network-access.patch

+0 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ index e8299202..19dbd7b1 100644 
 {

   received_requests_.clear();

   curl::HttpClientSync http_client;

@@ -495,7 +495,7 @@ TEST_F(BasicCurlHttpTests, GetBaseUri)

             "http://127.0.0.1:31339/");

 }

 

-TEST_F(BasicCurlHttpTests, SendGetRequestAsync)

+TEST_F(BasicCurlHttpTests, DISABLED_SendGetRequestAsync)

 {

   curl::HttpClient http_client;

 

@@ -570,7 +570,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)

   }

 }

pkgs/by-name/op/opentelemetry-cpp/package.nix

+11 −4
Original line number Diff line number Diff line
@@ -21,19 +21,19 @@ let 
  opentelemetry-proto = fetchFromGitHub {

    owner = "open-telemetry";

    repo = "opentelemetry-proto";

    rev = "v1.7.0";

    hash = "sha256-3SFf/7fStrglxcpwEya7hDp8Sr3wBG9OYyBoR78IUgs=";

    rev = "v1.8.0";

    hash = "sha256-5rNJDMjRFIOY/3j+PkAujbippBmxtAudU9busK0q8p0=";

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "opentelemetry-cpp";

  version = "1.23.0";

  version = "1.24.0";



  src = fetchFromGitHub {

    owner = "open-telemetry";

    repo = "opentelemetry-cpp";

    rev = "v${finalAttrs.version}";

    hash = "sha256-4SmKB2368I/2WTKYCqsZAAdkJygA15zCT+I7/RF8Knk=";

    hash = "sha256-rVR8JWNoT5mxIgzynY8VzlZ4QxhWIEFBqogi+WFDcF0=";

  };



  patches = [
@@ -85,6 +85,13 @@ stdenv.mkDerivation (finalAttrs: { 
    "dev"

  ];



  # "--replace-fail" would normally be preferred, since it is better at

  # highlighting obsolete/uneeded substitutions, but in this case

  # "--replace-quiet" must be used.

  # substituteInPlace with "--replace-fail" already fails if there is no

  # substitution in at least one of the specified files. Below is applied to

  # multiple files where some but not all of them match the substitution

  # strings.

  postInstall = ''

    substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp*-target.cmake \

      --replace-quiet "\''${_IMPORT_PREFIX}/include" "$dev/include"