Skip to content

Commit be2f04a

Browse files
KayzzzZKayzzzZ
committed
update
1 parent 52f69b4 commit be2f04a

10 files changed

+63
-373
lines changed

Diff for: ‎core/ebpf/type/table/AppTable.h

-34
Original file line numberDiff line numberDiff line change
@@ -83,39 +83,5 @@ inline constexpr size_t kAppMetricsNum = std::size(kAppMetricsElements);
8383

8484
inline constexpr auto kAppMetricsTable = DataTableSchema("app_metrics", "app metrics table", kAppMetricsElements);
8585

86-
// inline constexpr DataElement kAppTraceElements[] = {
87-
// kNamespace,
88-
// kWorkloadKind,
89-
// kWorkloadName,
90-
// kPeerAppName,
91-
// kPeerPodName,
92-
// kPeerPodIp,
93-
// kPeerNamespace,
94-
// kPeerWorkloadKind,
95-
// kPeerWorkloadName,
96-
// kPeerServiceName,
97-
// kProtocol,
98-
// kLocalAddr,
99-
// kRemoteAddr,
100-
// kRemotePort,
101-
// kRpcType,
102-
// kCallKind,
103-
// kCallType,
104-
// kDestId,
105-
// kEndpoint,
106-
// kFd,
107-
// kProcessId,
108-
// kContainerId,
109-
// kTraceRole,
110-
// kIp,
111-
// kNetNs,
112-
// kFamily,
113-
// kStartTsNs,
114-
// };
115-
116-
// inline constexpr size_t kAppTraceNum = std::size(kAppTraceElements);
117-
118-
// inline constexpr auto kAppTraceTable = DataTableSchema("app_trace", "app metrics table", kAppTraceElements);
119-
12086
} // namespace ebpf
12187
} // namespace logtail

Diff for: ‎core/ebpf/type/table/BaseElements.h

-64
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ inline constexpr DataElement kPodName = {
5959
"",
6060
};
6161

62-
inline constexpr DataElement kPodUid = {
63-
"pod_uid",
64-
"pod_uid", // metric
65-
"k8s.pod.uid", // span
66-
"k8s.pod.uid", // log, inside pod
67-
"pod uid",
68-
};
69-
7062
inline constexpr DataElement kPodIp = {
7163
"pod_ip",
7264
"podIp", // metric
@@ -179,14 +171,6 @@ inline constexpr DataElement kLocalAddr = {
179171
"IP address of the local endpoint.",
180172
};
181173

182-
inline constexpr DataElement kLocalPort = {
183-
"local_port",
184-
"local_addr", // metric
185-
"local.port", // span
186-
"local.port", // log
187-
"Port of the local endpoint.",
188-
};
189-
190174
inline constexpr DataElement kTraceRole = {
191175
"trace_role",
192176
"trace_role", // metric
@@ -211,22 +195,6 @@ inline constexpr DataElement kStartTsNs = {
211195
"Request-response latency.",
212196
};
213197

214-
inline constexpr DataElement kEndTsNs = {
215-
"endTsNs",
216-
"", // metric
217-
"endTsNs", // span
218-
"end_time_nsec", // log
219-
"Request-response latency.",
220-
};
221-
222-
inline constexpr DataElement kRegionId = {
223-
"region_id",
224-
"regionId", // metric
225-
"regionId", // span
226-
"region.id", // log
227-
"region id",
228-
};
229-
230198
inline constexpr DataElement kIp = {
231199
"ip",
232200
"serverIp", // metric
@@ -354,30 +322,6 @@ inline constexpr DataElement kContainerId = {
354322
"local container id",
355323
};
356324

357-
inline constexpr DataElement kContainerName = {
358-
"container_name",
359-
"container_name", // metric
360-
"container.name", // span
361-
"container.name", // log
362-
"local container name",
363-
};
364-
365-
inline constexpr DataElement kContainerIp = {
366-
"container_ip",
367-
"container_ip", // metric
368-
"container.ip", // span
369-
"container.ip", // log
370-
"container ip",
371-
};
372-
373-
inline constexpr DataElement kImageName = {
374-
"image_name",
375-
"conatainer_image_name", // metric
376-
"conatainer.image.name", // span
377-
"conatainer.image.name", // log
378-
"container image name",
379-
};
380-
381325
// for processes
382326
inline constexpr DataElement kProcessId = {
383327
"process_pid",
@@ -483,14 +427,6 @@ inline constexpr DataElement kEventType = {
483427
"",
484428
};
485429

486-
inline constexpr DataElement kEventTime = {
487-
"event_time",
488-
"event_time",
489-
"event_time",
490-
"event_time",
491-
"",
492-
};
493-
494430
inline constexpr DataElement kParentProcessId = {
495431
"parent_process_pid",
496432
"",

Diff for: ‎core/ebpf/type/table/DataTable.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ namespace ebpf {
2323
class DataElement {
2424
public:
2525
constexpr DataElement() = delete;
26-
constexpr DataElement(StringView name,
27-
StringView metricKey,
28-
StringView spanKey,
29-
StringView logKey,
30-
StringView desc)
26+
constexpr DataElement(StringView name, StringView metricKey, StringView spanKey, StringView logKey, StringView desc)
3127
: mName(name), mMetricKey(metricKey), mSpanKey(spanKey), mLogKey(logKey), mDesc(desc) {}
3228

3329
constexpr bool operator==(const DataElement& rhs) const { return mName == rhs.mName; }

Diff for: ‎core/ebpf/type/table/FileSecurityTable.h

-59
This file was deleted.

Diff for: ‎core/ebpf/type/table/HttpTable.h

-17
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,5 @@ constexpr DataElement kHTTPRespHeader = {
100100
"http resp.header",
101101
};
102102

103-
// static constexpr DataElement kHTTPElements[] = {kIp, // agg key
104-
// kAppId, // agg key
105-
// kProtocol, // agg key
106-
// kRpc, // agg key
107-
// kDestId, // agg key
108-
// kContainerId, // agg key
109-
// kRpcType,
110-
// kCallType,
111-
// kCallKind,
112-
// kEndpoint,
113-
// kStatusCode,
114-
// kStartTsNs,
115-
// kEndTsNs};
116-
117-
// static constexpr auto kHTTPTable = DataTableSchema("http_record", "HTTP request-response pair events",
118-
// kHTTPElements);
119-
120103
} // namespace ebpf
121104
} // namespace logtail

Diff for: ‎core/ebpf/type/table/NetTable.h

-11
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,5 @@ inline constexpr size_t kNetMetricsNum = std::size(kNetMetricsElements);
4141

4242
inline constexpr auto kNetMetricsTable = DataTableSchema("net_metrics", "net metrics table", kNetMetricsElements);
4343

44-
// inline constexpr DataElement kNetElements[] = {
45-
// kIp,
46-
// kAppId,
47-
48-
// kLocalAddr,
49-
// kRemoteAddr,
50-
// kRemotePort,
51-
// };
52-
53-
// inline constexpr auto kNetTable = DataTableSchema("net_record", "net events", kNetElements);
54-
5544
} // namespace ebpf
5645
} // namespace logtail

Diff for: ‎core/ebpf/type/table/NetworkSecurityTable.h

-65
This file was deleted.

Diff for: ‎core/ebpf/type/table/ProcessTable.h

-31
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,5 @@ inline constexpr size_t kProcessCacheTableSize = std::size(kProcessCacheElements
2727

2828
inline constexpr auto kProcessCacheTable = DataTableSchema("process_cache_table", "", kProcessCacheElements);
2929

30-
// inline constexpr DataElement kProcessSecurityElements[] = {kExecId,
31-
// kProcessId,
32-
// kUid,
33-
// kUser,
34-
// kBinary,
35-
// kArguments,
36-
// kCWD,
37-
// kKtime,
38-
// kCapInheritable,
39-
// kCapPermitted,
40-
// kCapEffective,
41-
// kParentProcessId,
42-
// kParentUid,
43-
// kParentUser,
44-
// kParentBinary,
45-
// kParentArguments,
46-
// kParentCWD,
47-
// kParentKtime,
48-
// kParentCapInheritable,
49-
// kParentCapPermitted,
50-
// kParentCapEffective,
51-
// kContainerId,
52-
// kEventTime,
53-
// kCallName,
54-
// kEventType};
55-
56-
// inline constexpr size_t kProcessSecurityTableSize = std::size(kProcessSecurityElements);
57-
58-
// inline constexpr auto kProcessSecurityTable = DataTableSchema("process_security_table", "",
59-
// kProcessSecurityElements);
60-
6130
} // namespace ebpf
6231
} // namespace logtail

0 commit comments

Comments
 (0)