Move solana-upload-perf into upload-perf/

Cargo.lock

@@ -2074,6 +2074,14 @@ dependencies = [
  "solana-sdk 0.11.0",
 ]
 
+[[package]]
+name = "solana-upload-perf"
+version = "0.11.0"
+dependencies = [
+ "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana-metrics 0.11.0",
+]
+
 [[package]]
 name = "solana-vote-program"
 version = "0.11.0"

Cargo.toml

@@ -10,10 +10,6 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 license = "Apache-2.0"
 edition = "2018"
 
-[[bin]]
-name = "solana-upload-perf"
-path = "src/bin/upload-perf.rs"
-
 [[bin]]
 required-features = ["bench_streamer"]
 name = "solana-bench-streamer"
@@ -153,5 +149,6 @@ members = [
     "programs/native/noop",
     "programs/native/vote",
     "sdk",
+    "upload-perf",
     "vote-signer",
 ]

ci/test-bench.sh

@@ -40,6 +40,6 @@ _ cargo bench --features=unstable --verbose -- -Z unstable-options --format=json
   cargo bench --verbose --features="bpf_c" -- -Z unstable-options --format=json --nocapture | tee -a ../../../"$BENCH_FILE"
 )
 
-_ cargo run --release --bin solana-upload-perf -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"
+_ cargo run --release --package solana-upload-perf -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"
 
 upload_ci_artifact "$BENCH_ARTIFACT"

upload-perf/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "solana-upload-perf"
+version = "0.11.0"
+description = "Metrics Upload Utility"
+authors = ["Solana Maintainers <maintainers@solana.com>"]
+repository = "https://github.com/solana-labs/solana"
+license = "Apache-2.0"
+edition = "2018"
+
+[dependencies]
+serde_json = "1.0.10"
+solana-metrics = { path = "../metrics", version = "0.11.0" }
+
+[[bin]]
+name = "solana-upload-perf"
+path = "src/upload-perf.rs"
+