Skip to content

Commit a04f787

Browse files
StephenWakelyStephenWakely
committed
Rename source to source_id
Signed-off-by: Stephen Wakely <[email protected]>
1 parent a3f7469 commit a04f787

File tree

5 files changed

+46
-36
lines changed

5 files changed

+46
-36
lines changed

‎lib/vector-core/src/event/array.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,17 @@ impl EventArray {
143143
match self {
144144
EventArray::Logs(logs) => {
145145
for log in logs {
146-
*log.metadata_mut().source_mut() = Some(Arc::clone(&output_id));
146+
*log.metadata_mut().source_id_mut() = Some(Arc::clone(&output_id));
147147
}
148148
}
149149
EventArray::Metrics(metrics) => {
150150
for metric in metrics {
151-
*metric.metadata_mut().source_mut() = Some(Arc::clone(&output_id));
151+
*metric.metadata_mut().source_id_mut() = Some(Arc::clone(&output_id));
152152
}
153153
}
154154
EventArray::Traces(traces) => {
155155
for trace in traces {
156-
*trace.metadata_mut().source_mut() = Some(Arc::clone(&output_id));
156+
*trace.metadata_mut().source_id_mut() = Some(Arc::clone(&output_id));
157157
}
158158
}
159159
}

‎lib/vector-core/src/event/metadata.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub struct EventMetadata {
3030
finalizers: EventFinalizers,
3131

3232
/// The id of the source
33-
source: Option<Arc<OutputId>>,
33+
source_id: Option<Arc<OutputId>>,
3434

3535
/// An identifier for a globally registered schema definition which provides information about
3636
/// the event shape (type information, and semantic meaning of fields).
@@ -74,13 +74,13 @@ impl EventMetadata {
7474
}
7575

7676
/// Returns a mutable reference to the metadata source.
77-
pub fn source(&self) -> &Option<Arc<OutputId>> {
78-
&self.source
77+
pub fn source_id(&self) -> &Option<Arc<OutputId>> {
78+
&self.source_id
7979
}
8080

8181
/// Returns a mutable reference to the metadata source.
82-
pub fn source_mut(&mut self) -> &mut Option<Arc<OutputId>> {
83-
&mut self.source
82+
pub fn source_id_mut(&mut self) -> &mut Option<Arc<OutputId>> {
83+
&mut self.source_id
8484
}
8585

8686
/// Return the datadog API key, if it exists
@@ -111,7 +111,7 @@ impl Default for EventMetadata {
111111
secrets: Secrets::new(),
112112
finalizers: Default::default(),
113113
schema_definition: default_schema_definition(),
114-
source: None,
114+
source_id: None,
115115
}
116116
}
117117
}

‎src/topology/test/compliance.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async fn test_function_transform_single_event() {
5858
let mut events = events.into_events().collect::<Vec<_>>();
5959
assert_eq!(events.len(), 1);
6060

61-
*original_event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in")));
61+
*original_event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in")));
6262

6363
let event = events.remove(0);
6464
assert_eq!(original_event, event);
@@ -79,7 +79,7 @@ async fn test_sync_transform_single_event() {
7979
let mut events = events.into_events().collect::<Vec<_>>();
8080
assert_eq!(events.len(), 1);
8181

82-
*original_event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in")));
82+
*original_event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in")));
8383

8484
let event = events.remove(0);
8585
assert_eq!(original_event, event);
@@ -99,7 +99,7 @@ async fn test_task_transform_single_event() {
9999
let mut events = events.into_events().collect::<Vec<_>>();
100100
assert_eq!(events.len(), 1);
101101

102-
*original_event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in")));
102+
*original_event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in")));
103103

104104
let event = events.remove(0);
105105
assert_eq!(original_event, event);

‎src/topology/test/mod.rs

+23-13
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ async fn topology_source_and_sink() {
148148

149149
let res = out1.flat_map(into_event_stream).collect::<Vec<_>>().await;
150150

151-
*event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
151+
*event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
152152

153153
assert_eq!(vec![event], res);
154154
}
@@ -181,8 +181,8 @@ async fn topology_multiple_sources() {
181181

182182
topology.stop().await;
183183

184-
*event1.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
185-
*event2.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in2")));
184+
*event1.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
185+
*event2.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in2")));
186186

187187
assert_eq!(out_event1, Some(event1.into()));
188188
assert_eq!(out_event2, Some(event2.into()));
@@ -217,7 +217,7 @@ async fn topology_multiple_sinks() {
217217
let res2 = out2.flat_map(into_event_stream).collect::<Vec<_>>().await;
218218

219219
// We should see that both sinks got the exact same event:
220-
*event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
220+
*event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
221221
let expected = vec![event];
222222
assert_eq!(expected, res1);
223223
assert_eq!(expected, res2);
@@ -291,7 +291,7 @@ async fn topology_remove_one_source() {
291291
drop(in2);
292292
topology.stop().await;
293293

294-
*event1.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
294+
*event1.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
295295

296296
let res = h_out1.await.unwrap();
297297
assert_eq!(vec![event1], res);
@@ -330,7 +330,7 @@ async fn topology_remove_one_sink() {
330330
let res1 = out1.flat_map(into_event_stream).collect::<Vec<_>>().await;
331331
let res2 = out2.flat_map(into_event_stream).collect::<Vec<_>>().await;
332332

333-
*event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
333+
*event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
334334

335335
assert_eq!(vec![event], res1);
336336
assert_eq!(Vec::<Event>::new(), res2);
@@ -441,7 +441,7 @@ async fn topology_swap_source() {
441441
// as we've removed it from the topology prior to the sends.
442442
assert_eq!(Vec::<Event>::new(), res1);
443443

444-
*event2.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in2")));
444+
*event2.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in2")));
445445
assert_eq!(vec![event2], res2);
446446
}
447447

@@ -553,7 +553,7 @@ async fn topology_swap_sink() {
553553
// the new sink, which _was_ rebuilt:
554554
assert_eq!(Vec::<Event>::new(), res1);
555555

556-
*event1.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
556+
*event1.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
557557
assert_eq!(vec![event1], res2);
558558
}
559559

@@ -660,8 +660,8 @@ async fn topology_rebuild_connected() {
660660

661661
let res = h_out1.await.unwrap();
662662

663-
*event1.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
664-
*event2.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
663+
*event1.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
664+
*event2.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
665665

666666
assert_eq!(vec![event1, event2], res);
667667
}
@@ -714,7 +714,7 @@ async fn topology_rebuild_connected_transform() {
714714
let res2 = h_out2.await.unwrap();
715715
assert_eq!(Vec::<Event>::new(), res1);
716716

717-
*event.metadata_mut().source_mut() = Some(Arc::new(OutputId::from("in1")));
717+
*event.metadata_mut().source_id_mut() = Some(Arc::new(OutputId::from("in1")));
718718

719719
assert_eq!(vec![event], res2);
720720
}
@@ -897,11 +897,21 @@ async fn source_metadata_reaches_sink() {
897897
topology.stop().await;
898898

899899
assert_eq!(
900-
out_event1.into_log().metadata().source().clone().unwrap(),
900+
out_event1
901+
.into_log()
902+
.metadata()
903+
.source_id()
904+
.clone()
905+
.unwrap(),
901906
Arc::new(OutputId::from("in1"))
902907
);
903908
assert_eq!(
904-
out_event2.into_log().metadata().source().clone().unwrap(),
909+
out_event2
910+
.into_log()
911+
.metadata()
912+
.source_id()
913+
.clone()
914+
.unwrap(),
905915
Arc::new(OutputId::from("in2"))
906916
);
907917
}

‎src/transforms/log_to_metric.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ mod tests {
508508

509509
let event = create_event("status", "42");
510510
let mut metadata = event.metadata().clone();
511-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
511+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
512512
let metric = do_transform(config, event).await.unwrap();
513513

514514
assert_eq!(
@@ -540,7 +540,7 @@ mod tests {
540540
event.as_mut_log().insert("method", "post");
541541
event.as_mut_log().insert("code", "200");
542542
let mut metadata = event.metadata().clone();
543-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
543+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
544544

545545
let metric = do_transform(config, event).await.unwrap();
546546

@@ -629,7 +629,7 @@ mod tests {
629629

630630
let event = create_event("backtrace", "message");
631631
let mut metadata = event.metadata().clone();
632-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
632+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
633633
let metric = do_transform(config, event).await.unwrap();
634634

635635
assert_eq!(
@@ -673,7 +673,7 @@ mod tests {
673673

674674
let event = create_event("amount", "33.99");
675675
let mut metadata = event.metadata().clone();
676-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
676+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
677677
let metric = do_transform(config, event).await.unwrap();
678678

679679
assert_eq!(
@@ -703,7 +703,7 @@ mod tests {
703703

704704
let event = create_event("amount", "33.99");
705705
let mut metadata = event.metadata().clone();
706-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
706+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
707707
let metric = do_transform(config, event).await.unwrap();
708708

709709
assert_eq!(
@@ -731,7 +731,7 @@ mod tests {
731731

732732
let event = create_event("memory_rss", "123");
733733
let mut metadata = event.metadata().clone();
734-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
734+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
735735
let metric = do_transform(config, event).await.unwrap();
736736

737737
assert_eq!(
@@ -815,7 +815,7 @@ mod tests {
815815
event.as_mut_log().insert("status", "42");
816816
event.as_mut_log().insert("backtrace", "message");
817817
let mut metadata = event.metadata().clone();
818-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
818+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
819819
let output = do_transform_multiple_events(config, event, 2).await;
820820

821821
assert_eq!(2, output.len());
@@ -869,7 +869,7 @@ mod tests {
869869
event.as_mut_log().insert("worker", "abc");
870870
event.as_mut_log().insert("service", "xyz");
871871
let mut metadata = event.metadata().clone();
872-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
872+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
873873

874874
let output = do_transform_multiple_events(config, event, 2).await;
875875

@@ -912,7 +912,7 @@ mod tests {
912912

913913
let event = create_event("user_ip", "1.2.3.4");
914914
let mut metadata = event.metadata().clone();
915-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
915+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
916916
let metric = do_transform(config, event).await.unwrap();
917917

918918
assert_eq!(
@@ -941,7 +941,7 @@ mod tests {
941941

942942
let event = create_event("response_time", "2.5");
943943
let mut metadata = event.metadata().clone();
944-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
944+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
945945
let metric = do_transform(config, event).await.unwrap();
946946

947947
assert_eq!(
@@ -971,7 +971,7 @@ mod tests {
971971

972972
let event = create_event("response_time", "2.5");
973973
let mut metadata = event.metadata().clone();
974-
*metadata.source_mut() = Some(Arc::new(OutputId::from("in")));
974+
*metadata.source_id_mut() = Some(Arc::new(OutputId::from("in")));
975975
let metric = do_transform(config, event).await.unwrap();
976976

977977
assert_eq!(

0 commit comments

Comments
 (0)