Skip to content

Commit d44ea19

Browse files
dkhokhlovdkhokhlov
committed
Bumping 3.8.7 to 3.8.8
Signed-off-by: Dmitri Khokhlov <dkhokhlov@gmail.com>
1 parent 7a62eda commit d44ea19

14 files changed

+70
-91
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
[package]
1212
name = "logdna-agent"
13-
version = "3.8.7"
13+
version = "3.8.8"
1414
authors = ["CJP10 <connor.peticca@logdna.com>"]
1515
edition = "2018"
1616
build = "build.rs"

‎common/config/src/lib.rs‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,16 @@ pub struct HttpConfig {
9393
pub retry_step_delay: Duration,
9494
}
9595

96-
#[derive(Clone, Display, core::fmt::Debug, Eq, PartialEq, EnumString)]
96+
#[derive(Clone, Default, Display, core::fmt::Debug, Eq, PartialEq, EnumString)]
9797
pub enum K8sTrackingConf {
9898
#[strum(serialize = "always")]
9999
Always,
100100

101101
#[strum(serialize = "never")]
102+
#[default]
102103
Never,
103104
}
104105

105-
impl Default for K8sTrackingConf {
106-
fn default() -> Self {
107-
K8sTrackingConf::Never
108-
}
109-
}
110-
111106
#[derive(Debug)]
112107
pub struct LogConfig {
113108
pub dirs: Vec<DirPathBuf>,
@@ -132,9 +127,10 @@ pub struct JournaldConfig {
132127
pub systemd_journal_tailer: bool,
133128
}
134129

135-
#[derive(Clone, core::fmt::Debug, Display, EnumString, Eq, PartialEq)]
130+
#[derive(Clone, Default, core::fmt::Debug, Display, EnumString, Eq, PartialEq)]
136131
pub enum K8sLeaseConf {
137132
#[strum(serialize = "never")]
133+
#[default]
138134
Never,
139135

140136
#[strum(serialize = "attempt")]
@@ -144,12 +140,6 @@ pub enum K8sLeaseConf {
144140
Always,
145141
}
146142

147-
impl Default for K8sLeaseConf {
148-
fn default() -> Self {
149-
K8sLeaseConf::Never
150-
}
151-
}
152-
153143
const LOGDNA_PREFIX: &str = "LOGDNA_";
154144
const MEZMO_PREFIX: &str = "MZ_";
155145

‎common/fs/src/cache/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ impl FileSystem {
313313
let (resume_events_send, resume_events_recv) = async_channel::unbounded();
314314
let (retry_events_send, retry_events_recv) = async_channel::unbounded();
315315

316-
let mut initial_dirs_checked = initial_dirs_original.clone();
316+
let mut initial_dirs_checked = initial_dirs_original;
317317
initial_dirs_checked.iter_mut().for_each(|path| {
318318
// if postfix is Some then dir does not exists
319319
// check again if non-existing path exists now

‎common/fs/src/lookback.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
use std::fmt;
22
use thiserror::Error;
33

4-
#[derive(Clone, std::fmt::Debug, Eq, PartialEq)]
4+
#[derive(Clone, Default, std::fmt::Debug, Eq, PartialEq)]
55
pub enum Lookback {
66
Start,
77
SmallFiles,
88
Tail,
9+
#[default]
910
None,
1011
}
1112

@@ -48,9 +49,3 @@ impl fmt::Display for Lookback {
4849
)
4950
}
5051
}
51-
52-
impl Default for Lookback {
53-
fn default() -> Self {
54-
Lookback::None
55-
}
56-
}

‎common/http/src/batch.rs‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -429,19 +429,17 @@ mod tests {
429429
batch_stream.collect::<Vec<_>>().await
430430
});
431431

432-
let all_results = results.into_iter().map(move |body|{
433-
let mut buf = String::new();
434-
body.as_ref()
435-
.unwrap()
436-
.0
437-
.reader()
438-
.read_to_string(&mut buf)
439-
.unwrap();
440-
let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
441-
body.remove("lines").unwrap_or_default()
442-
})
443-
.into_iter()
444-
.flatten();
432+
let all_results = results.into_iter().flat_map(move |body|{
433+
let mut buf = String::new();
434+
body.as_ref()
435+
.unwrap()
436+
.0
437+
.reader()
438+
.read_to_string(&mut buf)
439+
.unwrap();
440+
let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
441+
body.remove("lines").unwrap_or_default()
442+
});
445443

446444
assert_eq!(all_results.count(), size);
447445
}

‎common/http/src/retry.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ mod tests {
470470
.collect::<Vec<_>>();
471471

472472
// Grab results and check we got them all
473-
let stream_results = results.into_iter().map(move |body_offsets|{
473+
let stream_results = results.into_iter().flat_map(move |body_offsets|{
474474
let mut buf = String::new();
475475
let (body, _offsets) = body_offsets.unwrap();
476476
body.reader()
@@ -479,8 +479,6 @@ mod tests {
479479
let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
480480
body.remove("lines").unwrap_or_default()
481481
})
482-
.into_iter()
483-
.flatten()
484482
.collect::<Vec<_>>();
485483

486484
let lines_set: HashSet<String> = lines.iter().map(|l|l.line.clone()).collect::<HashSet<_>>();
@@ -490,7 +488,7 @@ mod tests {
490488
assert_eq!(lines_set, l);
491489

492490
// Grab retries and check we got them all
493-
let retry_results = retry_results.into_iter().map(move |body_offsets|{
491+
let retry_results = retry_results.into_iter().flat_map(move |body_offsets|{
494492
let mut buf = String::new();
495493
let body = body_offsets.unwrap();
496494
body.body_buffer.reader()
@@ -499,8 +497,6 @@ mod tests {
499497
let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
500498
body.remove("lines").unwrap_or_default()
501499
})
502-
.into_iter()
503-
.flatten()
504500
.collect::<Vec<_>>();
505501
let r: HashSet<String> = retry_results.iter().map(|r|r.line.clone()).collect::<HashSet<_>>();
506502

‎k8s/agent-namespace.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ metadata:
55
labels:
66
app.kubernetes.io/name: logdna-agent
77
app.kubernetes.io/instance: logdna-agent
8-
app.kubernetes.io/version: 3.8.7
8+
app.kubernetes.io/version: 3.8.8

‎k8s/agent-resources-no-cap.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
labels:
1818
app.kubernetes.io/name: logdna-agent
1919
app.kubernetes.io/instance: logdna-agent
20-
app.kubernetes.io/version: 3.8.7
20+
app.kubernetes.io/version: 3.8.8
2121
---
2222
apiVersion: rbac.authorization.k8s.io/v1
2323
kind: Role
@@ -27,7 +27,7 @@ metadata:
2727
labels:
2828
app.kubernetes.io/name: logdna-agent
2929
app.kubernetes.io/instance: logdna-agent
30-
app.kubernetes.io/version: 3.8.7
30+
app.kubernetes.io/version: 3.8.8
3131
rules:
3232
- apiGroups: [""]
3333
resources: ["configmaps"]
@@ -41,7 +41,7 @@ metadata:
4141
labels:
4242
app.kubernetes.io/name: logdna-agent
4343
app.kubernetes.io/instance: logdna-agent
44-
app.kubernetes.io/version: 3.8.7
44+
app.kubernetes.io/version: 3.8.8
4545
roleRef:
4646
apiGroup: rbac.authorization.k8s.io
4747
kind: Role
@@ -58,7 +58,7 @@ metadata:
5858
labels:
5959
app.kubernetes.io/name: logdna-agent
6060
app.kubernetes.io/instance: logdna-agent
61-
app.kubernetes.io/version: 3.8.7
61+
app.kubernetes.io/version: 3.8.8
6262
rules:
6363
- apiGroups: [""]
6464
resources: ["events"]
@@ -74,7 +74,7 @@ metadata:
7474
labels:
7575
app.kubernetes.io/name: logdna-agent
7676
app.kubernetes.io/instance: logdna-agent
77-
app.kubernetes.io/version: 3.8.7
77+
app.kubernetes.io/version: 3.8.8
7878
roleRef:
7979
apiGroup: rbac.authorization.k8s.io
8080
kind: ClusterRole
@@ -92,7 +92,7 @@ metadata:
9292
labels:
9393
app.kubernetes.io/name: logdna-agent
9494
app.kubernetes.io/instance: logdna-agent
95-
app.kubernetes.io/version: 3.8.7
95+
app.kubernetes.io/version: 3.8.8
9696
spec:
9797
updateStrategy:
9898
type: RollingUpdate
@@ -107,13 +107,13 @@ spec:
107107
app: logdna-agent
108108
app.kubernetes.io/name: logdna-agent
109109
app.kubernetes.io/instance: logdna-agent
110-
app.kubernetes.io/version: 3.8.7
110+
app.kubernetes.io/version: 3.8.8
111111
spec:
112112
serviceAccountName: logdna-agent
113113
priorityClassName: logdna-agent-ds-priority
114114
containers:
115115
- name: logdna-agent
116-
image: logdna/logdna-agent:3.8.7
116+
image: logdna/logdna-agent:3.8.8
117117
imagePullPolicy: Always
118118
securityContext:
119119
capabilities:

‎k8s/agent-resources-openshift-supertenant.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
labels:
1818
app.kubernetes.io/name: logdna-agent
1919
app.kubernetes.io/instance: logdna-agent
20-
app.kubernetes.io/version: 3.8.7
20+
app.kubernetes.io/version: 3.8.8
2121
rules:
2222
- apiGroups: [""]
2323
resources: ["configmaps"]
@@ -31,7 +31,7 @@ metadata:
3131
labels:
3232
app.kubernetes.io/name: logdna-agent
3333
app.kubernetes.io/instance: logdna-agent
34-
app.kubernetes.io/version: 3.8.7
34+
app.kubernetes.io/version: 3.8.8
3535
roleRef:
3636
apiGroup: rbac.authorization.k8s.io
3737
kind: Role
@@ -48,7 +48,7 @@ metadata:
4848
labels:
4949
app.kubernetes.io/name: logdna-agent
5050
app.kubernetes.io/instance: logdna-agent
51-
app.kubernetes.io/version: 3.8.7
51+
app.kubernetes.io/version: 3.8.8
5252
rules:
5353
- apiGroups: [""]
5454
resources: ["events"]
@@ -64,7 +64,7 @@ metadata:
6464
labels:
6565
app.kubernetes.io/name: logdna-agent
6666
app.kubernetes.io/instance: logdna-agent
67-
app.kubernetes.io/version: 3.8.7
67+
app.kubernetes.io/version: 3.8.8
6868
roleRef:
6969
apiGroup: rbac.authorization.k8s.io
7070
kind: ClusterRole
@@ -82,7 +82,7 @@ metadata:
8282
labels:
8383
app.kubernetes.io/name: logdna-agent
8484
app.kubernetes.io/instance: logdna-agent
85-
app.kubernetes.io/version: 3.8.7
85+
app.kubernetes.io/version: 3.8.8
8686
spec:
8787
updateStrategy:
8888
type: RollingUpdate
@@ -97,13 +97,13 @@ spec:
9797
app: logdna-agent
9898
app.kubernetes.io/name: logdna-agent
9999
app.kubernetes.io/instance: logdna-agent
100-
app.kubernetes.io/version: 3.8.7
100+
app.kubernetes.io/version: 3.8.8
101101
spec:
102102
serviceAccountName: logdna-agent
103103
priorityClassName: logdna-agent-ds-priority
104104
containers:
105105
- name: logdna-agent
106-
image: logdna/logdna-agent:3.8.7
106+
image: logdna/logdna-agent:3.8.8
107107
imagePullPolicy: Always
108108
securityContext:
109109
privileged: true

0 commit comments

Comments
 (0)