Merge pull request #295919 from code-supply/openobserve-0-9-1 (f4429fde) · Commits · nix / nixpkgs

pkgs/servers/monitoring/openobserve/Cargo.lock

+192 −168

Original line number	Diff line number	Diff line
		@@ -326,7 +326,7 @@ dependencies = [
		"actix-http",
		"actix-web",
		"futures-util",
		"opentelemetry 0.21.0",
		"opentelemetry",
		"opentelemetry-semantic-conventions",
		"serde",
		]
		@@ -1181,7 +1181,7 @@ dependencies = [
		"hyper-rustls",
		"lazy_static",
		"pin-project-lite",
		"rustls",
		"rustls 0.21.10",
		"tokio",
		"tower",
		"tracing",
		@@ -1823,6 +1823,16 @@ dependencies = [
		"phf_codegen",
		]

		[[package]]
		name = "chumsky"
		version = "0.9.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
		dependencies = [
		"hashbrown 0.14.3",
		"stacker",
		]

		[[package]]
		name = "ciborium"
		version = "0.2.2"
		@@ -2072,6 +2082,7 @@ dependencies = [
		"hex",
		"indexmap 2.1.0",
		"itertools 0.12.1",
		"lettre",
		"log",
		"memchr",
		"murmur3",
		@@ -2088,7 +2099,7 @@ dependencies = [
		"sysinfo",
		"tokio",
		"tracing",
		"tracing-log 0.2.0",
		"tracing-log",
		"tracing-subscriber",
		"utoipa",
		"walkdir",
		@@ -2783,6 +2794,22 @@ dependencies = [
		"serde",
		]

		[[package]]
		name = "email-encoding"
		version = "0.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75"
		dependencies = [
		"base64 0.21.7",
		"memchr",
		]

		[[package]]
		name = "email_address"
		version = "0.2.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112"

		[[package]]
		name = "ena"
		version = "0.14.2"
		@@ -3532,10 +3559,10 @@ dependencies = [
		"http 0.2.11",
		"hyper",
		"log",
		"rustls",
		"rustls 0.21.10",
		"rustls-native-certs",
		"tokio",
		"tokio-rustls",
		"tokio-rustls 0.24.1",
		]

		[[package]]
		@@ -3894,6 +3921,36 @@ dependencies = [
		"spin 0.5.2",
		]

		[[package]]
		name = "lettre"
		version = "0.11.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "357ff5edb6d8326473a64c82cf41ddf78ab116f89668c50c4fac1b321e5e80f4"
		dependencies = [
		"async-trait",
		"base64 0.21.7",
		"chumsky",
		"email-encoding",
		"email_address",
		"fastrand 2.0.1",
		"futures-io",
		"futures-util",
		"hostname",
		"httpdate",
		"idna",
		"mime",
		"nom",
		"percent-encoding",
		"quoted_printable",
		"rustls 0.22.2",
		"rustls-pemfile 2.0.0",
		"socket2",
		"tokio",
		"tokio-rustls 0.25.0",
		"url",
		"webpki-roots 0.26.1",
		]

		[[package]]
		name = "lexical-core"
		version = "0.8.5"
		@@ -4291,9 +4348,9 @@ dependencies = [

		[[package]]
		name = "mio"
		version = "0.8.10"
		version = "0.8.11"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
		checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
		dependencies = [
		"libc",
		"log",
		@@ -4625,7 +4682,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

		[[package]]
		name = "openobserve"
		version = "0.8.1"
		version = "0.9.0"
		dependencies = [
		"actix-cors",
		"actix-multipart",
		@@ -4671,15 +4728,17 @@ dependencies = [
		"ipnetwork 0.20.0",
		"itertools 0.12.1",
		"jsonwebtoken",
		"lettre",
		"log",
		"maxminddb",
		"memory-stats",
		"mimalloc",
		"object_store",
		"once_cell",
		"opentelemetry 0.18.0",
		"opentelemetry",
		"opentelemetry-otlp",
		"opentelemetry-proto 0.2.0",
		"opentelemetry-proto",
		"opentelemetry_sdk",
		"parking_lot 0.12.1",
		"parquet",
		"prometheus",
		@@ -4709,8 +4768,8 @@ dependencies = [
		"time",
		"tokio",
		"tokio-stream",
		"tonic 0.8.3",
		"tonic-build 0.8.4",
		"tonic 0.9.2",
		"tonic-build 0.9.2",
		"tracing",
		"tracing-appender",
		"tracing-opentelemetry",
		@@ -4730,26 +4789,6 @@ version = "0.1.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

		[[package]]
		name = "opentelemetry"
		version = "0.18.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e"
		dependencies = [
		"opentelemetry_api 0.18.0",
		"opentelemetry_sdk 0.18.0",
		]

		[[package]]
		name = "opentelemetry"
		version = "0.19.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f"
		dependencies = [
		"opentelemetry_api 0.19.0",
		"opentelemetry_sdk 0.19.0",
		]

		[[package]]
		name = "opentelemetry"
		version = "0.21.0"
		@@ -4768,66 +4807,50 @@ dependencies = [

		[[package]]
		name = "opentelemetry-http"
		version = "0.7.0"
		version = "0.10.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d"
		checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e"
		dependencies = [
		"async-trait",
		"bytes",
		"http 0.2.11",
		"opentelemetry_api 0.18.0",
		"opentelemetry",
		"reqwest",
		]

		[[package]]
		name = "opentelemetry-otlp"
		version = "0.11.0"
		version = "0.14.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde"
		checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930"
		dependencies = [
		"async-trait",
		"futures",
		"futures-util",
		"futures-core",
		"http 0.2.11",
		"opentelemetry 0.18.0",
		"opentelemetry",
		"opentelemetry-http",
		"opentelemetry-proto 0.1.0",
		"opentelemetry-proto",
		"opentelemetry-semantic-conventions",
		"opentelemetry_sdk",
		"prost 0.11.9",
		"reqwest",
		"serde",
		"thiserror",
		"tokio",
		"tonic 0.8.3",
		]

		[[package]]
		name = "opentelemetry-proto"
		version = "0.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28"
		dependencies = [
		"futures",
		"futures-util",
		"opentelemetry 0.18.0",
		"prost 0.11.9",
		"tonic 0.8.3",
		"tonic-build 0.8.4",
		"tonic 0.9.2",
		]

		[[package]]
		name = "opentelemetry-proto"
		version = "0.2.0"
		version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "045f8eea8c0fa19f7d48e7bc3128a39c2e5c533d5c61298c548dfefc1064474c"
		checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1"
		dependencies = [
		"futures",
		"futures-util",
		"opentelemetry 0.19.0",
		"opentelemetry",
		"opentelemetry_sdk",
		"prost 0.11.9",
		"protobuf",
		"serde",
		"serde_json",
		"tonic 0.8.3",
		"tonic 0.9.2",
		]

		[[package]]
		@@ -4836,83 +4859,32 @@ version = "0.13.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84"
		dependencies = [
		"opentelemetry 0.21.0",
		]

		[[package]]
		name = "opentelemetry_api"
		version = "0.18.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22"
		dependencies = [
		"fnv",
		"futures-channel",
		"futures-util",
		"indexmap 1.9.3",
		"js-sys",
		"once_cell",
		"pin-project-lite",
		"thiserror",
		]

		[[package]]
		name = "opentelemetry_api"
		version = "0.19.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2"
		dependencies = [
		"fnv",
		"futures-channel",
		"futures-util",
		"indexmap 1.9.3",
		"once_cell",
		"pin-project-lite",
		"thiserror",
		"urlencoding",
		"opentelemetry",
		]

		[[package]]
		name = "opentelemetry_sdk"
		version = "0.18.0"
		version = "0.21.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113"
		checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4"
		dependencies = [
		"async-trait",
		"crossbeam-channel",
		"dashmap",
		"fnv",
		"futures-channel",
		"futures-executor",
		"futures-util",
		"glob",
		"once_cell",
		"opentelemetry_api 0.18.0",
		"opentelemetry",
		"ordered-float 4.2.0",
		"percent-encoding",
		"rand",
		"serde_json",
		"thiserror",
		"tokio",
		"tokio-stream",
		]

		[[package]]
		name = "opentelemetry_sdk"
		version = "0.19.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1"
		dependencies = [
		"async-trait",
		"crossbeam-channel",
		"dashmap",
		"fnv",
		"futures-channel",
		"futures-executor",
		"futures-util",
		"once_cell",
		"opentelemetry_api 0.19.0",
		"percent-encoding",
		"rand",
		"thiserror",
		]

		[[package]]
		name = "option-ext"
		version = "0.2.0"
		@@ -5568,9 +5540,14 @@ name = "protobuf"
		version = "2.28.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"

		[[package]]
		name = "psm"
		version = "0.1.21"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
		dependencies = [
		"serde",
		"serde_derive",
		"cc",
		]

		[[package]]
		@@ -5846,7 +5823,7 @@ dependencies = [
		"once_cell",
		"percent-encoding",
		"pin-project-lite",
		"rustls",
		"rustls 0.21.10",
		"rustls-native-certs",
		"rustls-pemfile 1.0.4",
		"serde",
		@@ -5855,7 +5832,7 @@ dependencies = [
		"sync_wrapper",
		"system-configuration",
		"tokio",
		"tokio-rustls",
		"tokio-rustls 0.24.1",
		"tokio-util",
		"tower-service",
		"url",
		@@ -5863,7 +5840,7 @@ dependencies = [
		"wasm-bindgen-futures",
		"wasm-streams",
		"web-sys",
		"webpki-roots",
		"webpki-roots 0.25.4",
		"winreg",
		]

		@@ -6103,10 +6080,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
		dependencies = [
		"log",
		"ring 0.17.7",
		"rustls-webpki",
		"rustls-webpki 0.101.7",
		"sct",
		]

		[[package]]
		name = "rustls"
		version = "0.22.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
		dependencies = [
		"log",
		"ring 0.17.7",
		"rustls-pki-types",
		"rustls-webpki 0.102.2",
		"subtle",
		"zeroize",
		]

		[[package]]
		name = "rustls-native-certs"
		version = "0.6.3"
		@@ -6154,6 +6145,17 @@ dependencies = [
		"untrusted 0.9.0",
		]

		[[package]]
		name = "rustls-webpki"
		version = "0.102.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
		dependencies = [
		"ring 0.17.7",
		"rustls-pki-types",
		"untrusted 0.9.0",
		]

		[[package]]
		name = "rustversion"
		version = "1.0.14"
		@@ -6680,7 +6682,7 @@ dependencies = [
		"once_cell",
		"paste",
		"percent-encoding",
		"rustls",
		"rustls 0.21.10",
		"rustls-pemfile 1.0.4",
		"serde",
		"serde_json",
		@@ -6692,7 +6694,7 @@ dependencies = [
		"tokio-stream",
		"tracing",
		"url",
		"webpki-roots",
		"webpki-roots 0.25.4",
		]

		[[package]]
		@@ -6848,6 +6850,19 @@ version = "1.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"

		[[package]]
		name = "stacker"
		version = "0.1.15"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
		dependencies = [
		"cc",
		"cfg-if 1.0.0",
		"libc",
		"psm",
		"winapi 0.3.9",
		]

		[[package]]
		name = "static_assertions"
		version = "1.1.0"
		@@ -7281,7 +7296,18 @@ version = "0.24.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
		dependencies = [
		"rustls",
		"rustls 0.21.10",
		"tokio",
		]

		[[package]]
		name = "tokio-rustls"
		version = "0.25.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
		dependencies = [
		"rustls 0.22.2",
		"rustls-pki-types",
		"tokio",
		]

		@@ -7340,14 +7366,13 @@ dependencies = [

		[[package]]
		name = "tonic"
		version = "0.8.3"
		version = "0.9.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
		checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
		dependencies = [
		"async-stream",
		"async-trait",
		"axum",
		"base64 0.13.1",
		"base64 0.21.7",
		"bytes",
		"flate2",
		"futures-core",
		@@ -7360,15 +7385,12 @@ dependencies = [
		"percent-encoding",
		"pin-project",
		"prost 0.11.9",
		"prost-derive 0.11.9",
		"tokio",
		"tokio-stream",
		"tokio-util",
		"tower",
		"tower-layer",
		"tower-service",
		"tracing",
		"tracing-futures",
		]

		[[package]]
		@@ -7390,10 +7412,10 @@ dependencies = [
		"percent-encoding",
		"pin-project",
		"prost 0.12.3",
		"rustls",
		"rustls 0.21.10",
		"rustls-pemfile 1.0.4",
		"tokio",
		"tokio-rustls",
		"tokio-rustls 0.24.1",
		"tokio-stream",
		"tower",
		"tower-layer",
		@@ -7403,9 +7425,9 @@ dependencies = [

		[[package]]
		name = "tonic-build"
		version = "0.8.4"
		version = "0.9.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
		checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
		dependencies = [
		"prettyplease 0.1.25",
		"proc-macro2",
		@@ -7504,27 +7526,6 @@ dependencies = [
		"valuable",
		]

		[[package]]
		name = "tracing-futures"
		version = "0.2.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
		dependencies = [
		"pin-project",
		"tracing",
		]

		[[package]]
		name = "tracing-log"
		version = "0.1.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
		dependencies = [
		"log",
		"once_cell",
		"tracing-core",
		]

		[[package]]
		name = "tracing-log"
		version = "0.2.0"
		@@ -7538,16 +7539,20 @@ dependencies = [

		[[package]]
		name = "tracing-opentelemetry"
		version = "0.18.0"
		version = "0.22.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de"
		checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596"
		dependencies = [
		"js-sys",
		"once_cell",
		"opentelemetry 0.18.0",
		"opentelemetry",
		"opentelemetry_sdk",
		"smallvec",
		"tracing",
		"tracing-core",
		"tracing-log 0.1.4",
		"tracing-log",
		"tracing-subscriber",
		"web-time",
		]

		[[package]]
		@@ -7577,7 +7582,7 @@ dependencies = [
		"thread_local",
		"tracing",
		"tracing-core",
		"tracing-log 0.2.0",
		"tracing-log",
		"tracing-serde",
		]

		@@ -8077,6 +8082,16 @@ dependencies = [
		"wasm-bindgen",
		]

		[[package]]
		name = "web-time"
		version = "0.2.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
		dependencies = [
		"js-sys",
		"wasm-bindgen",
		]

		[[package]]
		name = "webbrowser"
		version = "0.8.12"
		@@ -8100,6 +8115,15 @@ version = "0.25.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"

		[[package]]
		name = "webpki-roots"
		version = "0.26.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
		dependencies = [
		"rustls-pki-types",
		]

		[[package]]
		name = "which"
		version = "4.4.2"

pkgs/servers/monitoring/openobserve/default.nix

+3 −10

Original line number	Diff line number	Diff line
		{ lib
		, rustPlatform
		, fetchFromGitHub
		, fetchpatch
		, pkg-config
		, protobuf
		, bzip2
		@@ -16,12 +15,12 @@
		}:

		let
		version = "0.8.1";
		version = "0.9.1";
		src = fetchFromGitHub {
		owner = "openobserve";
		repo = "openobserve";
		rev = "v${version}";
		hash = "sha256-J8TuaWjtuR39XA7tizyI+DFkpOaLFweM+/9VImGj8UE=";
		hash = "sha256-AQxSR2cMkNst5YEv4TqVNgdriMsg/0ed5YN4W8qZKxM=";
		};
		web = buildNpmPackage {
		inherit src version;
		@@ -29,7 +28,7 @@ let

		sourceRoot = "${src.name}/web";

		npmDepsHash = "sha256-RNUCR80ewFt9F/VHv7kXLa87h0fz0YBp+9gSOUhtrdU=";
		npmDepsHash = "sha256-c82NLNLfqQrS/jv7ixpLCYDMEUtx6+Mm8cSwvVis2fc=";

		preBuild = ''
		# Patch vite config to not open the browser to visualize plugin composition
		@@ -56,12 +55,6 @@ rustPlatform.buildRustPackage {
		inherit version src;

		patches = [
		(fetchpatch {
		name = "fix-test-hash-partition.patch";
		url = "https://github.com/openobserve/openobserve/commit/24919333d6b6696f0f9d9aff0a883431481e8fce.patch";
		includes = ["src/common/meta/stream.rs"];
		hash = "sha256-GB3Pgmp1swJt6ESgKL2eWOZ3jBcsN0r+5Dxasgg50D4=";
		})
		# prevent using git to determine version info during build time
		./build.rs.patch
		];

Admin message