Skip to content

Commit 2d224d2

Browse files
jongpiejongpie
committed
[WIP] Moved service name field to Log__c, added additional 'external service' fields
1 parent db75832 commit 2d224d2

20 files changed

+308
-68
lines changed

‎nebula-logger/core/main/log-management/classes/LogEntryEventHandler.cls‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ public without sharing class LogEntryEventHandler extends LoggerSObjectHandler {
158158
AsyncContextParentJobId__c = logEntryEvent.AsyncContextParentJobId__c,
159159
AsyncContextTriggerId__c = logEntryEvent.AsyncContextTriggerId__c,
160160
AsyncContextType__c = logEntryEvent.AsyncContextType__c,
161+
ExternalServiceId__c = logEntryEvent.ExternalServiceId__c,
162+
ExternalServiceName__c = logEntryEvent.ExternalServiceName__c,
163+
ExternalServiceType__c = logEntryEvent.ExternalServiceType__c,
164+
ExternalServiceVersion__c = logEntryEvent.ExternalServiceVersion__c,
161165
ImpersonatedBy__c = logEntryEvent.ImpersonatedById__c,
162166
Locale__c = logEntryEvent.Locale__c,
163167
LoggedBy__c = logEntryEvent.LoggedById__c,
@@ -335,7 +339,6 @@ public without sharing class LogEntryEventHandler extends LoggerSObjectHandler {
335339
MessageTruncated__c = logEntryEvent.MessageTruncated__c,
336340
Name = null, // Salesforce will auto-set the record ID as the name when null
337341
OriginLocation__c = logEntryEvent.OriginLocation__c,
338-
OriginServiceName__c = logEntryEvent.OriginServiceName__c,
339342
OriginSourceActionName__c = logEntryEvent.OriginSourceActionName__c,
340343
OriginSourceApiName__c = logEntryEvent.OriginSourceApiName__c,
341344
OriginSourceId__c = logEntryEvent.OriginSourceId__c,

‎nebula-logger/core/main/log-management/classes/LoggerRestResource.cls‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,12 +344,18 @@ global with sharing class LoggerRestResource {
344344

345345
for (OTelAttribute entryAttribute : this.attributes) {
346346
switch on entryAttribute.key {
347+
when 'service.id' {
348+
supplementalFieldToValue.put(LogEntryEvent__e.ExternalServiceId__c, entryAttribute.value?.stringValue);
349+
}
347350
when 'service.name' {
348-
supplementalFieldToValue.put(LogEntryEvent__e.OriginServiceName__c, entryAttribute.value?.stringValue);
351+
supplementalFieldToValue.put(LogEntryEvent__e.ExternalServiceName__c, entryAttribute.value?.stringValue);
352+
}
353+
when 'service.type' {
354+
supplementalFieldToValue.put(LogEntryEvent__e.ExternalServiceType__c, entryAttribute.value?.stringValue);
355+
}
356+
when 'service.version' {
357+
supplementalFieldToValue.put(LogEntryEvent__e.ExternalServiceVersion__c, entryAttribute.value?.stringValue);
349358
}
350-
// TODO
351-
// when 'service.version' {
352-
// }
353359
}
354360
}
355361

@@ -393,7 +399,7 @@ global with sharing class LoggerRestResource {
393399
}
394400
this.convertedLogEntryEvent = builder.getLogEntryEvent();
395401
this.convertedLogEntryEvent.EntryScenario__c = this.name;
396-
this.convertedLogEntryEvent.OriginType__c = 'API';
402+
this.convertedLogEntryEvent.OriginType__c = 'External Service';
397403
this.convertedLogEntryEvent.TransactionId__c = convertedTraceId;
398404

399405
// Since the log entries originate off-platform, tracking the limits usage isn't really relevant here

‎nebula-logger/core/main/log-management/flexipages/LogRecordPage.flexipage-meta.xml‎

Lines changed: 84 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,86 @@
312312
<type>Facet</type>
313313
</flexiPageRegions>
314314
<flexiPageRegions>
315+
<itemInstances>
316+
<fieldInstance>
317+
<fieldInstanceProperties>
318+
<name>uiBehavior</name>
319+
<value>none</value>
320+
</fieldInstanceProperties>
321+
<fieldItem>Record.ExternalServiceId__c</fieldItem>
322+
<identifier>RecordExternalServiceId_cField2</identifier>
323+
<visibilityRule>
324+
<criteria>
325+
<leftValue>{!Record.ExternalServiceId__c}</leftValue>
326+
<operator>NE</operator>
327+
</criteria>
328+
</visibilityRule>
329+
</fieldInstance>
330+
</itemInstances>
331+
<itemInstances>
332+
<fieldInstance>
333+
<fieldInstanceProperties>
334+
<name>uiBehavior</name>
335+
<value>none</value>
336+
</fieldInstanceProperties>
337+
<fieldItem>Record.ExternalServiceName__c</fieldItem>
338+
<identifier>RecordExternalServiceName_cField</identifier>
339+
<visibilityRule>
340+
<criteria>
341+
<leftValue>{!Record.ExternalServiceName__c}</leftValue>
342+
<operator>NE</operator>
343+
</criteria>
344+
</visibilityRule>
345+
</fieldInstance>
346+
</itemInstances>
347+
<itemInstances>
348+
<fieldInstance>
349+
<fieldInstanceProperties>
350+
<name>uiBehavior</name>
351+
<value>none</value>
352+
</fieldInstanceProperties>
353+
<fieldItem>Record.ExternalServiceType__c</fieldItem>
354+
<identifier>RecordExternalServiceType_cField</identifier>
355+
<visibilityRule>
356+
<criteria>
357+
<leftValue>{!Record.ExternalServiceType__c}</leftValue>
358+
<operator>NE</operator>
359+
</criteria>
360+
</visibilityRule>
361+
</fieldInstance>
362+
</itemInstances>
363+
<itemInstances>
364+
<fieldInstance>
365+
<fieldInstanceProperties>
366+
<name>uiBehavior</name>
367+
<value>none</value>
368+
</fieldInstanceProperties>
369+
<fieldItem>Record.ExternalServiceVersion__c</fieldItem>
370+
<identifier>RecordExternalServiceVersion_cField</identifier>
371+
<visibilityRule>
372+
<criteria>
373+
<leftValue>{!Record.ExternalServiceVersion__c}</leftValue>
374+
<operator>NE</operator>
375+
</criteria>
376+
</visibilityRule>
377+
</fieldInstance>
378+
</itemInstances>
379+
<itemInstances>
380+
<fieldInstance>
381+
<fieldInstanceProperties>
382+
<name>uiBehavior</name>
383+
<value>readonly</value>
384+
</fieldInstanceProperties>
385+
<fieldItem>Record.ParentLogLink__c</fieldItem>
386+
<identifier>RecordParentLogLink__cField</identifier>
387+
<visibilityRule>
388+
<criteria>
389+
<leftValue>{!Record.ParentLogTransactionId__c}</leftValue>
390+
<operator>NE</operator>
391+
</criteria>
392+
</visibilityRule>
393+
</fieldInstance>
394+
</itemInstances>
315395
<itemInstances>
316396
<fieldInstance>
317397
<fieldInstanceProperties>
@@ -348,6 +428,10 @@
348428
<identifier>RecordStartTime__cField</identifier>
349429
</fieldInstance>
350430
</itemInstances>
431+
<name>Facet-d581561a-9af6-472b-bf5b-f191cbaa0836</name>
432+
<type>Facet</type>
433+
</flexiPageRegions>
434+
<flexiPageRegions>
351435
<itemInstances>
352436
<fieldInstance>
353437
<fieldInstanceProperties>
@@ -368,10 +452,6 @@
368452
<identifier>RecordTotalLimitsCpuTimeUsed__cField</identifier>
369453
</fieldInstance>
370454
</itemInstances>
371-
<name>Facet-d581561a-9af6-472b-bf5b-f191cbaa0836</name>
372-
<type>Facet</type>
373-
</flexiPageRegions>
374-
<flexiPageRegions>
375455
<itemInstances>
376456
<fieldInstance>
377457
<fieldInstanceProperties>
@@ -402,16 +482,6 @@
402482
<identifier>RecordTotalWARNLogEntries__cField</identifier>
403483
</fieldInstance>
404484
</itemInstances>
405-
<itemInstances>
406-
<fieldInstance>
407-
<fieldInstanceProperties>
408-
<name>uiBehavior</name>
409-
<value>readonly</value>
410-
</fieldInstanceProperties>
411-
<fieldItem>Record.ParentLogLink__c</fieldItem>
412-
<identifier>RecordParentLogLink__cField</identifier>
413-
</fieldInstance>
414-
</itemInstances>
415485
<name>Facet-af147cb3-e6b1-4ef7-a00b-d4746d5a1c90</name>
416486
<type>Facet</type>
417487
</flexiPageRegions>

‎nebula-logger/core/main/log-management/objects/LogEntry__c/fields/OriginType__c.field-meta.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
<default>false</default>
1818
<label>Apex</label>
1919
</value>
20-
<value>
21-
<fullName>API</fullName>
22-
<color>#FFCA3A</color>
23-
<default>false</default>
24-
<label>API</label>
25-
</value>
2620
<value>
2721
<fullName>Component</fullName>
2822
<color>#8AC926</color>
2923
<default>false</default>
3024
<label>Component</label>
3125
</value>
26+
<value>
27+
<fullName>External Service</fullName>
28+
<color>#FFCA3A</color>
29+
<default>false</default>
30+
<label>External Service</label>
31+
</value>
3232
<value>
3333
<fullName>Flow</fullName>
3434
<color>#1982C4</color>

‎nebula-logger/core/main/log-management/objects/LogEntry__c/listViews/AllApiLogEntries.listView-meta.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

nebula-logger/core/main/log-management/objects/LogEntry__c/fields/OriginServiceName__c.field-meta.xml renamed to nebula-logger/core/main/log-management/objects/Log__c/fields/ExternalServiceId__c.field-meta.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<fullName>OriginServiceName__c</fullName>
3+
<fullName>ExternalServiceId__c</fullName>
44
<businessStatus>Active</businessStatus>
55
<complianceGroup>None</complianceGroup>
66
<externalId>true</externalId>
7-
<label>Origin Service Name</label>
7+
<label>External Service ID</label>
88
<length>255</length>
99
<required>false</required>
1010
<securityClassification>Confidential</securityClassification>

‎nebula-logger/core/main/log-management/objects/Log__c/fields/ExternalServiceName__c.field-meta.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<fullName>ExternalServiceName__c</fullName>
4+
<businessStatus>Active</businessStatus>
5+
<complianceGroup>None</complianceGroup>
6+
<externalId>true</externalId>
7+
<label>External Service Name</label>
8+
<length>255</length>
9+
<required>false</required>
10+
<securityClassification>Confidential</securityClassification>
11+
<trackTrending>false</trackTrending>
12+
<type>Text</type>
13+
<unique>false</unique>
14+
</CustomField>

‎nebula-logger/core/main/log-management/objects/Log__c/fields/ExternalServiceType__c.field-meta.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<fullName>ExternalServiceType__c</fullName>
4+
<businessStatus>Active</businessStatus>
5+
<complianceGroup>None</complianceGroup>
6+
<externalId>true</externalId>
7+
<label>External Service Type</label>
8+
<length>255</length>
9+
<required>false</required>
10+
<securityClassification>Confidential</securityClassification>
11+
<trackTrending>false</trackTrending>
12+
<type>Text</type>
13+
<unique>false</unique>
14+
</CustomField>

‎nebula-logger/core/main/log-management/objects/Log__c/fields/ExternalServiceVersion__c.field-meta.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<fullName>ExternalServiceVersion__c</fullName>
4+
<businessStatus>Active</businessStatus>
5+
<complianceGroup>None</complianceGroup>
6+
<externalId>true</externalId>
7+
<label>External Service Version</label>
8+
<length>255</length>
9+
<required>false</required>
10+
<securityClassification>Confidential</securityClassification>
11+
<trackTrending>false</trackTrending>
12+
<type>Text</type>
13+
<unique>false</unique>
14+
</CustomField>

‎nebula-logger/core/main/log-management/objects/Log__c/listViews/AllExternalServiceLogs.listView-meta.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<fullName>AllExternalServiceLogs</fullName>
4+
<columns>NAME</columns>
5+
<columns>ExternalServiceType__c</columns>
6+
<columns>ExternalServiceId__c</columns>
7+
<columns>ExternalServiceName__c</columns>
8+
<columns>LoggedByUsernameLink__c</columns>
9+
<columns>ProfileLink__c</columns>
10+
<columns>TransactionId__c</columns>
11+
<columns>TotalLogEntries__c</columns>
12+
<columns>TotalERRORLogEntries__c</columns>
13+
<columns>TotalWARNLogEntries__c</columns>
14+
<columns>OWNER.ALIAS</columns>
15+
<columns>Priority__c</columns>
16+
<columns>Status__c</columns>
17+
<columns>TransactionScenarioLink__c</columns>
18+
<columns>StartTime__c</columns>
19+
<filterScope>Everything</filterScope>
20+
<filters>
21+
<field>ExternalServiceName__c</field>
22+
<operation>notEqual</operation>
23+
</filters>
24+
<label>All Child Logs</label>
25+
</ListView>

0 commit comments

Comments
 (0)