|
| 1 | +/* |
| 2 | + * Copyright 2013-2024, Seqera Labs |
| 3 | + * |
| 4 | + * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | + * you may not use this file except in compliance with the License. |
| 6 | + * You may obtain a copy of the License at |
| 7 | + * |
| 8 | + * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | + * |
| 10 | + * Unless required by applicable law or agreed to in writing, software |
| 11 | + * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | + * See the License for the specific language governing permissions and |
| 14 | + * limitations under the License. |
| 15 | + */ |
| 16 | + |
1 | 17 | package nextflow.trace |
2 | 18 |
|
3 | 19 | import java.nio.file.Path |
4 | 20 |
|
5 | 21 | import nextflow.Session |
| 22 | +import nextflow.file.FileHelper |
6 | 23 |
|
7 | 24 | /** |
8 | 25 | * Creates Nextflow observes object |
9 | 26 | * |
10 | 27 | * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com> |
11 | 28 | */ |
12 | | -class DefaultObserverFactory implements TraceObserverFactory { |
| 29 | +class DefaultObserverFactory implements TraceObserverFactoryV2 { |
13 | 30 |
|
14 | 31 | private Map config |
15 | | - private Session session |
16 | 32 |
|
17 | 33 | @Override |
18 | | - Collection<TraceObserver> create(Session session) { |
19 | | - this.session = session |
| 34 | + Collection<TraceObserverV2> create(Session session) { |
20 | 35 | this.config = session.config |
21 | 36 |
|
22 | | - final result = new ArrayList(10) |
23 | | - createTraceFileObserver(result) |
| 37 | + final result = new ArrayList<TraceObserverV2>(5) |
| 38 | + if( session.ansiLog ) |
| 39 | + createAnsiLogObserver(result) |
| 40 | + createGraphObserver(result) |
24 | 41 | createReportObserver(result) |
25 | 42 | createTimelineObserver(result) |
26 | | - createDagObserver(result) |
27 | | - createAnsiLogObserver(result) |
| 43 | + createTraceFileObserver(result) |
28 | 44 | return result |
29 | 45 | } |
30 | 46 |
|
31 | | - protected void createAnsiLogObserver(Collection<TraceObserver> result) { |
32 | | - if( session.ansiLog ) { |
33 | | - session.ansiLogObserver = new AnsiLogObserver() |
34 | | - result << session.ansiLogObserver |
35 | | - } |
| 47 | + protected void createAnsiLogObserver(Collection<TraceObserverV2> result) { |
| 48 | + session.ansiLogObserver = new AnsiLogObserver() |
| 49 | + result << session.ansiLogObserver |
36 | 50 | } |
37 | 51 |
|
38 | | - /** |
39 | | - * Create workflow report file observer |
40 | | - */ |
41 | | - protected void createReportObserver(Collection<TraceObserver> result) { |
42 | | - Boolean isEnabled = config.navigate('report.enabled') as Boolean |
| 52 | + protected void createReportObserver(Collection<TraceObserverV2> result) { |
| 53 | + final isEnabled = config.navigate('report.enabled') as Boolean |
43 | 54 | if( !isEnabled ) |
44 | 55 | return |
45 | 56 |
|
46 | | - String fileName = config.navigate('report.file') |
47 | | - def maxTasks = config.navigate('report.maxTasks', ReportObserver.DEF_MAX_TASKS) as int |
48 | | - if( !fileName ) fileName = ReportObserver.DEF_FILE_NAME |
49 | | - def report = (fileName as Path).complete() |
50 | | - def observer = new ReportObserver(report) |
| 57 | + final fileName = config.navigate('report.file', ReportObserver.DEF_FILE_NAME) as String |
| 58 | + final maxTasks = config.navigate('report.maxTasks', ReportObserver.DEF_MAX_TASKS) as int |
| 59 | + final overwrite = config.navigate('report.overwrite') as Boolean |
| 60 | + |
| 61 | + final observer = new ReportObserver(FileHelper.asPath(fileName), overwrite) |
51 | 62 | observer.maxTasks = maxTasks |
52 | | - config.navigate('report.overwrite') { observer.overwrite = it } |
53 | 63 | result << observer |
54 | 64 | } |
55 | 65 |
|
56 | | - /** |
57 | | - * Create timeline report file observer |
58 | | - */ |
59 | | - protected void createTimelineObserver(Collection<TraceObserver> result) { |
60 | | - Boolean isEnabled = config.navigate('timeline.enabled') as Boolean |
| 66 | + protected void createTimelineObserver(Collection<TraceObserverV2> result) { |
| 67 | + final isEnabled = config.navigate('timeline.enabled') as Boolean |
61 | 68 | if( !isEnabled ) |
62 | 69 | return |
63 | 70 |
|
64 | | - String fileName = config.navigate('timeline.file') |
65 | | - if( !fileName ) fileName = TimelineObserver.DEF_FILE_NAME |
66 | | - def traceFile = (fileName as Path).complete() |
67 | | - def observer = new TimelineObserver(traceFile) |
68 | | - config.navigate('timeline.overwrite') { observer.overwrite = it } |
69 | | - result << observer |
| 71 | + final fileName = config.navigate('timeline.file', TimelineObserver.DEF_FILE_NAME) as String |
| 72 | + final overwrite = config.navigate('timeline.overwrite') as Boolean |
| 73 | + |
| 74 | + result << new TimelineObserver(FileHelper.asPath(fileName), overwrite) |
70 | 75 | } |
71 | 76 |
|
72 | | - protected void createDagObserver(Collection<TraceObserver> result) { |
73 | | - Boolean isEnabled = config.navigate('dag.enabled') as Boolean |
| 77 | + protected void createGraphObserver(Collection<TraceObserverV2> result) { |
| 78 | + final isEnabled = config.navigate('dag.enabled') as Boolean |
74 | 79 | if( !isEnabled ) |
75 | 80 | return |
76 | 81 |
|
77 | | - String fileName = config.navigate('dag.file') |
78 | | - if( !fileName ) fileName = GraphObserver.DEF_FILE_NAME |
79 | | - def traceFile = (fileName as Path).complete() |
80 | | - def observer = new GraphObserver(traceFile) |
81 | | - config.navigate('dag.overwrite') { observer.overwrite = it } |
82 | | - result << observer |
| 82 | + final fileName = config.navigate('dag.file', GraphObserver.DEF_FILE_NAME) as String |
| 83 | + final overwrite = config.navigate('dag.overwrite') as Boolean |
| 84 | + |
| 85 | + result << new GraphObserver(FileHelper.asPath(fileName), overwrite) |
83 | 86 | } |
84 | 87 |
|
85 | | - /* |
86 | | - * create the execution trace observer |
87 | | - */ |
88 | | - protected void createTraceFileObserver(Collection<TraceObserver> result) { |
89 | | - Boolean isEnabled = config.navigate('trace.enabled') as Boolean |
| 88 | + protected void createTraceFileObserver(Collection<TraceObserverV2> result) { |
| 89 | + final isEnabled = config.navigate('trace.enabled') as Boolean |
90 | 90 | if( !isEnabled ) |
91 | 91 | return |
92 | 92 |
|
93 | | - String fileName = config.navigate('trace.file') |
94 | | - if( !fileName ) fileName = TraceFileObserver.DEF_FILE_NAME |
95 | | - def traceFile = (fileName as Path).complete() |
96 | | - def observer = new TraceFileObserver(traceFile) |
97 | | - config.navigate('trace.raw') { it -> observer.useRawNumbers(it == true) } |
98 | | - config.navigate('trace.sep') { observer.separator = it } |
99 | | - config.navigate('trace.fields') { observer.setFieldsAndFormats(it) } |
100 | | - config.navigate('trace.overwrite') { observer.overwrite = it } |
| 93 | + final fields = config.navigate('trace.fields', '') as String |
| 94 | + final fileName = config.navigate('trace.file', TraceFileObserver.DEF_FILE_NAME) as String |
| 95 | + final overwrite = config.navigate('trace.overwrite') as Boolean |
| 96 | + final raw = config.navigate('trace.raw') as Boolean |
| 97 | + final separator = config.navigate('trace.sep', '\t') as String |
| 98 | + |
| 99 | + final observer = new TraceFileObserver(FileHelper.asPath(fileName), overwrite, separator) |
| 100 | + observer.useRawNumbers(raw) |
| 101 | + observer.setFieldsAndFormats(fields) |
101 | 102 | result << observer |
102 | 103 | } |
103 | 104 |
|
|
0 commit comments