Skip to content

Commit bea1587

Browse files
authored
Update oximeter dep (#1311)
- Pull in latest `oximeter` and related Omicron dependencies - Remove defunct `base_route` field from producer info
1 parent 566284e commit bea1587

File tree

9 files changed

+221
-184
lines changed

9 files changed

+221
-184
lines changed

Cargo.lock

+213-174
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crutest/src/stats.rs

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub fn client_oximeter(
2626
id: Uuid::new_v4(),
2727
kind: ProducerKind::Service,
2828
address: my_address,
29-
base_route: String::new(),
3029
interval: tokio::time::Duration::from_secs(10),
3130
};
3231

downstairs/src/stats.rs

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ pub async fn ox_stats(
149149
id: dss.ds_stat_wrap.lock().unwrap().stat_name.downstairs_uuid,
150150
kind: ProducerKind::Service,
151151
address: my_address,
152-
base_route: String::new(),
153152
interval: Duration::from_secs(10),
154153
};
155154

openapi/crucible-agent.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@
439439
},
440440
"source": {
441441
"nullable": true,
442-
"default": null,
443442
"type": "string"
444443
},
445444
"state": {
@@ -524,4 +523,4 @@
524523
}
525524
}
526525
}
527-
}
526+
}

openapi/crucible-control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,4 @@
289289
}
290290
}
291291
}
292-
}
292+
}

openapi/crucible-pantry.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1023,4 +1023,4 @@
10231023
}
10241024
}
10251025
}
1026-
}
1026+
}

openapi/downstairs-repair.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,4 +311,4 @@
311311
}
312312
}
313313
}
314-
}
314+
}

openapi/dsc-control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -440,4 +440,4 @@
440440
}
441441
}
442442
}
443-
}
443+
}

workspace-hack/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ rand = { version = "0.8", features = ["min_const_gen", "small_rng"] }
4444
rand_chacha = { version = "0.3" }
4545
rand_core = { version = "0.6", default-features = false, features = ["std"] }
4646
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls", "stream"] }
47-
schemars = { version = "0.8", features = ["bytes", "chrono", "uuid", "uuid1"] }
47+
schemars = { version = "0.8", features = ["bytes", "chrono", "uuid1"] }
48+
scopeguard = { version = "1" }
4849
semver = { version = "1", features = ["serde"] }
4950
serde = { version = "1", features = ["alloc", "derive", "rc"] }
5051
slog = { version = "2", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug"] }
@@ -78,7 +79,7 @@ phf_shared = { version = "0.11" }
7879
rand = { version = "0.8", features = ["min_const_gen", "small_rng"] }
7980
rand_chacha = { version = "0.3" }
8081
rand_core = { version = "0.6", default-features = false, features = ["std"] }
81-
schemars = { version = "0.8", features = ["bytes", "chrono", "uuid", "uuid1"] }
82+
schemars = { version = "0.8", features = ["bytes", "chrono", "uuid1"] }
8283
semver = { version = "1", features = ["serde"] }
8384
serde = { version = "1", features = ["alloc", "derive", "rc"] }
8485
syn = { version = "2", features = ["extra-traits", "full", "visit", "visit-mut"] }

0 commit comments

Comments
 (0)