Unverified Commit 5be2ce47 authored by Yt's avatar Yt Committed by GitHub
Browse files

Merge pull request #280027 from jpds/vector-0.35.0 

vector: 0.34.2 → 0.35.0
parents c2b35400 36064787

pkgs/tools/misc/vector/Cargo.lock

+866 −703

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/tools/misc/vector/default.nix

+8 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, oniguruma

, zstd

, rust-jemalloc-sys

, rust-jemalloc-sys-unprefixed

, Security

, libiconv

, coreutils
@@ -35,7 +36,7 @@ 


let

  pname = "vector";

  version = "0.34.2";

  version = "0.35.0";

in

rustPlatform.buildRustPackage {

  inherit pname version;
@@ -44,11 +45,9 @@ rustPlatform.buildRustPackage { 
    owner = "vectordotdev";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-XaX6C1kl908MG8SndT2sUDR09qbFCar4G7U7TYlLBR4=";

    hash = "sha256-hScmHDkKkR6g1rrVRzBjtkrq59w1efIjeRJdDxmb+nY=";

  };



  patches = [ ./vector-pr19075.patch ];



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {
@@ -64,8 +63,9 @@ rustPlatform.buildRustPackage { 
  };

  nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ];

  buildInputs =

    [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ]

    ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices SystemConfiguration ];

    [ oniguruma openssl protobuf rdkafka zstd ]

    ++ lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ]

    ++ lib.optionals stdenv.isDarwin [ rust-jemalloc-sys Security libiconv coreutils CoreServices SystemConfiguration ];



  # needed for internal protobuf c wrapper library

  PROTOC = "${protobuf}/bin/protoc";
@@ -99,6 +99,8 @@ rustPlatform.buildRustPackage { 
    "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure"

  ];



  patches = [ ./vector-pr19518.patch ];



  # recent overhauls of DNS support in 0.9 mean that we try to resolve

  # vector.dev during the checkPhase, which obviously isn't going to work.

  # these tests in the DNS module are trivial though, so stubbing them out is

pkgs/tools/misc/vector/vector-pr19075.patch

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
From 14cd9c12416b5c9ada55ced51e8f92fdce56a4b1 Mon Sep 17 00:00:00 2001

From: Aaron Andersen <aaron@fosslib.net>

Date: Tue, 7 Nov 2023 09:05:26 -0500

Subject: [PATCH] fix(config): rustc warnings



---

 src/convert_config.rs | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/src/convert_config.rs b/src/convert_config.rs

index f0a900cf421a0..d81b998c5ee1f 100644

--- a/src/convert_config.rs

+++ b/src/convert_config.rs

@@ -157,8 +157,7 @@ fn walk_dir_and_convert(

             let new_output_dir = if entry_path.is_dir() {

                 let last_component = entry_path

                     .file_name()

-                    .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}"))

-                    .clone();

+                    .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}"));

                 let new_dir = output_dir.join(last_component);

 

                 if !new_dir.exists() {

pkgs/tools/misc/vector/vector-pr19518.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs

index 58c464a58..40656fd29 100644

--- a/src/config/loading/mod.rs

+++ b/src/config/loading/mod.rs

@@ -13,7 +13,6 @@ use std::{

 };

 

 use config_builder::ConfigBuilderLoader;

-pub use config_builder::*;

 use glob::glob;

 use loader::process::Process;

 pub use loader::*;

diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs

index 3ebda7df8..cf5b37a70 100644

--- a/src/sinks/prometheus/remote_write/mod.rs

+++ b/src/sinks/prometheus/remote_write/mod.rs

@@ -24,8 +24,6 @@ mod tests;

 #[cfg(all(test, feature = "prometheus-integration-tests"))]

 mod integration_tests;

 

-pub use config::RemoteWriteConfig;

-

 #[derive(Debug, Snafu)]

 enum Errors {

     #[cfg(feature = "aws-core")]