{"diffoscope-json-version": 1, "source1": "/input1", "source2": "/input2", "unified_diff": null, "details": [{"source1": "zipinfo {}", "source2": "zipinfo {}", "unified_diff": "@@ -1,8 +1,8 @@\n-Zip file size: 17084 bytes, number of entries: 23\n+Zip file size: 17106 bytes, number of entries: 23\n -rw-r--r-- 2.0 unx 64 b- defN 20-Apr-01 08:04 META-INF/MANIFEST.MF\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 META-INF/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 org/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 org/apache/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 org/apache/dubbo/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 org/apache/dubbo/monitor/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/\n@@ -11,15 +11,15 @@\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 META-INF/maven/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 META-INF/maven/org.apache.dubbo/\n drwxr-xr-x 2.0 unx 0 b- stor 20-Apr-01 08:04 META-INF/maven/org.apache.dubbo/dubbo-monitor-default/\n -rw-r--r-- 2.0 unx 3632 b- defN 20-Apr-01 08:04 META-INF/DEPENDENCIES\n -rw-r--r-- 2.0 unx 11358 b- defN 20-Apr-01 08:04 META-INF/LICENSE\n -rw-r--r-- 2.0 unx 178 b- defN 20-Apr-01 08:04 META-INF/NOTICE\n -rw-r--r-- 2.0 unx 9041 b- defN 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/DubboMonitor.java\n--rw-r--r-- 2.0 unx 2821 b- defN 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java\n--rw-r--r-- 2.0 unx 11086 b- defN 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/MetricsFilter.java\n+-rw-r--r-- 2.0 unx 2892 b- defN 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java\n+-rw-r--r-- 2.0 unx 11347 b- defN 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/MetricsFilter.java\n -rw-r--r-- 2.0 unx 5940 b- defN 20-Apr-01 08:04 org/apache/dubbo/monitor/dubbo/Statistics.java\n -rw-r--r-- 2.0 unx 56 b- defN 20-Apr-01 08:04 META-INF/dubbo/internal/org.apache.dubbo.monitor.MonitorFactory\n--rw-r--r-- 2.0 unx 53 b- defN 20-Apr-01 08:04 META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter\n--rw-r--r-- 2.0 unx 3183 b- defN 20-Apr-01 08:04 META-INF/maven/org.apache.dubbo/dubbo-monitor-default/pom.xml\n+-rw-r--r-- 2.0 unx 54 b- defN 20-Apr-01 08:04 META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter\n+-rw-r--r-- 2.0 unx 3100 b- defN 20-Apr-01 08:04 META-INF/maven/org.apache.dubbo/dubbo-monitor-default/pom.xml\n -rw-r--r-- 2.0 unx 76 b- defN 20-Apr-01 08:04 META-INF/maven/org.apache.dubbo/dubbo-monitor-default/pom.properties\n-23 files, 47488 bytes uncompressed, 13814 bytes compressed: 70.9%\n+23 files, 47738 bytes uncompressed, 13836 bytes compressed: 71.0%\n"}, {"source1": "zipdetails --redact --scan --utc {}", "source2": "zipdetails --redact --scan --utc {}", "unified_diff": "@@ -301,874 +301,874 @@\n 1FB7 Extract Zip Spec 14 (20) '2.0'\n 1FB8 Extract OS 00 (0) 'MS-DOS'\n 1FB9 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n 1FBB Compression Method 0008 (8) 'Deflated'\n 1FBD Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-1FC1 CRC 8FE44697 (2414102167)\n-1FC5 Compressed Size 000003FB (1019)\n-1FC9 Uncompressed Size 00000B05 (2821)\n+1FC1 CRC 4C68B52A (1281930538)\n+1FC5 Compressed Size 00000406 (1030)\n+1FC9 Uncompressed Size 00000B4C (2892)\n 1FCD Filename Length 0037 (55)\n 1FCF Extra Length 0000 (0)\n 1FD1 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n # WARNING: Offset 0x1FD1: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n 2008 PAYLOAD\n \n-2403 LOCAL HEADER #18 04034B50 (67324752)\n-2407 Extract Zip Spec 14 (20) '2.0'\n-2408 Extract OS 00 (0) 'MS-DOS'\n-2409 General Purpose Flag 0800 (2048)\n+240E LOCAL HEADER #18 04034B50 (67324752)\n+2412 Extract Zip Spec 14 (20) '2.0'\n+2413 Extract OS 00 (0) 'MS-DOS'\n+2414 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-240B Compression Method 0008 (8) 'Deflated'\n-240D Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-2411 CRC 8F262250 (2401641040)\n-2415 Compressed Size 00000B74 (2932)\n-2419 Uncompressed Size 00002B4E (11086)\n-241D Filename Length 0031 (49)\n-241F Extra Length 0000 (0)\n-2421 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+2416 Compression Method 0008 (8) 'Deflated'\n+2418 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+241C CRC 23426219 (591553049)\n+2420 Compressed Size 00000B86 (2950)\n+2424 Uncompressed Size 00002C53 (11347)\n+2428 Filename Length 0031 (49)\n+242A Extra Length 0000 (0)\n+242C Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x2421: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x242C: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-2452 PAYLOAD\n+245D PAYLOAD\n \n-2FC6 LOCAL HEADER #19 04034B50 (67324752)\n-2FCA Extract Zip Spec 14 (20) '2.0'\n-2FCB Extract OS 00 (0) 'MS-DOS'\n-2FCC General Purpose Flag 0800 (2048)\n+2FE3 LOCAL HEADER #19 04034B50 (67324752)\n+2FE7 Extract Zip Spec 14 (20) '2.0'\n+2FE8 Extract OS 00 (0) 'MS-DOS'\n+2FE9 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-2FCE Compression Method 0008 (8) 'Deflated'\n-2FD0 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-2FD4 CRC DAB7FE63 (3669491299)\n-2FD8 Compressed Size 00000592 (1426)\n-2FDC Uncompressed Size 00001734 (5940)\n-2FE0 Filename Length 002E (46)\n-2FE2 Extra Length 0000 (0)\n-2FE4 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+2FEB Compression Method 0008 (8) 'Deflated'\n+2FED Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+2FF1 CRC DAB7FE63 (3669491299)\n+2FF5 Compressed Size 00000592 (1426)\n+2FF9 Uncompressed Size 00001734 (5940)\n+2FFD Filename Length 002E (46)\n+2FFF Extra Length 0000 (0)\n+3001 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x2FE4: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3001: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-3012 PAYLOAD\n+302F PAYLOAD\n \n-35A4 LOCAL HEADER #20 04034B50 (67324752)\n-35A8 Extract Zip Spec 14 (20) '2.0'\n-35A9 Extract OS 00 (0) 'MS-DOS'\n-35AA General Purpose Flag 0800 (2048)\n+35C1 LOCAL HEADER #20 04034B50 (67324752)\n+35C5 Extract Zip Spec 14 (20) '2.0'\n+35C6 Extract OS 00 (0) 'MS-DOS'\n+35C7 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-35AC Compression Method 0008 (8) 'Deflated'\n-35AE Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-35B2 CRC 3F2B21BD (1059791293)\n-35B6 Compressed Size 0000002A (42)\n-35BA Uncompressed Size 00000038 (56)\n-35BE Filename Length 003F (63)\n-35C0 Extra Length 0000 (0)\n-35C2 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+35C9 Compression Method 0008 (8) 'Deflated'\n+35CB Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+35CF CRC 3F2B21BD (1059791293)\n+35D3 Compressed Size 0000002A (42)\n+35D7 Uncompressed Size 00000038 (56)\n+35DB Filename Length 003F (63)\n+35DD Extra Length 0000 (0)\n+35DF Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x35C2: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x35DF: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-3601 PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n+361E PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n \n-362B LOCAL HEADER #21 04034B50 (67324752)\n-362F Extract Zip Spec 14 (20) '2.0'\n-3630 Extract OS 00 (0) 'MS-DOS'\n-3631 General Purpose Flag 0800 (2048)\n+3648 LOCAL HEADER #21 04034B50 (67324752)\n+364C Extract Zip Spec 14 (20) '2.0'\n+364D Extract OS 00 (0) 'MS-DOS'\n+364E General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3633 Compression Method 0008 (8) 'Deflated'\n-3635 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3639 CRC 483B73A3 (1211855779)\n-363D Compressed Size 0000002D (45)\n-3641 Uncompressed Size 00000035 (53)\n-3645 Filename Length 0033 (51)\n-3647 Extra Length 0000 (0)\n-3649 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+3650 Compression Method 0008 (8) 'Deflated'\n+3652 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3656 CRC 32015975 (838949237)\n+365A Compressed Size 0000002E (46)\n+365E Uncompressed Size 00000036 (54)\n+3662 Filename Length 0033 (51)\n+3664 Extra Length 0000 (0)\n+3666 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3649: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3666: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-367C PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n+3699 PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n \n-36A9 LOCAL HEADER #22 04034B50 (67324752)\n-36AD Extract Zip Spec 14 (20) '2.0'\n-36AE Extract OS 00 (0) 'MS-DOS'\n-36AF General Purpose Flag 0800 (2048)\n+36C7 LOCAL HEADER #22 04034B50 (67324752)\n+36CB Extract Zip Spec 14 (20) '2.0'\n+36CC Extract OS 00 (0) 'MS-DOS'\n+36CD General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-36B1 Compression Method 0008 (8) 'Deflated'\n-36B3 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-36B7 CRC B4C3155F (3032683871)\n-36BB Compressed Size 000003E6 (998)\n-36BF Uncompressed Size 00000C6F (3183)\n-36C3 Filename Length 003D (61)\n-36C5 Extra Length 0000 (0)\n-36C7 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+36CF Compression Method 0008 (8) 'Deflated'\n+36D1 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+36D5 CRC 5192999D (1368562077)\n+36D9 Compressed Size 000003DE (990)\n+36DD Uncompressed Size 00000C1C (3100)\n+36E1 Filename Length 003D (61)\n+36E3 Extra Length 0000 (0)\n+36E5 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x36C7: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x36E5: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-3704 PAYLOAD\n+3722 PAYLOAD\n \n-3AEA LOCAL HEADER #23 04034B50 (67324752)\n-3AEE Extract Zip Spec 14 (20) '2.0'\n-3AEF Extract OS 00 (0) 'MS-DOS'\n-3AF0 General Purpose Flag 0800 (2048)\n+3B00 LOCAL HEADER #23 04034B50 (67324752)\n+3B04 Extract Zip Spec 14 (20) '2.0'\n+3B05 Extract OS 00 (0) 'MS-DOS'\n+3B06 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3AF2 Compression Method 0008 (8) 'Deflated'\n-3AF4 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3AF8 CRC 2A04AB66 (704949094)\n-3AFC Compressed Size 0000004A (74)\n-3B00 Uncompressed Size 0000004C (76)\n-3B04 Filename Length 0044 (68)\n-3B06 Extra Length 0000 (0)\n-3B08 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+3B08 Compression Method 0008 (8) 'Deflated'\n+3B0A Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3B0E CRC 2A04AB66 (704949094)\n+3B12 Compressed Size 0000004A (74)\n+3B16 Uncompressed Size 0000004C (76)\n+3B1A Filename Length 0044 (68)\n+3B1C Extra Length 0000 (0)\n+3B1E Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3B08: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3B1E: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-3B4C PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n+3B62 PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n \n-3B96 CENTRAL HEADER #1 02014B50 (33639248)\n-3B9A Created Zip Spec 14 (20) '2.0'\n-3B9B Created OS 03 (3) 'Unix'\n-3B9C Extract Zip Spec 14 (20) '2.0'\n-3B9D Extract OS 00 (0) 'MS-DOS'\n-3B9E General Purpose Flag 0800 (2048)\n+3BAC CENTRAL HEADER #1 02014B50 (33639248)\n+3BB0 Created Zip Spec 14 (20) '2.0'\n+3BB1 Created OS 03 (3) 'Unix'\n+3BB2 Extract Zip Spec 14 (20) '2.0'\n+3BB3 Extract OS 00 (0) 'MS-DOS'\n+3BB4 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3BA0 Compression Method 0008 (8) 'Deflated'\n-3BA2 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3BA6 CRC A689EB18 (2794056472)\n-3BAA Compressed Size 00000042 (66)\n-3BAE Uncompressed Size 00000040 (64)\n-3BB2 Filename Length 0014 (20)\n-3BB4 Extra Length 0000 (0)\n-3BB6 Comment Length 0000 (0)\n-3BB8 Disk Start 0000 (0)\n-3BBA Int File Attributes 0000 (0)\n+3BB6 Compression Method 0008 (8) 'Deflated'\n+3BB8 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3BBC CRC A689EB18 (2794056472)\n+3BC0 Compressed Size 00000042 (66)\n+3BC4 Uncompressed Size 00000040 (64)\n+3BC8 Filename Length 0014 (20)\n+3BCA Extra Length 0000 (0)\n+3BCC Comment Length 0000 (0)\n+3BCE Disk Start 0000 (0)\n+3BD0 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3BBC Ext File Attributes 81A40000 (2175008768)\n+3BD2 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-3BC0 Local Header Offset 00000000 (0)\n-3BC4 Filename 'XXXXXXXXXXXXXXXXXXXX'\n+3BD6 Local Header Offset 00000000 (0)\n+3BDA Filename 'XXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3BC4: Filename 'XXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3BDA: Filename 'XXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-3BD8 CENTRAL HEADER #2 02014B50 (33639248)\n-3BDC Created Zip Spec 14 (20) '2.0'\n-3BDD Created OS 03 (3) 'Unix'\n-3BDE Extract Zip Spec 0A (10) '1.0'\n-3BDF Extract OS 00 (0) 'MS-DOS'\n-3BE0 General Purpose Flag 0800 (2048)\n+3BEE CENTRAL HEADER #2 02014B50 (33639248)\n+3BF2 Created Zip Spec 14 (20) '2.0'\n+3BF3 Created OS 03 (3) 'Unix'\n+3BF4 Extract Zip Spec 0A (10) '1.0'\n+3BF5 Extract OS 00 (0) 'MS-DOS'\n+3BF6 General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3BE2 Compression Method 0000 (0) 'Stored'\n-3BE4 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3BE8 CRC 00000000 (0)\n-3BEC Compressed Size 00000000 (0)\n-3BF0 Uncompressed Size 00000000 (0)\n-3BF4 Filename Length 0009 (9)\n-3BF6 Extra Length 0000 (0)\n-3BF8 Comment Length 0000 (0)\n-3BFA Disk Start 0000 (0)\n-3BFC Int File Attributes 0000 (0)\n+3BF8 Compression Method 0000 (0) 'Stored'\n+3BFA Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3BFE CRC 00000000 (0)\n+3C02 Compressed Size 00000000 (0)\n+3C06 Uncompressed Size 00000000 (0)\n+3C0A Filename Length 0009 (9)\n+3C0C Extra Length 0000 (0)\n+3C0E Comment Length 0000 (0)\n+3C10 Disk Start 0000 (0)\n+3C12 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3BFE Ext File Attributes 41ED0010 (1106051088)\n+3C14 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3C02 Local Header Offset 00000074 (116)\n-3C06 Filename 'XXXXXXXXX'\n+3C18 Local Header Offset 00000074 (116)\n+3C1C Filename 'XXXXXXXXX'\n #\n-# WARNING: Offset 0x3C06: Filename 'XXXXXXXXX'\n+# WARNING: Offset 0x3C1C: Filename 'XXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3C06: Directory 'XXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3C1C: Directory 'XXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3BDE: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXX'\n+# WARNING: Offset 0x3BF4: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXX'\n #\n \n-3C0F CENTRAL HEADER #3 02014B50 (33639248)\n-3C13 Created Zip Spec 14 (20) '2.0'\n-3C14 Created OS 03 (3) 'Unix'\n-3C15 Extract Zip Spec 0A (10) '1.0'\n-3C16 Extract OS 00 (0) 'MS-DOS'\n-3C17 General Purpose Flag 0800 (2048)\n+3C25 CENTRAL HEADER #3 02014B50 (33639248)\n+3C29 Created Zip Spec 14 (20) '2.0'\n+3C2A Created OS 03 (3) 'Unix'\n+3C2B Extract Zip Spec 0A (10) '1.0'\n+3C2C Extract OS 00 (0) 'MS-DOS'\n+3C2D General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3C19 Compression Method 0000 (0) 'Stored'\n-3C1B Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3C1F CRC 00000000 (0)\n-3C23 Compressed Size 00000000 (0)\n-3C27 Uncompressed Size 00000000 (0)\n-3C2B Filename Length 0004 (4)\n-3C2D Extra Length 0000 (0)\n-3C2F Comment Length 0000 (0)\n-3C31 Disk Start 0000 (0)\n-3C33 Int File Attributes 0000 (0)\n+3C2F Compression Method 0000 (0) 'Stored'\n+3C31 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3C35 CRC 00000000 (0)\n+3C39 Compressed Size 00000000 (0)\n+3C3D Uncompressed Size 00000000 (0)\n+3C41 Filename Length 0004 (4)\n+3C43 Extra Length 0000 (0)\n+3C45 Comment Length 0000 (0)\n+3C47 Disk Start 0000 (0)\n+3C49 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3C35 Ext File Attributes 41ED0010 (1106051088)\n+3C4B Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3C39 Local Header Offset 0000009B (155)\n-3C3D Filename 'XXXX'\n+3C4F Local Header Offset 0000009B (155)\n+3C53 Filename 'XXXX'\n #\n-# WARNING: Offset 0x3C3D: Filename 'XXXX'\n+# WARNING: Offset 0x3C53: Filename 'XXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3C3D: Directory 'XXXX' must end in a '/'\n+# ERROR: Offset 0x3C53: Directory 'XXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3C15: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXX'\n+# WARNING: Offset 0x3C2B: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXX'\n #\n \n-3C41 CENTRAL HEADER #4 02014B50 (33639248)\n-3C45 Created Zip Spec 14 (20) '2.0'\n-3C46 Created OS 03 (3) 'Unix'\n-3C47 Extract Zip Spec 0A (10) '1.0'\n-3C48 Extract OS 00 (0) 'MS-DOS'\n-3C49 General Purpose Flag 0800 (2048)\n+3C57 CENTRAL HEADER #4 02014B50 (33639248)\n+3C5B Created Zip Spec 14 (20) '2.0'\n+3C5C Created OS 03 (3) 'Unix'\n+3C5D Extract Zip Spec 0A (10) '1.0'\n+3C5E Extract OS 00 (0) 'MS-DOS'\n+3C5F General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3C4B Compression Method 0000 (0) 'Stored'\n-3C4D Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3C51 CRC 00000000 (0)\n-3C55 Compressed Size 00000000 (0)\n-3C59 Uncompressed Size 00000000 (0)\n-3C5D Filename Length 000B (11)\n-3C5F Extra Length 0000 (0)\n-3C61 Comment Length 0000 (0)\n-3C63 Disk Start 0000 (0)\n-3C65 Int File Attributes 0000 (0)\n+3C61 Compression Method 0000 (0) 'Stored'\n+3C63 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3C67 CRC 00000000 (0)\n+3C6B Compressed Size 00000000 (0)\n+3C6F Uncompressed Size 00000000 (0)\n+3C73 Filename Length 000B (11)\n+3C75 Extra Length 0000 (0)\n+3C77 Comment Length 0000 (0)\n+3C79 Disk Start 0000 (0)\n+3C7B Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3C67 Ext File Attributes 41ED0010 (1106051088)\n+3C7D Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3C6B Local Header Offset 000000BD (189)\n-3C6F Filename 'XXXXXXXXXXX'\n+3C81 Local Header Offset 000000BD (189)\n+3C85 Filename 'XXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3C6F: Filename 'XXXXXXXXXXX'\n+# WARNING: Offset 0x3C85: Filename 'XXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3C6F: Directory 'XXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3C85: Directory 'XXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3C47: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXX'\n+# WARNING: Offset 0x3C5D: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXX'\n #\n \n-3C7A CENTRAL HEADER #5 02014B50 (33639248)\n-3C7E Created Zip Spec 14 (20) '2.0'\n-3C7F Created OS 03 (3) 'Unix'\n-3C80 Extract Zip Spec 0A (10) '1.0'\n-3C81 Extract OS 00 (0) 'MS-DOS'\n-3C82 General Purpose Flag 0800 (2048)\n+3C90 CENTRAL HEADER #5 02014B50 (33639248)\n+3C94 Created Zip Spec 14 (20) '2.0'\n+3C95 Created OS 03 (3) 'Unix'\n+3C96 Extract Zip Spec 0A (10) '1.0'\n+3C97 Extract OS 00 (0) 'MS-DOS'\n+3C98 General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3C84 Compression Method 0000 (0) 'Stored'\n-3C86 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3C8A CRC 00000000 (0)\n-3C8E Compressed Size 00000000 (0)\n-3C92 Uncompressed Size 00000000 (0)\n-3C96 Filename Length 0011 (17)\n-3C98 Extra Length 0000 (0)\n-3C9A Comment Length 0000 (0)\n-3C9C Disk Start 0000 (0)\n-3C9E Int File Attributes 0000 (0)\n+3C9A Compression Method 0000 (0) 'Stored'\n+3C9C Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3CA0 CRC 00000000 (0)\n+3CA4 Compressed Size 00000000 (0)\n+3CA8 Uncompressed Size 00000000 (0)\n+3CAC Filename Length 0011 (17)\n+3CAE Extra Length 0000 (0)\n+3CB0 Comment Length 0000 (0)\n+3CB2 Disk Start 0000 (0)\n+3CB4 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3CA0 Ext File Attributes 41ED0010 (1106051088)\n+3CB6 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3CA4 Local Header Offset 000000E6 (230)\n-3CA8 Filename 'XXXXXXXXXXXXXXXXX'\n+3CBA Local Header Offset 000000E6 (230)\n+3CBE Filename 'XXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3CA8: Filename 'XXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3CBE: Filename 'XXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3CA8: Directory 'XXXXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3CBE: Directory 'XXXXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3C80: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3C96: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXX'\n #\n \n-3CB9 CENTRAL HEADER #6 02014B50 (33639248)\n-3CBD Created Zip Spec 14 (20) '2.0'\n-3CBE Created OS 03 (3) 'Unix'\n-3CBF Extract Zip Spec 0A (10) '1.0'\n-3CC0 Extract OS 00 (0) 'MS-DOS'\n-3CC1 General Purpose Flag 0800 (2048)\n+3CCF CENTRAL HEADER #6 02014B50 (33639248)\n+3CD3 Created Zip Spec 14 (20) '2.0'\n+3CD4 Created OS 03 (3) 'Unix'\n+3CD5 Extract Zip Spec 0A (10) '1.0'\n+3CD6 Extract OS 00 (0) 'MS-DOS'\n+3CD7 General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3CC3 Compression Method 0000 (0) 'Stored'\n-3CC5 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3CC9 CRC 00000000 (0)\n-3CCD Compressed Size 00000000 (0)\n-3CD1 Uncompressed Size 00000000 (0)\n-3CD5 Filename Length 0019 (25)\n-3CD7 Extra Length 0000 (0)\n-3CD9 Comment Length 0000 (0)\n-3CDB Disk Start 0000 (0)\n-3CDD Int File Attributes 0000 (0)\n+3CD9 Compression Method 0000 (0) 'Stored'\n+3CDB Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3CDF CRC 00000000 (0)\n+3CE3 Compressed Size 00000000 (0)\n+3CE7 Uncompressed Size 00000000 (0)\n+3CEB Filename Length 0019 (25)\n+3CED Extra Length 0000 (0)\n+3CEF Comment Length 0000 (0)\n+3CF1 Disk Start 0000 (0)\n+3CF3 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3CDF Ext File Attributes 41ED0010 (1106051088)\n+3CF5 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3CE3 Local Header Offset 00000115 (277)\n-3CE7 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXX'\n+3CF9 Local Header Offset 00000115 (277)\n+3CFD Filename 'XXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3CE7: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3CFD: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3CE7: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3CFD: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3CBF: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3CD5: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n \n-3D00 CENTRAL HEADER #7 02014B50 (33639248)\n-3D04 Created Zip Spec 14 (20) '2.0'\n-3D05 Created OS 03 (3) 'Unix'\n-3D06 Extract Zip Spec 0A (10) '1.0'\n-3D07 Extract OS 00 (0) 'MS-DOS'\n-3D08 General Purpose Flag 0800 (2048)\n+3D16 CENTRAL HEADER #7 02014B50 (33639248)\n+3D1A Created Zip Spec 14 (20) '2.0'\n+3D1B Created OS 03 (3) 'Unix'\n+3D1C Extract Zip Spec 0A (10) '1.0'\n+3D1D Extract OS 00 (0) 'MS-DOS'\n+3D1E General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3D0A Compression Method 0000 (0) 'Stored'\n-3D0C Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3D10 CRC 00000000 (0)\n-3D14 Compressed Size 00000000 (0)\n-3D18 Uncompressed Size 00000000 (0)\n-3D1C Filename Length 001F (31)\n-3D1E Extra Length 0000 (0)\n-3D20 Comment Length 0000 (0)\n-3D22 Disk Start 0000 (0)\n-3D24 Int File Attributes 0000 (0)\n+3D20 Compression Method 0000 (0) 'Stored'\n+3D22 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3D26 CRC 00000000 (0)\n+3D2A Compressed Size 00000000 (0)\n+3D2E Uncompressed Size 00000000 (0)\n+3D32 Filename Length 001F (31)\n+3D34 Extra Length 0000 (0)\n+3D36 Comment Length 0000 (0)\n+3D38 Disk Start 0000 (0)\n+3D3A Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3D26 Ext File Attributes 41ED0010 (1106051088)\n+3D3C Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3D2A Local Header Offset 0000014C (332)\n-3D2E Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+3D40 Local Header Offset 0000014C (332)\n+3D44 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3D2E: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3D44: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3D2E: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3D44: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3D06: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3D1C: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n \n-3D4D CENTRAL HEADER #8 02014B50 (33639248)\n-3D51 Created Zip Spec 14 (20) '2.0'\n-3D52 Created OS 03 (3) 'Unix'\n-3D53 Extract Zip Spec 0A (10) '1.0'\n-3D54 Extract OS 00 (0) 'MS-DOS'\n-3D55 General Purpose Flag 0800 (2048)\n+3D63 CENTRAL HEADER #8 02014B50 (33639248)\n+3D67 Created Zip Spec 14 (20) '2.0'\n+3D68 Created OS 03 (3) 'Unix'\n+3D69 Extract Zip Spec 0A (10) '1.0'\n+3D6A Extract OS 00 (0) 'MS-DOS'\n+3D6B General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3D57 Compression Method 0000 (0) 'Stored'\n-3D59 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3D5D CRC 00000000 (0)\n-3D61 Compressed Size 00000000 (0)\n-3D65 Uncompressed Size 00000000 (0)\n-3D69 Filename Length 000F (15)\n-3D6B Extra Length 0000 (0)\n-3D6D Comment Length 0000 (0)\n-3D6F Disk Start 0000 (0)\n-3D71 Int File Attributes 0000 (0)\n+3D6D Compression Method 0000 (0) 'Stored'\n+3D6F Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3D73 CRC 00000000 (0)\n+3D77 Compressed Size 00000000 (0)\n+3D7B Uncompressed Size 00000000 (0)\n+3D7F Filename Length 000F (15)\n+3D81 Extra Length 0000 (0)\n+3D83 Comment Length 0000 (0)\n+3D85 Disk Start 0000 (0)\n+3D87 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3D73 Ext File Attributes 41ED0010 (1106051088)\n+3D89 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3D77 Local Header Offset 00000189 (393)\n-3D7B Filename 'XXXXXXXXXXXXXXX'\n+3D8D Local Header Offset 00000189 (393)\n+3D91 Filename 'XXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3D7B: Filename 'XXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3D91: Filename 'XXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3D7B: Directory 'XXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3D91: Directory 'XXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3D53: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3D69: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXX'\n #\n \n-3D8A CENTRAL HEADER #9 02014B50 (33639248)\n-3D8E Created Zip Spec 14 (20) '2.0'\n-3D8F Created OS 03 (3) 'Unix'\n-3D90 Extract Zip Spec 0A (10) '1.0'\n-3D91 Extract OS 00 (0) 'MS-DOS'\n-3D92 General Purpose Flag 0800 (2048)\n+3DA0 CENTRAL HEADER #9 02014B50 (33639248)\n+3DA4 Created Zip Spec 14 (20) '2.0'\n+3DA5 Created OS 03 (3) 'Unix'\n+3DA6 Extract Zip Spec 0A (10) '1.0'\n+3DA7 Extract OS 00 (0) 'MS-DOS'\n+3DA8 General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3D94 Compression Method 0000 (0) 'Stored'\n-3D96 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3D9A CRC 00000000 (0)\n-3D9E Compressed Size 00000000 (0)\n-3DA2 Uncompressed Size 00000000 (0)\n-3DA6 Filename Length 0018 (24)\n-3DA8 Extra Length 0000 (0)\n-3DAA Comment Length 0000 (0)\n-3DAC Disk Start 0000 (0)\n-3DAE Int File Attributes 0000 (0)\n+3DAA Compression Method 0000 (0) 'Stored'\n+3DAC Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3DB0 CRC 00000000 (0)\n+3DB4 Compressed Size 00000000 (0)\n+3DB8 Uncompressed Size 00000000 (0)\n+3DBC Filename Length 0018 (24)\n+3DBE Extra Length 0000 (0)\n+3DC0 Comment Length 0000 (0)\n+3DC2 Disk Start 0000 (0)\n+3DC4 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3DB0 Ext File Attributes 41ED0010 (1106051088)\n+3DC6 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3DB4 Local Header Offset 000001B6 (438)\n-3DB8 Filename 'XXXXXXXXXXXXXXXXXXXXXXXX'\n+3DCA Local Header Offset 000001B6 (438)\n+3DCE Filename 'XXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3DB8: Filename 'XXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3DCE: Filename 'XXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3DB8: Directory 'XXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3DCE: Directory 'XXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3D90: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3DA6: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXX'\n #\n \n-3DD0 CENTRAL HEADER #10 02014B50 (33639248)\n-3DD4 Created Zip Spec 14 (20) '2.0'\n-3DD5 Created OS 03 (3) 'Unix'\n-3DD6 Extract Zip Spec 0A (10) '1.0'\n-3DD7 Extract OS 00 (0) 'MS-DOS'\n-3DD8 General Purpose Flag 0800 (2048)\n+3DE6 CENTRAL HEADER #10 02014B50 (33639248)\n+3DEA Created Zip Spec 14 (20) '2.0'\n+3DEB Created OS 03 (3) 'Unix'\n+3DEC Extract Zip Spec 0A (10) '1.0'\n+3DED Extract OS 00 (0) 'MS-DOS'\n+3DEE General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3DDA Compression Method 0000 (0) 'Stored'\n-3DDC Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3DE0 CRC 00000000 (0)\n-3DE4 Compressed Size 00000000 (0)\n-3DE8 Uncompressed Size 00000000 (0)\n-3DEC Filename Length 000F (15)\n-3DEE Extra Length 0000 (0)\n-3DF0 Comment Length 0000 (0)\n-3DF2 Disk Start 0000 (0)\n-3DF4 Int File Attributes 0000 (0)\n+3DF0 Compression Method 0000 (0) 'Stored'\n+3DF2 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3DF6 CRC 00000000 (0)\n+3DFA Compressed Size 00000000 (0)\n+3DFE Uncompressed Size 00000000 (0)\n+3E02 Filename Length 000F (15)\n+3E04 Extra Length 0000 (0)\n+3E06 Comment Length 0000 (0)\n+3E08 Disk Start 0000 (0)\n+3E0A Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3DF6 Ext File Attributes 41ED0010 (1106051088)\n+3E0C Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3DFA Local Header Offset 000001EC (492)\n-3DFE Filename 'XXXXXXXXXXXXXXX'\n+3E10 Local Header Offset 000001EC (492)\n+3E14 Filename 'XXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3DFE: Filename 'XXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3E14: Filename 'XXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3DFE: Directory 'XXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3E14: Directory 'XXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3DD6: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3DEC: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXX'\n #\n \n-3E0D CENTRAL HEADER #11 02014B50 (33639248)\n-3E11 Created Zip Spec 14 (20) '2.0'\n-3E12 Created OS 03 (3) 'Unix'\n-3E13 Extract Zip Spec 0A (10) '1.0'\n-3E14 Extract OS 00 (0) 'MS-DOS'\n-3E15 General Purpose Flag 0800 (2048)\n+3E23 CENTRAL HEADER #11 02014B50 (33639248)\n+3E27 Created Zip Spec 14 (20) '2.0'\n+3E28 Created OS 03 (3) 'Unix'\n+3E29 Extract Zip Spec 0A (10) '1.0'\n+3E2A Extract OS 00 (0) 'MS-DOS'\n+3E2B General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3E17 Compression Method 0000 (0) 'Stored'\n-3E19 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3E1D CRC 00000000 (0)\n-3E21 Compressed Size 00000000 (0)\n-3E25 Uncompressed Size 00000000 (0)\n-3E29 Filename Length 0020 (32)\n-3E2B Extra Length 0000 (0)\n-3E2D Comment Length 0000 (0)\n-3E2F Disk Start 0000 (0)\n-3E31 Int File Attributes 0000 (0)\n+3E2D Compression Method 0000 (0) 'Stored'\n+3E2F Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3E33 CRC 00000000 (0)\n+3E37 Compressed Size 00000000 (0)\n+3E3B Uncompressed Size 00000000 (0)\n+3E3F Filename Length 0020 (32)\n+3E41 Extra Length 0000 (0)\n+3E43 Comment Length 0000 (0)\n+3E45 Disk Start 0000 (0)\n+3E47 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3E33 Ext File Attributes 41ED0010 (1106051088)\n+3E49 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3E37 Local Header Offset 00000219 (537)\n-3E3B Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+3E4D Local Header Offset 00000219 (537)\n+3E51 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3E3B: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3E51: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3E3B: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3E51: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3E13: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3E29: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n \n-3E5B CENTRAL HEADER #12 02014B50 (33639248)\n-3E5F Created Zip Spec 14 (20) '2.0'\n-3E60 Created OS 03 (3) 'Unix'\n-3E61 Extract Zip Spec 0A (10) '1.0'\n-3E62 Extract OS 00 (0) 'MS-DOS'\n-3E63 General Purpose Flag 0800 (2048)\n+3E71 CENTRAL HEADER #12 02014B50 (33639248)\n+3E75 Created Zip Spec 14 (20) '2.0'\n+3E76 Created OS 03 (3) 'Unix'\n+3E77 Extract Zip Spec 0A (10) '1.0'\n+3E78 Extract OS 00 (0) 'MS-DOS'\n+3E79 General Purpose Flag 0800 (2048)\n [Bit 11] 1 'Language Encoding'\n-3E65 Compression Method 0000 (0) 'Stored'\n-3E67 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3E6B CRC 00000000 (0)\n-3E6F Compressed Size 00000000 (0)\n-3E73 Uncompressed Size 00000000 (0)\n-3E77 Filename Length 0036 (54)\n-3E79 Extra Length 0000 (0)\n-3E7B Comment Length 0000 (0)\n-3E7D Disk Start 0000 (0)\n-3E7F Int File Attributes 0000 (0)\n+3E7B Compression Method 0000 (0) 'Stored'\n+3E7D Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3E81 CRC 00000000 (0)\n+3E85 Compressed Size 00000000 (0)\n+3E89 Uncompressed Size 00000000 (0)\n+3E8D Filename Length 0036 (54)\n+3E8F Extra Length 0000 (0)\n+3E91 Comment Length 0000 (0)\n+3E93 Disk Start 0000 (0)\n+3E95 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3E81 Ext File Attributes 41ED0010 (1106051088)\n+3E97 Ext File Attributes 41ED0010 (1106051088)\n [Bit 4] Directory\n [Bits 16-24] 01ED (493) 'Unix attrib: rwxr-xr-x'\n [Bits 28-31] 04 (4) 'Directory'\n-3E85 Local Header Offset 00000257 (599)\n-3E89 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+3E9B Local Header Offset 00000257 (599)\n+3E9F Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3E89: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3E9F: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n-# ERROR: Offset 0x3E89: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n+# ERROR: Offset 0x3E9F: Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' must end in a '/'\n # 'External Attributes' flag this as a directory\n #\n-# WARNING: Offset 0x3E61: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3E77: 'Extract Zip Spec' is '1.0'. Need value >= '2.0' for Directory 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n \n-3EBF CENTRAL HEADER #13 02014B50 (33639248)\n-3EC3 Created Zip Spec 14 (20) '2.0'\n-3EC4 Created OS 03 (3) 'Unix'\n-3EC5 Extract Zip Spec 14 (20) '2.0'\n-3EC6 Extract OS 00 (0) 'MS-DOS'\n-3EC7 General Purpose Flag 0800 (2048)\n+3ED5 CENTRAL HEADER #13 02014B50 (33639248)\n+3ED9 Created Zip Spec 14 (20) '2.0'\n+3EDA Created OS 03 (3) 'Unix'\n+3EDB Extract Zip Spec 14 (20) '2.0'\n+3EDC Extract OS 00 (0) 'MS-DOS'\n+3EDD General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3EC9 Compression Method 0008 (8) 'Deflated'\n-3ECB Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3ECF CRC 963A6924 (2520410404)\n-3ED3 Compressed Size 00000336 (822)\n-3ED7 Uncompressed Size 00000E30 (3632)\n-3EDB Filename Length 0015 (21)\n-3EDD Extra Length 0000 (0)\n-3EDF Comment Length 0000 (0)\n-3EE1 Disk Start 0000 (0)\n-3EE3 Int File Attributes 0000 (0)\n+3EDF Compression Method 0008 (8) 'Deflated'\n+3EE1 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3EE5 CRC 963A6924 (2520410404)\n+3EE9 Compressed Size 00000336 (822)\n+3EED Uncompressed Size 00000E30 (3632)\n+3EF1 Filename Length 0015 (21)\n+3EF3 Extra Length 0000 (0)\n+3EF5 Comment Length 0000 (0)\n+3EF7 Disk Start 0000 (0)\n+3EF9 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3EE5 Ext File Attributes 81A40000 (2175008768)\n+3EFB Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-3EE9 Local Header Offset 000002AB (683)\n-3EED Filename 'XXXXXXXXXXXXXXXXXXXXX'\n+3EFF Local Header Offset 000002AB (683)\n+3F03 Filename 'XXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3EED: Filename 'XXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3F03: Filename 'XXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-3F02 CENTRAL HEADER #14 02014B50 (33639248)\n-3F06 Created Zip Spec 14 (20) '2.0'\n-3F07 Created OS 03 (3) 'Unix'\n-3F08 Extract Zip Spec 14 (20) '2.0'\n-3F09 Extract OS 00 (0) 'MS-DOS'\n-3F0A General Purpose Flag 0800 (2048)\n+3F18 CENTRAL HEADER #14 02014B50 (33639248)\n+3F1C Created Zip Spec 14 (20) '2.0'\n+3F1D Created OS 03 (3) 'Unix'\n+3F1E Extract Zip Spec 14 (20) '2.0'\n+3F1F Extract OS 00 (0) 'MS-DOS'\n+3F20 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3F0C Compression Method 0008 (8) 'Deflated'\n-3F0E Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3F12 CRC 86E2B4B4 (2263004340)\n-3F16 Compressed Size 00000F6D (3949)\n-3F1A Uncompressed Size 00002C5E (11358)\n-3F1E Filename Length 0010 (16)\n-3F20 Extra Length 0000 (0)\n-3F22 Comment Length 0000 (0)\n-3F24 Disk Start 0000 (0)\n-3F26 Int File Attributes 0000 (0)\n+3F22 Compression Method 0008 (8) 'Deflated'\n+3F24 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3F28 CRC 86E2B4B4 (2263004340)\n+3F2C Compressed Size 00000F6D (3949)\n+3F30 Uncompressed Size 00002C5E (11358)\n+3F34 Filename Length 0010 (16)\n+3F36 Extra Length 0000 (0)\n+3F38 Comment Length 0000 (0)\n+3F3A Disk Start 0000 (0)\n+3F3C Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3F28 Ext File Attributes 81A40000 (2175008768)\n+3F3E Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-3F2C Local Header Offset 00000614 (1556)\n-3F30 Filename 'XXXXXXXXXXXXXXXX'\n+3F42 Local Header Offset 00000614 (1556)\n+3F46 Filename 'XXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3F30: Filename 'XXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3F46: Filename 'XXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-3F40 CENTRAL HEADER #15 02014B50 (33639248)\n-3F44 Created Zip Spec 14 (20) '2.0'\n-3F45 Created OS 03 (3) 'Unix'\n-3F46 Extract Zip Spec 14 (20) '2.0'\n-3F47 Extract OS 00 (0) 'MS-DOS'\n-3F48 General Purpose Flag 0800 (2048)\n+3F56 CENTRAL HEADER #15 02014B50 (33639248)\n+3F5A Created Zip Spec 14 (20) '2.0'\n+3F5B Created OS 03 (3) 'Unix'\n+3F5C Extract Zip Spec 14 (20) '2.0'\n+3F5D Extract OS 00 (0) 'MS-DOS'\n+3F5E General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3F4A Compression Method 0008 (8) 'Deflated'\n-3F4C Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3F50 CRC 6215C8C5 (1645594821)\n-3F54 Compressed Size 00000082 (130)\n-3F58 Uncompressed Size 000000B2 (178)\n-3F5C Filename Length 000F (15)\n-3F5E Extra Length 0000 (0)\n-3F60 Comment Length 0000 (0)\n-3F62 Disk Start 0000 (0)\n-3F64 Int File Attributes 0000 (0)\n+3F60 Compression Method 0008 (8) 'Deflated'\n+3F62 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3F66 CRC 6215C8C5 (1645594821)\n+3F6A Compressed Size 00000082 (130)\n+3F6E Uncompressed Size 000000B2 (178)\n+3F72 Filename Length 000F (15)\n+3F74 Extra Length 0000 (0)\n+3F76 Comment Length 0000 (0)\n+3F78 Disk Start 0000 (0)\n+3F7A Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3F66 Ext File Attributes 81A40000 (2175008768)\n+3F7C Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-3F6A Local Header Offset 000015AF (5551)\n-3F6E Filename 'XXXXXXXXXXXXXXX'\n+3F80 Local Header Offset 000015AF (5551)\n+3F84 Filename 'XXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3F6E: Filename 'XXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3F84: Filename 'XXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-3F7D CENTRAL HEADER #16 02014B50 (33639248)\n-3F81 Created Zip Spec 14 (20) '2.0'\n-3F82 Created OS 03 (3) 'Unix'\n-3F83 Extract Zip Spec 14 (20) '2.0'\n-3F84 Extract OS 00 (0) 'MS-DOS'\n-3F85 General Purpose Flag 0800 (2048)\n+3F93 CENTRAL HEADER #16 02014B50 (33639248)\n+3F97 Created Zip Spec 14 (20) '2.0'\n+3F98 Created OS 03 (3) 'Unix'\n+3F99 Extract Zip Spec 14 (20) '2.0'\n+3F9A Extract OS 00 (0) 'MS-DOS'\n+3F9B General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3F87 Compression Method 0008 (8) 'Deflated'\n-3F89 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3F8D CRC EA5FE743 (3932153667)\n-3F91 Compressed Size 00000907 (2311)\n-3F95 Uncompressed Size 00002351 (9041)\n-3F99 Filename Length 0030 (48)\n-3F9B Extra Length 0000 (0)\n-3F9D Comment Length 0000 (0)\n-3F9F Disk Start 0000 (0)\n-3FA1 Int File Attributes 0000 (0)\n+3F9D Compression Method 0008 (8) 'Deflated'\n+3F9F Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+3FA3 CRC EA5FE743 (3932153667)\n+3FA7 Compressed Size 00000907 (2311)\n+3FAB Uncompressed Size 00002351 (9041)\n+3FAF Filename Length 0030 (48)\n+3FB1 Extra Length 0000 (0)\n+3FB3 Comment Length 0000 (0)\n+3FB5 Disk Start 0000 (0)\n+3FB7 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-3FA3 Ext File Attributes 81A40000 (2175008768)\n+3FB9 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-3FA7 Local Header Offset 0000165E (5726)\n-3FAB Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+3FBD Local Header Offset 0000165E (5726)\n+3FC1 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x3FAB: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x3FC1: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-3FDB CENTRAL HEADER #17 02014B50 (33639248)\n-3FDF Created Zip Spec 14 (20) '2.0'\n-3FE0 Created OS 03 (3) 'Unix'\n-3FE1 Extract Zip Spec 14 (20) '2.0'\n-3FE2 Extract OS 00 (0) 'MS-DOS'\n-3FE3 General Purpose Flag 0800 (2048)\n+3FF1 CENTRAL HEADER #17 02014B50 (33639248)\n+3FF5 Created Zip Spec 14 (20) '2.0'\n+3FF6 Created OS 03 (3) 'Unix'\n+3FF7 Extract Zip Spec 14 (20) '2.0'\n+3FF8 Extract OS 00 (0) 'MS-DOS'\n+3FF9 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-3FE5 Compression Method 0008 (8) 'Deflated'\n-3FE7 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-3FEB CRC 8FE44697 (2414102167)\n-3FEF Compressed Size 000003FB (1019)\n-3FF3 Uncompressed Size 00000B05 (2821)\n-3FF7 Filename Length 0037 (55)\n-3FF9 Extra Length 0000 (0)\n-3FFB Comment Length 0000 (0)\n-3FFD Disk Start 0000 (0)\n-3FFF Int File Attributes 0000 (0)\n+3FFB Compression Method 0008 (8) 'Deflated'\n+3FFD Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+4001 CRC 4C68B52A (1281930538)\n+4005 Compressed Size 00000406 (1030)\n+4009 Uncompressed Size 00000B4C (2892)\n+400D Filename Length 0037 (55)\n+400F Extra Length 0000 (0)\n+4011 Comment Length 0000 (0)\n+4013 Disk Start 0000 (0)\n+4015 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-4001 Ext File Attributes 81A40000 (2175008768)\n+4017 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-4005 Local Header Offset 00001FB3 (8115)\n-4009 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+401B Local Header Offset 00001FB3 (8115)\n+401F Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x4009: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x401F: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-4040 CENTRAL HEADER #18 02014B50 (33639248)\n-4044 Created Zip Spec 14 (20) '2.0'\n-4045 Created OS 03 (3) 'Unix'\n-4046 Extract Zip Spec 14 (20) '2.0'\n-4047 Extract OS 00 (0) 'MS-DOS'\n-4048 General Purpose Flag 0800 (2048)\n+4056 CENTRAL HEADER #18 02014B50 (33639248)\n+405A Created Zip Spec 14 (20) '2.0'\n+405B Created OS 03 (3) 'Unix'\n+405C Extract Zip Spec 14 (20) '2.0'\n+405D Extract OS 00 (0) 'MS-DOS'\n+405E General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-404A Compression Method 0008 (8) 'Deflated'\n-404C Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-4050 CRC 8F262250 (2401641040)\n-4054 Compressed Size 00000B74 (2932)\n-4058 Uncompressed Size 00002B4E (11086)\n-405C Filename Length 0031 (49)\n-405E Extra Length 0000 (0)\n-4060 Comment Length 0000 (0)\n-4062 Disk Start 0000 (0)\n-4064 Int File Attributes 0000 (0)\n+4060 Compression Method 0008 (8) 'Deflated'\n+4062 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+4066 CRC 23426219 (591553049)\n+406A Compressed Size 00000B86 (2950)\n+406E Uncompressed Size 00002C53 (11347)\n+4072 Filename Length 0031 (49)\n+4074 Extra Length 0000 (0)\n+4076 Comment Length 0000 (0)\n+4078 Disk Start 0000 (0)\n+407A Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-4066 Ext File Attributes 81A40000 (2175008768)\n+407C Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-406A Local Header Offset 00002403 (9219)\n-406E Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+4080 Local Header Offset 0000240E (9230)\n+4084 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x406E: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x4084: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-409F CENTRAL HEADER #19 02014B50 (33639248)\n-40A3 Created Zip Spec 14 (20) '2.0'\n-40A4 Created OS 03 (3) 'Unix'\n-40A5 Extract Zip Spec 14 (20) '2.0'\n-40A6 Extract OS 00 (0) 'MS-DOS'\n-40A7 General Purpose Flag 0800 (2048)\n+40B5 CENTRAL HEADER #19 02014B50 (33639248)\n+40B9 Created Zip Spec 14 (20) '2.0'\n+40BA Created OS 03 (3) 'Unix'\n+40BB Extract Zip Spec 14 (20) '2.0'\n+40BC Extract OS 00 (0) 'MS-DOS'\n+40BD General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-40A9 Compression Method 0008 (8) 'Deflated'\n-40AB Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-40AF CRC DAB7FE63 (3669491299)\n-40B3 Compressed Size 00000592 (1426)\n-40B7 Uncompressed Size 00001734 (5940)\n-40BB Filename Length 002E (46)\n-40BD Extra Length 0000 (0)\n-40BF Comment Length 0000 (0)\n-40C1 Disk Start 0000 (0)\n-40C3 Int File Attributes 0000 (0)\n+40BF Compression Method 0008 (8) 'Deflated'\n+40C1 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+40C5 CRC DAB7FE63 (3669491299)\n+40C9 Compressed Size 00000592 (1426)\n+40CD Uncompressed Size 00001734 (5940)\n+40D1 Filename Length 002E (46)\n+40D3 Extra Length 0000 (0)\n+40D5 Comment Length 0000 (0)\n+40D7 Disk Start 0000 (0)\n+40D9 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-40C5 Ext File Attributes 81A40000 (2175008768)\n+40DB Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-40C9 Local Header Offset 00002FC6 (12230)\n-40CD Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+40DF Local Header Offset 00002FE3 (12259)\n+40E3 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x40CD: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x40E3: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-40FB CENTRAL HEADER #20 02014B50 (33639248)\n-40FF Created Zip Spec 14 (20) '2.0'\n-4100 Created OS 03 (3) 'Unix'\n-4101 Extract Zip Spec 14 (20) '2.0'\n-4102 Extract OS 00 (0) 'MS-DOS'\n-4103 General Purpose Flag 0800 (2048)\n+4111 CENTRAL HEADER #20 02014B50 (33639248)\n+4115 Created Zip Spec 14 (20) '2.0'\n+4116 Created OS 03 (3) 'Unix'\n+4117 Extract Zip Spec 14 (20) '2.0'\n+4118 Extract OS 00 (0) 'MS-DOS'\n+4119 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-4105 Compression Method 0008 (8) 'Deflated'\n-4107 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-410B CRC 3F2B21BD (1059791293)\n-410F Compressed Size 0000002A (42)\n-4113 Uncompressed Size 00000038 (56)\n-4117 Filename Length 003F (63)\n-4119 Extra Length 0000 (0)\n-411B Comment Length 0000 (0)\n-411D Disk Start 0000 (0)\n-411F Int File Attributes 0000 (0)\n+411B Compression Method 0008 (8) 'Deflated'\n+411D Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+4121 CRC 3F2B21BD (1059791293)\n+4125 Compressed Size 0000002A (42)\n+4129 Uncompressed Size 00000038 (56)\n+412D Filename Length 003F (63)\n+412F Extra Length 0000 (0)\n+4131 Comment Length 0000 (0)\n+4133 Disk Start 0000 (0)\n+4135 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-4121 Ext File Attributes 81A40000 (2175008768)\n+4137 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-4125 Local Header Offset 000035A4 (13732)\n-4129 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+413B Local Header Offset 000035C1 (13761)\n+413F Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x4129: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x413F: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-4168 CENTRAL HEADER #21 02014B50 (33639248)\n-416C Created Zip Spec 14 (20) '2.0'\n-416D Created OS 03 (3) 'Unix'\n-416E Extract Zip Spec 14 (20) '2.0'\n-416F Extract OS 00 (0) 'MS-DOS'\n-4170 General Purpose Flag 0800 (2048)\n+417E CENTRAL HEADER #21 02014B50 (33639248)\n+4182 Created Zip Spec 14 (20) '2.0'\n+4183 Created OS 03 (3) 'Unix'\n+4184 Extract Zip Spec 14 (20) '2.0'\n+4185 Extract OS 00 (0) 'MS-DOS'\n+4186 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-4172 Compression Method 0008 (8) 'Deflated'\n-4174 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-4178 CRC 483B73A3 (1211855779)\n-417C Compressed Size 0000002D (45)\n-4180 Uncompressed Size 00000035 (53)\n-4184 Filename Length 0033 (51)\n-4186 Extra Length 0000 (0)\n-4188 Comment Length 0000 (0)\n-418A Disk Start 0000 (0)\n-418C Int File Attributes 0000 (0)\n+4188 Compression Method 0008 (8) 'Deflated'\n+418A Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+418E CRC 32015975 (838949237)\n+4192 Compressed Size 0000002E (46)\n+4196 Uncompressed Size 00000036 (54)\n+419A Filename Length 0033 (51)\n+419C Extra Length 0000 (0)\n+419E Comment Length 0000 (0)\n+41A0 Disk Start 0000 (0)\n+41A2 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-418E Ext File Attributes 81A40000 (2175008768)\n+41A4 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-4192 Local Header Offset 0000362B (13867)\n-4196 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+41A8 Local Header Offset 00003648 (13896)\n+41AC Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x4196: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x41AC: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-41C9 CENTRAL HEADER #22 02014B50 (33639248)\n-41CD Created Zip Spec 14 (20) '2.0'\n-41CE Created OS 03 (3) 'Unix'\n-41CF Extract Zip Spec 14 (20) '2.0'\n-41D0 Extract OS 00 (0) 'MS-DOS'\n-41D1 General Purpose Flag 0800 (2048)\n+41DF CENTRAL HEADER #22 02014B50 (33639248)\n+41E3 Created Zip Spec 14 (20) '2.0'\n+41E4 Created OS 03 (3) 'Unix'\n+41E5 Extract Zip Spec 14 (20) '2.0'\n+41E6 Extract OS 00 (0) 'MS-DOS'\n+41E7 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-41D3 Compression Method 0008 (8) 'Deflated'\n-41D5 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-41D9 CRC B4C3155F (3032683871)\n-41DD Compressed Size 000003E6 (998)\n-41E1 Uncompressed Size 00000C6F (3183)\n-41E5 Filename Length 003D (61)\n-41E7 Extra Length 0000 (0)\n-41E9 Comment Length 0000 (0)\n-41EB Disk Start 0000 (0)\n-41ED Int File Attributes 0000 (0)\n+41E9 Compression Method 0008 (8) 'Deflated'\n+41EB Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+41EF CRC 5192999D (1368562077)\n+41F3 Compressed Size 000003DE (990)\n+41F7 Uncompressed Size 00000C1C (3100)\n+41FB Filename Length 003D (61)\n+41FD Extra Length 0000 (0)\n+41FF Comment Length 0000 (0)\n+4201 Disk Start 0000 (0)\n+4203 Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-41EF Ext File Attributes 81A40000 (2175008768)\n+4205 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-41F3 Local Header Offset 000036A9 (13993)\n-41F7 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+4209 Local Header Offset 000036C7 (14023)\n+420D Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x41F7: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x420D: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-4234 CENTRAL HEADER #23 02014B50 (33639248)\n-4238 Created Zip Spec 14 (20) '2.0'\n-4239 Created OS 03 (3) 'Unix'\n-423A Extract Zip Spec 14 (20) '2.0'\n-423B Extract OS 00 (0) 'MS-DOS'\n-423C General Purpose Flag 0800 (2048)\n+424A CENTRAL HEADER #23 02014B50 (33639248)\n+424E Created Zip Spec 14 (20) '2.0'\n+424F Created OS 03 (3) 'Unix'\n+4250 Extract Zip Spec 14 (20) '2.0'\n+4251 Extract OS 00 (0) 'MS-DOS'\n+4252 General Purpose Flag 0800 (2048)\n [Bits 1-2] 0 'Normal Compression'\n [Bit 11] 1 'Language Encoding'\n-423E Compression Method 0008 (8) 'Deflated'\n-4240 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n-4244 CRC 2A04AB66 (704949094)\n-4248 Compressed Size 0000004A (74)\n-424C Uncompressed Size 0000004C (76)\n-4250 Filename Length 0044 (68)\n-4252 Extra Length 0000 (0)\n-4254 Comment Length 0000 (0)\n-4256 Disk Start 0000 (0)\n-4258 Int File Attributes 0000 (0)\n+4254 Compression Method 0008 (8) 'Deflated'\n+4256 Modification Time 50814080 (1350647936) 'Wed Apr 1 08:04:00 2020'\n+425A CRC 2A04AB66 (704949094)\n+425E Compressed Size 0000004A (74)\n+4262 Uncompressed Size 0000004C (76)\n+4266 Filename Length 0044 (68)\n+4268 Extra Length 0000 (0)\n+426A Comment Length 0000 (0)\n+426C Disk Start 0000 (0)\n+426E Int File Attributes 0000 (0)\n [Bit 0] 0 'Binary Data'\n-425A Ext File Attributes 81A40000 (2175008768)\n+4270 Ext File Attributes 81A40000 (2175008768)\n [Bits 16-24] 01A4 (420) 'Unix attrib: rw-r--r--'\n [Bits 28-31] 08 (8) 'Regular File'\n-425E Local Header Offset 00003AEA (15082)\n-4262 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+4274 Local Header Offset 00003B00 (15104)\n+4278 Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n #\n-# WARNING: Offset 0x4262: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n+# WARNING: Offset 0x4278: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'\n # Zero length filename\n #\n \n-42A6 END CENTRAL HEADER 06054B50 (101010256)\n-42AA Number of this disk 0000 (0)\n-42AC Central Dir Disk no 0000 (0)\n-42AE Entries in this disk 0017 (23)\n-42B0 Total Entries 0017 (23)\n-42B2 Size of Central Dir 00000710 (1808)\n-42B6 Offset to Central Dir 00003B96 (15254)\n-42BA Comment Length 0000 (0)\n+42BC END CENTRAL HEADER 06054B50 (101010256)\n+42C0 Number of this disk 0000 (0)\n+42C2 Central Dir Disk no 0000 (0)\n+42C4 Entries in this disk 0017 (23)\n+42C6 Total Entries 0017 (23)\n+42C8 Size of Central Dir 00000710 (1808)\n+42CC Offset to Central Dir 00003BAC (15276)\n+42D0 Comment Length 0000 (0)\n #\n # Error Count: 11\n # Warning Count: 57\n #\n # Done\n"}, {"source1": "org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java", "source2": "org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java", "comments": ["Ordering differences only"], "unified_diff": "@@ -1,71 +1,71 @@\n-/*\n- * Licensed to the Apache Software Foundation (ASF) under one or more\n- * contributor license agreements. See the NOTICE file distributed with\n- * this work for additional information regarding copyright ownership.\n- * The ASF licenses this file to You under the Apache License, Version 2.0\n- * (the \"License\"); you may not use this file except in compliance with\n- * the License. You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package org.apache.dubbo.monitor.dubbo;\n-\n-import org.apache.dubbo.common.URL;\n-import org.apache.dubbo.common.URLBuilder;\n-import org.apache.dubbo.common.utils.StringUtils;\n-import org.apache.dubbo.monitor.Monitor;\n-import org.apache.dubbo.monitor.MonitorService;\n-import org.apache.dubbo.monitor.support.AbstractMonitorFactory;\n-import org.apache.dubbo.rpc.Invoker;\n-import org.apache.dubbo.rpc.Protocol;\n-import org.apache.dubbo.rpc.ProxyFactory;\n-\n-import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL;\n-import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;\n-import static org.apache.dubbo.common.constants.CommonConstants.REFERENCE_FILTER_KEY;\n-import static org.apache.dubbo.remoting.Constants.CHECK_KEY;\n-\n-/**\n- * DefaultMonitorFactory\n- */\n-public class DubboMonitorFactory extends AbstractMonitorFactory {\n-\n- private Protocol protocol;\n-\n- private ProxyFactory proxyFactory;\n-\n- public void setProtocol(Protocol protocol) {\n- this.protocol = protocol;\n- }\n-\n- public void setProxyFactory(ProxyFactory proxyFactory) {\n- this.proxyFactory = proxyFactory;\n- }\n-\n- @Override\n- protected Monitor createMonitor(URL url) {\n- URLBuilder urlBuilder = URLBuilder.from(url);\n- urlBuilder.setProtocol(url.getParameter(PROTOCOL_KEY, DUBBO_PROTOCOL));\n- if (StringUtils.isEmpty(url.getPath())) {\n- urlBuilder.setPath(MonitorService.class.getName());\n- }\n- String filter = url.getParameter(REFERENCE_FILTER_KEY);\n- if (StringUtils.isEmpty(filter)) {\n- filter = \"\";\n- } else {\n- filter = filter + \",\";\n- }\n- urlBuilder.addParameters(CHECK_KEY, String.valueOf(false),\n- REFERENCE_FILTER_KEY, filter + \"-monitor\");\n- Invoker monitorInvoker = protocol.refer(MonitorService.class, urlBuilder.build());\n- MonitorService monitorService = proxyFactory.getProxy(monitorInvoker);\n- return new DubboMonitor(monitorInvoker, monitorService);\n- }\n-\n-}\n+/*\r\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\r\n+ * contributor license agreements. See the NOTICE file distributed with\r\n+ * this work for additional information regarding copyright ownership.\r\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\r\n+ * (the \"License\"); you may not use this file except in compliance with\r\n+ * the License. You may obtain a copy of the License at\r\n+ *\r\n+ * http://www.apache.org/licenses/LICENSE-2.0\r\n+ *\r\n+ * Unless required by applicable law or agreed to in writing, software\r\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n+ * See the License for the specific language governing permissions and\r\n+ * limitations under the License.\r\n+ */\r\n+package org.apache.dubbo.monitor.dubbo;\r\n+\r\n+import org.apache.dubbo.common.URL;\r\n+import org.apache.dubbo.common.URLBuilder;\r\n+import org.apache.dubbo.common.utils.StringUtils;\r\n+import org.apache.dubbo.monitor.Monitor;\r\n+import org.apache.dubbo.monitor.MonitorService;\r\n+import org.apache.dubbo.monitor.support.AbstractMonitorFactory;\r\n+import org.apache.dubbo.rpc.Invoker;\r\n+import org.apache.dubbo.rpc.Protocol;\r\n+import org.apache.dubbo.rpc.ProxyFactory;\r\n+\r\n+import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL;\r\n+import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;\r\n+import static org.apache.dubbo.common.constants.CommonConstants.REFERENCE_FILTER_KEY;\r\n+import static org.apache.dubbo.remoting.Constants.CHECK_KEY;\r\n+\r\n+/**\r\n+ * DefaultMonitorFactory\r\n+ */\r\n+public class DubboMonitorFactory extends AbstractMonitorFactory {\r\n+\r\n+ private Protocol protocol;\r\n+\r\n+ private ProxyFactory proxyFactory;\r\n+\r\n+ public void setProtocol(Protocol protocol) {\r\n+ this.protocol = protocol;\r\n+ }\r\n+\r\n+ public void setProxyFactory(ProxyFactory proxyFactory) {\r\n+ this.proxyFactory = proxyFactory;\r\n+ }\r\n+\r\n+ @Override\r\n+ protected Monitor createMonitor(URL url) {\r\n+ URLBuilder urlBuilder = URLBuilder.from(url);\r\n+ urlBuilder.setProtocol(url.getParameter(PROTOCOL_KEY, DUBBO_PROTOCOL));\r\n+ if (StringUtils.isEmpty(url.getPath())) {\r\n+ urlBuilder.setPath(MonitorService.class.getName());\r\n+ }\r\n+ String filter = url.getParameter(REFERENCE_FILTER_KEY);\r\n+ if (StringUtils.isEmpty(filter)) {\r\n+ filter = \"\";\r\n+ } else {\r\n+ filter = filter + \",\";\r\n+ }\r\n+ urlBuilder.addParameters(CHECK_KEY, String.valueOf(false),\r\n+ REFERENCE_FILTER_KEY, filter + \"-monitor\");\r\n+ Invoker monitorInvoker = protocol.refer(MonitorService.class, urlBuilder.build());\r\n+ MonitorService monitorService = proxyFactory.getProxy(monitorInvoker);\r\n+ return new DubboMonitor(monitorInvoker, monitorService);\r\n+ }\r\n+\r\n+}\r\n"}, {"source1": "org/apache/dubbo/monitor/dubbo/MetricsFilter.java", "source2": "org/apache/dubbo/monitor/dubbo/MetricsFilter.java", "comments": ["Ordering differences only"], "unified_diff": "@@ -1,261 +1,261 @@\n-/*\n- * Licensed to the Apache Software Foundation (ASF) under one or more\n- * contributor license agreements. See the NOTICE file distributed with\n- * this work for additional information regarding copyright ownership.\n- * The ASF licenses this file to You under the Apache License, Version 2.0\n- * (the \"License\"); you may not use this file except in compliance with\n- * the License. You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package org.apache.dubbo.monitor.dubbo;\n-\n-import org.apache.dubbo.common.URL;\n-import org.apache.dubbo.common.extension.ExtensionLoader;\n-import org.apache.dubbo.common.logger.Logger;\n-import org.apache.dubbo.common.logger.LoggerFactory;\n-import org.apache.dubbo.common.store.DataStore;\n-import org.apache.dubbo.common.utils.NetUtils;\n-import org.apache.dubbo.monitor.MetricsService;\n-import org.apache.dubbo.rpc.AsyncRpcResult;\n-import org.apache.dubbo.rpc.Filter;\n-import org.apache.dubbo.rpc.Invocation;\n-import org.apache.dubbo.rpc.Invoker;\n-import org.apache.dubbo.rpc.Protocol;\n-import org.apache.dubbo.rpc.Result;\n-import org.apache.dubbo.rpc.RpcContext;\n-import org.apache.dubbo.rpc.RpcException;\n-import org.apache.dubbo.rpc.support.RpcUtils;\n-\n-import com.alibaba.fastjson.JSON;\n-import com.alibaba.metrics.FastCompass;\n-import com.alibaba.metrics.MetricLevel;\n-import com.alibaba.metrics.MetricManager;\n-import com.alibaba.metrics.MetricName;\n-import com.alibaba.metrics.MetricRegistry;\n-import com.alibaba.metrics.common.CollectLevel;\n-import com.alibaba.metrics.common.MetricObject;\n-import com.alibaba.metrics.common.MetricsCollector;\n-import com.alibaba.metrics.common.MetricsCollectorFactory;\n-\n-import java.util.ArrayList;\n-import java.util.Collections;\n-import java.util.HashMap;\n-import java.util.List;\n-import java.util.Map;\n-import java.util.SortedMap;\n-import java.util.concurrent.ExecutorService;\n-import java.util.concurrent.ThreadPoolExecutor;\n-import java.util.concurrent.TimeUnit;\n-import java.util.concurrent.atomic.AtomicBoolean;\n-\n-import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL;\n-import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_SERVICE_COMPONENT_KEY;\n-import static org.apache.dubbo.common.constants.CommonConstants.METRICS_PORT;\n-import static org.apache.dubbo.common.constants.CommonConstants.METRICS_PROTOCOL;\n-import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER;\n-import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER_METHOD;\n-import static org.apache.dubbo.monitor.Constants.DUBBO_GROUP;\n-import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER;\n-import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER_METHOD;\n-import static org.apache.dubbo.monitor.Constants.METHOD;\n-import static org.apache.dubbo.monitor.Constants.SERVICE;\n-\n-public class MetricsFilter implements Filter {\n-\n- private static final Logger logger = LoggerFactory.getLogger(MetricsFilter.class);\n- private static volatile AtomicBoolean exported = new AtomicBoolean(false);\n- private Integer port;\n- private String protocolName;\n-\n- @Override\n- public Result invoke(Invoker invoker, Invocation invocation) throws RpcException {\n- if (exported.compareAndSet(false, true)) {\n- this.protocolName = invoker.getUrl().getParameter(METRICS_PROTOCOL) == null ?\n- DEFAULT_PROTOCOL : invoker.getUrl().getParameter(METRICS_PROTOCOL);\n-\n- Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(protocolName);\n-\n- this.port = invoker.getUrl().getParameter(METRICS_PORT) == null ?\n- protocol.getDefaultPort() : Integer.valueOf(invoker.getUrl().getParameter(METRICS_PORT));\n-\n- Invoker metricsInvoker = initMetricsInvoker();\n-\n- try {\n- protocol.export(metricsInvoker);\n- } catch (RuntimeException e) {\n- logger.error(\"Metrics Service need to be configured\" +\n- \" when multiple processes are running on a host\" + e.getMessage());\n- }\n- }\n-\n- RpcContext context = RpcContext.getContext();\n- boolean isProvider = context.isProviderSide();\n- long start = System.currentTimeMillis();\n- try {\n- Result result = invoker.invoke(invocation); // proceed invocation chain\n- long duration = System.currentTimeMillis() - start;\n- reportMetrics(invoker, invocation, duration, \"success\", isProvider);\n- return result;\n- } catch (RpcException e) {\n- long duration = System.currentTimeMillis() - start;\n- String result = \"error\";\n- if (e.isTimeout()) {\n- result = \"timeoutError\";\n- }\n- if (e.isBiz()) {\n- result = \"bisError\";\n- }\n- if (e.isNetwork()) {\n- result = \"networkError\";\n- }\n- if (e.isSerialization()) {\n- result = \"serializationError\";\n- }\n- reportMetrics(invoker, invocation, duration, result, isProvider);\n- throw e;\n- }\n- }\n-\n- private String buildMethodName(Invocation invocation) {\n- String methodName = RpcUtils.getMethodName(invocation);\n- StringBuilder method = new StringBuilder(methodName);\n- Class[] argTypes = RpcUtils.getParameterTypes(invocation);\n-\n- method.append(\"(\");\n-\n- for (int i = 0; i < argTypes.length; i++) {\n- method.append((i == 0 ? \"\" : \", \") + argTypes[i].getSimpleName());\n- }\n- method.append(\")\");\n- Class returnType = RpcUtils.getReturnType(invocation);\n- String typeName = null;\n- if(returnType != null) {\n- typeName = returnType.getTypeName();\n- typeName = typeName.substring(typeName.lastIndexOf(\".\") + 1);\n- }\n-\n- return (typeName == null ? \"void\" : typeName) + \" \" + method;\n- }\n-\n- private void reportMetrics(Invoker invoker, Invocation invocation, long duration, String result, boolean isProvider) {\n- String serviceName = invoker.getInterface().getName();\n- String methodName = buildMethodName(invocation);\n- MetricName global;\n- MetricName method;\n- if (isProvider) {\n- global = new MetricName(DUBBO_PROVIDER, MetricLevel.MAJOR);\n- method = new MetricName(DUBBO_PROVIDER_METHOD, new HashMap(4) {\n- {\n- put(SERVICE, serviceName);\n- put(METHOD, methodName);\n- }\n- }, MetricLevel.NORMAL);\n- } else {\n- global = new MetricName(DUBBO_CONSUMER, MetricLevel.MAJOR);\n- method = new MetricName(DUBBO_CONSUMER_METHOD, new HashMap(4) {\n- {\n- put(SERVICE, serviceName);\n- put(METHOD, methodName);\n- }\n- }, MetricLevel.NORMAL);\n- }\n- setCompassQuantity(DUBBO_GROUP, result, duration, global, method);\n- }\n-\n- private void setCompassQuantity(String groupName, String result, long duration, MetricName... metricNames) {\n- for (MetricName metricName : metricNames) {\n- FastCompass compass = MetricManager.getFastCompass(groupName, metricName);\n- compass.record(duration, result);\n- }\n- }\n-\n- private List getThreadPoolMessage() {\n- DataStore dataStore = ExtensionLoader.getExtensionLoader(DataStore.class).getDefaultExtension();\n- Map executors = dataStore.get(EXECUTOR_SERVICE_COMPONENT_KEY);\n-\n- List threadPoolMtricList = new ArrayList<>();\n- for (Map.Entry entry : executors.entrySet()) {\n- String port = entry.getKey();\n- ExecutorService executor = (ExecutorService) entry.getValue();\n- if (executor instanceof ThreadPoolExecutor) {\n- ThreadPoolExecutor tp = (ThreadPoolExecutor) executor;\n-\n- threadPoolMtricList.add(value2MetricObject(\"threadPool.active\", tp.getActiveCount(), MetricLevel.MAJOR));\n- threadPoolMtricList.add(value2MetricObject(\"threadPool.core\", tp.getCorePoolSize(), MetricLevel.MAJOR));\n- threadPoolMtricList.add(value2MetricObject(\"threadPool.max\", tp.getMaximumPoolSize(), MetricLevel.MAJOR));\n- threadPoolMtricList.add(value2MetricObject(\"threadPool.current\", tp.getPoolSize(), MetricLevel.MAJOR));\n- }\n- }\n-\n- return threadPoolMtricList;\n- }\n-\n- private MetricObject value2MetricObject(String metric, Integer value, MetricLevel level) {\n- if (metric == null || value == null || level == null) {\n- return null;\n- }\n-\n- return new MetricObject\n- .Builder(metric)\n- .withValue(value)\n- .withLevel(level)\n- .build();\n- }\n-\n- private Invoker initMetricsInvoker() {\n- Invoker metricsInvoker = new Invoker() {\n- @Override\n- public Class getInterface() {\n- return MetricsService.class;\n- }\n-\n- @Override\n- public Result invoke(Invocation invocation) throws RpcException {\n- String group = invocation.getArguments()[0].toString();\n- MetricRegistry registry = MetricManager.getIMetricManager().getMetricRegistryByGroup(group);\n-\n- SortedMap fastCompasses = registry.getFastCompasses();\n-\n- long timestamp = System.currentTimeMillis();\n- double rateFactor = TimeUnit.SECONDS.toSeconds(1);\n- double durationFactor = 1.0 / TimeUnit.MILLISECONDS.toNanos(1);\n-\n-\n- MetricsCollector collector = MetricsCollectorFactory.createNew(\n- CollectLevel.NORMAL, Collections.EMPTY_MAP, rateFactor, durationFactor, null);\n-\n- for (Map.Entry entry : fastCompasses.entrySet()) {\n- collector.collect(entry.getKey(), entry.getValue(), timestamp);\n- }\n-\n- List res = collector.build();\n- res.addAll(getThreadPoolMessage());\n- return AsyncRpcResult.newDefaultAsyncResult(JSON.toJSONString(res), invocation);\n- }\n-\n- @Override\n- public URL getUrl() {\n- return URL.valueOf(protocolName + \"://\" + NetUtils.getIpByConfig() + \":\" + port + \"/\" + MetricsService.class.getName());\n- }\n-\n- @Override\n- public boolean isAvailable() {\n- return false;\n- }\n-\n- @Override\n- public void destroy() {\n-\n- }\n- };\n-\n- return metricsInvoker;\n- }\n-}\n+/*\r\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\r\n+ * contributor license agreements. See the NOTICE file distributed with\r\n+ * this work for additional information regarding copyright ownership.\r\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\r\n+ * (the \"License\"); you may not use this file except in compliance with\r\n+ * the License. You may obtain a copy of the License at\r\n+ *\r\n+ * http://www.apache.org/licenses/LICENSE-2.0\r\n+ *\r\n+ * Unless required by applicable law or agreed to in writing, software\r\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n+ * See the License for the specific language governing permissions and\r\n+ * limitations under the License.\r\n+ */\r\n+package org.apache.dubbo.monitor.dubbo;\r\n+\r\n+import org.apache.dubbo.common.URL;\r\n+import org.apache.dubbo.common.extension.ExtensionLoader;\r\n+import org.apache.dubbo.common.logger.Logger;\r\n+import org.apache.dubbo.common.logger.LoggerFactory;\r\n+import org.apache.dubbo.common.store.DataStore;\r\n+import org.apache.dubbo.common.utils.NetUtils;\r\n+import org.apache.dubbo.monitor.MetricsService;\r\n+import org.apache.dubbo.rpc.AsyncRpcResult;\r\n+import org.apache.dubbo.rpc.Filter;\r\n+import org.apache.dubbo.rpc.Invocation;\r\n+import org.apache.dubbo.rpc.Invoker;\r\n+import org.apache.dubbo.rpc.Protocol;\r\n+import org.apache.dubbo.rpc.Result;\r\n+import org.apache.dubbo.rpc.RpcContext;\r\n+import org.apache.dubbo.rpc.RpcException;\r\n+import org.apache.dubbo.rpc.support.RpcUtils;\r\n+\r\n+import com.alibaba.fastjson.JSON;\r\n+import com.alibaba.metrics.FastCompass;\r\n+import com.alibaba.metrics.MetricLevel;\r\n+import com.alibaba.metrics.MetricManager;\r\n+import com.alibaba.metrics.MetricName;\r\n+import com.alibaba.metrics.MetricRegistry;\r\n+import com.alibaba.metrics.common.CollectLevel;\r\n+import com.alibaba.metrics.common.MetricObject;\r\n+import com.alibaba.metrics.common.MetricsCollector;\r\n+import com.alibaba.metrics.common.MetricsCollectorFactory;\r\n+\r\n+import java.util.ArrayList;\r\n+import java.util.Collections;\r\n+import java.util.HashMap;\r\n+import java.util.List;\r\n+import java.util.Map;\r\n+import java.util.SortedMap;\r\n+import java.util.concurrent.ExecutorService;\r\n+import java.util.concurrent.ThreadPoolExecutor;\r\n+import java.util.concurrent.TimeUnit;\r\n+import java.util.concurrent.atomic.AtomicBoolean;\r\n+\r\n+import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL;\r\n+import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_SERVICE_COMPONENT_KEY;\r\n+import static org.apache.dubbo.common.constants.CommonConstants.METRICS_PORT;\r\n+import static org.apache.dubbo.common.constants.CommonConstants.METRICS_PROTOCOL;\r\n+import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER;\r\n+import static org.apache.dubbo.monitor.Constants.DUBBO_CONSUMER_METHOD;\r\n+import static org.apache.dubbo.monitor.Constants.DUBBO_GROUP;\r\n+import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER;\r\n+import static org.apache.dubbo.monitor.Constants.DUBBO_PROVIDER_METHOD;\r\n+import static org.apache.dubbo.monitor.Constants.METHOD;\r\n+import static org.apache.dubbo.monitor.Constants.SERVICE;\r\n+\r\n+public class MetricsFilter implements Filter {\r\n+\r\n+ private static final Logger logger = LoggerFactory.getLogger(MetricsFilter.class);\r\n+ private static volatile AtomicBoolean exported = new AtomicBoolean(false);\r\n+ private Integer port;\r\n+ private String protocolName;\r\n+\r\n+ @Override\r\n+ public Result invoke(Invoker invoker, Invocation invocation) throws RpcException {\r\n+ if (exported.compareAndSet(false, true)) {\r\n+ this.protocolName = invoker.getUrl().getParameter(METRICS_PROTOCOL) == null ?\r\n+ DEFAULT_PROTOCOL : invoker.getUrl().getParameter(METRICS_PROTOCOL);\r\n+\r\n+ Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension(protocolName);\r\n+\r\n+ this.port = invoker.getUrl().getParameter(METRICS_PORT) == null ?\r\n+ protocol.getDefaultPort() : Integer.valueOf(invoker.getUrl().getParameter(METRICS_PORT));\r\n+\r\n+ Invoker metricsInvoker = initMetricsInvoker();\r\n+\r\n+ try {\r\n+ protocol.export(metricsInvoker);\r\n+ } catch (RuntimeException e) {\r\n+ logger.error(\"Metrics Service need to be configured\" +\r\n+ \" when multiple processes are running on a host\" + e.getMessage());\r\n+ }\r\n+ }\r\n+\r\n+ RpcContext context = RpcContext.getContext();\r\n+ boolean isProvider = context.isProviderSide();\r\n+ long start = System.currentTimeMillis();\r\n+ try {\r\n+ Result result = invoker.invoke(invocation); // proceed invocation chain\r\n+ long duration = System.currentTimeMillis() - start;\r\n+ reportMetrics(invoker, invocation, duration, \"success\", isProvider);\r\n+ return result;\r\n+ } catch (RpcException e) {\r\n+ long duration = System.currentTimeMillis() - start;\r\n+ String result = \"error\";\r\n+ if (e.isTimeout()) {\r\n+ result = \"timeoutError\";\r\n+ }\r\n+ if (e.isBiz()) {\r\n+ result = \"bisError\";\r\n+ }\r\n+ if (e.isNetwork()) {\r\n+ result = \"networkError\";\r\n+ }\r\n+ if (e.isSerialization()) {\r\n+ result = \"serializationError\";\r\n+ }\r\n+ reportMetrics(invoker, invocation, duration, result, isProvider);\r\n+ throw e;\r\n+ }\r\n+ }\r\n+\r\n+ private String buildMethodName(Invocation invocation) {\r\n+ String methodName = RpcUtils.getMethodName(invocation);\r\n+ StringBuilder method = new StringBuilder(methodName);\r\n+ Class[] argTypes = RpcUtils.getParameterTypes(invocation);\r\n+\r\n+ method.append(\"(\");\r\n+\r\n+ for (int i = 0; i < argTypes.length; i++) {\r\n+ method.append((i == 0 ? \"\" : \", \") + argTypes[i].getSimpleName());\r\n+ }\r\n+ method.append(\")\");\r\n+ Class returnType = RpcUtils.getReturnType(invocation);\r\n+ String typeName = null;\r\n+ if(returnType != null) {\r\n+ typeName = returnType.getTypeName();\r\n+ typeName = typeName.substring(typeName.lastIndexOf(\".\") + 1);\r\n+ }\r\n+\r\n+ return (typeName == null ? \"void\" : typeName) + \" \" + method;\r\n+ }\r\n+\r\n+ private void reportMetrics(Invoker invoker, Invocation invocation, long duration, String result, boolean isProvider) {\r\n+ String serviceName = invoker.getInterface().getName();\r\n+ String methodName = buildMethodName(invocation);\r\n+ MetricName global;\r\n+ MetricName method;\r\n+ if (isProvider) {\r\n+ global = new MetricName(DUBBO_PROVIDER, MetricLevel.MAJOR);\r\n+ method = new MetricName(DUBBO_PROVIDER_METHOD, new HashMap(4) {\r\n+ {\r\n+ put(SERVICE, serviceName);\r\n+ put(METHOD, methodName);\r\n+ }\r\n+ }, MetricLevel.NORMAL);\r\n+ } else {\r\n+ global = new MetricName(DUBBO_CONSUMER, MetricLevel.MAJOR);\r\n+ method = new MetricName(DUBBO_CONSUMER_METHOD, new HashMap(4) {\r\n+ {\r\n+ put(SERVICE, serviceName);\r\n+ put(METHOD, methodName);\r\n+ }\r\n+ }, MetricLevel.NORMAL);\r\n+ }\r\n+ setCompassQuantity(DUBBO_GROUP, result, duration, global, method);\r\n+ }\r\n+\r\n+ private void setCompassQuantity(String groupName, String result, long duration, MetricName... metricNames) {\r\n+ for (MetricName metricName : metricNames) {\r\n+ FastCompass compass = MetricManager.getFastCompass(groupName, metricName);\r\n+ compass.record(duration, result);\r\n+ }\r\n+ }\r\n+\r\n+ private List getThreadPoolMessage() {\r\n+ DataStore dataStore = ExtensionLoader.getExtensionLoader(DataStore.class).getDefaultExtension();\r\n+ Map executors = dataStore.get(EXECUTOR_SERVICE_COMPONENT_KEY);\r\n+\r\n+ List threadPoolMtricList = new ArrayList<>();\r\n+ for (Map.Entry entry : executors.entrySet()) {\r\n+ String port = entry.getKey();\r\n+ ExecutorService executor = (ExecutorService) entry.getValue();\r\n+ if (executor instanceof ThreadPoolExecutor) {\r\n+ ThreadPoolExecutor tp = (ThreadPoolExecutor) executor;\r\n+\r\n+ threadPoolMtricList.add(value2MetricObject(\"threadPool.active\", tp.getActiveCount(), MetricLevel.MAJOR));\r\n+ threadPoolMtricList.add(value2MetricObject(\"threadPool.core\", tp.getCorePoolSize(), MetricLevel.MAJOR));\r\n+ threadPoolMtricList.add(value2MetricObject(\"threadPool.max\", tp.getMaximumPoolSize(), MetricLevel.MAJOR));\r\n+ threadPoolMtricList.add(value2MetricObject(\"threadPool.current\", tp.getPoolSize(), MetricLevel.MAJOR));\r\n+ }\r\n+ }\r\n+\r\n+ return threadPoolMtricList;\r\n+ }\r\n+\r\n+ private MetricObject value2MetricObject(String metric, Integer value, MetricLevel level) {\r\n+ if (metric == null || value == null || level == null) {\r\n+ return null;\r\n+ }\r\n+\r\n+ return new MetricObject\r\n+ .Builder(metric)\r\n+ .withValue(value)\r\n+ .withLevel(level)\r\n+ .build();\r\n+ }\r\n+\r\n+ private Invoker initMetricsInvoker() {\r\n+ Invoker metricsInvoker = new Invoker() {\r\n+ @Override\r\n+ public Class getInterface() {\r\n+ return MetricsService.class;\r\n+ }\r\n+\r\n+ @Override\r\n+ public Result invoke(Invocation invocation) throws RpcException {\r\n+ String group = invocation.getArguments()[0].toString();\r\n+ MetricRegistry registry = MetricManager.getIMetricManager().getMetricRegistryByGroup(group);\r\n+\r\n+ SortedMap fastCompasses = registry.getFastCompasses();\r\n+\r\n+ long timestamp = System.currentTimeMillis();\r\n+ double rateFactor = TimeUnit.SECONDS.toSeconds(1);\r\n+ double durationFactor = 1.0 / TimeUnit.MILLISECONDS.toNanos(1);\r\n+\r\n+\r\n+ MetricsCollector collector = MetricsCollectorFactory.createNew(\r\n+ CollectLevel.NORMAL, Collections.EMPTY_MAP, rateFactor, durationFactor, null);\r\n+\r\n+ for (Map.Entry entry : fastCompasses.entrySet()) {\r\n+ collector.collect(entry.getKey(), entry.getValue(), timestamp);\r\n+ }\r\n+\r\n+ List res = collector.build();\r\n+ res.addAll(getThreadPoolMessage());\r\n+ return AsyncRpcResult.newDefaultAsyncResult(JSON.toJSONString(res), invocation);\r\n+ }\r\n+\r\n+ @Override\r\n+ public URL getUrl() {\r\n+ return URL.valueOf(protocolName + \"://\" + NetUtils.getIpByConfig() + \":\" + port + \"/\" + MetricsService.class.getName());\r\n+ }\r\n+\r\n+ @Override\r\n+ public boolean isAvailable() {\r\n+ return false;\r\n+ }\r\n+\r\n+ @Override\r\n+ public void destroy() {\r\n+\r\n+ }\r\n+ };\r\n+\r\n+ return metricsInvoker;\r\n+ }\r\n+}\r\n"}, {"source1": "META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter", "source2": "META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter", "comments": ["Ordering differences only"], "unified_diff": "@@ -1 +1 @@\n-metrics=org.apache.dubbo.monitor.dubbo.MetricsFilter\n+metrics=org.apache.dubbo.monitor.dubbo.MetricsFilter\r\n"}, {"source1": "META-INF/maven/org.apache.dubbo/dubbo-monitor-default/pom.xml", "source2": "META-INF/maven/org.apache.dubbo/dubbo-monitor-default/pom.xml", "comments": ["Format-specific differences are supported for XML files but no file-specific differences were detected; falling back to a binary diff. file(1) reports: XML 1.0 document, ASCII text, with CRLF line terminators"], "has_internal_linenos": true, "unified_diff": "@@ -1,199 +1,194 @@\n 00000000: 3c3f 786d 6c20 7665 7273 696f 6e3d 2231 ....\n-00000420: 0d0a 2020 3c6d 6f64 656c 5665 7273 696f .. 4.0.0.. .. org.apache.dubb\n-00000470: 6f3c 2f67 726f 7570 4964 3e0d 0a20 2020 o.. \n-00000480: 203c 6172 7469 6661 6374 4964 3e64 7562 dub\n-00000490: 626f 2d6d 6f6e 6974 6f72 3c2f 6172 7469 bo-monitor.. 2.7.10.. .. \n-000004e0: 6f72 672e 6170 6163 6865 2e64 7562 626f org.apache.dubbo\n-000004f0: 3c2f 6772 6f75 7049 643e 0d0a 2020 3c61 .. dubbo-\n-00000510: 6d6f 6e69 746f 722d 6465 6661 756c 743c monitor-default<\n-00000520: 2f61 7274 6966 6163 7449 643e 0d0a 2020 /artifactId>.. \n-00000530: 3c76 6572 7369 6f6e 3e32 2e37 2e31 303c 2.7.10<\n-00000540: 2f76 6572 7369 6f6e 3e0d 0a20 203c 6e61 /version>.. ${project.art\n-00000560: 6966 6163 7449 647d 3c2f 6e61 6d65 3e0d ifactId}.\n-00000570: 0a20 203c 6465 7363 7269 7074 696f 6e3e . \n-00000580: 5468 6520 6465 6661 756c 7420 6d6f 6e69 The default moni\n-00000590: 746f 7220 6d6f 6475 6c65 206f 6620 6475 tor module of du\n-000005a0: 6262 6f20 7072 6f6a 6563 743c 2f64 6573 bbo project.. .. .. Apache Licen\n-000005f0: 7365 2c20 5665 7273 696f 6e20 322e 303c se, Version 2.0<\n-00000600: 2f6e 616d 653e 0d0a 2020 2020 2020 3c75 /name>.. http://www.ap\n-00000620: 6163 6865 2e6f 7267 2f6c 6963 656e 7365 ache.org/license\n-00000630: 732f 4c49 4345 4e53 452d 322e 303c 2f75 s/LICENSE-2.0.. repo.. \n-00000670: 2020 3c2f 6c69 6365 6e73 653e 0d0a 2020 .. \n-00000680: 3c2f 6c69 6365 6e73 6573 3e0d 0a20 203c .. <\n-00000690: 7072 6f70 6572 7469 6573 3e0d 0a20 2020 properties>.. \n-000006a0: 203c 736b 6970 5f6d 6176 656e 5f64 6570 false.. \n-000006d0: 203c 2f70 726f 7065 7274 6965 733e 0d0a ..\n-000006e0: 2020 3c64 6570 656e 6465 6e63 6965 733e \n-000006f0: 0d0a 2020 2020 3c64 6570 656e 6465 6e63 .. .. org.apache.du\n-00000720: 6262 6f3c 2f67 726f 7570 4964 3e0d 0a20 bbo.. \n-00000730: 2020 2020 203c 6172 7469 6661 6374 4964 dubbo-monitor-a\n-00000750: 7069 3c2f 6172 7469 6661 6374 4964 3e0d pi.\n-00000760: 0a20 2020 2020 203c 7665 7273 696f 6e3e . \n-00000770: 247b 7072 6f6a 6563 742e 7061 7265 6e74 ${project.parent\n-00000780: 2e76 6572 7369 6f6e 7d3c 2f76 6572 7369 .version}.. .. .. \n-000007c0: 3c67 726f 7570 4964 3e63 6f6d 2e61 6c69 com.ali\n-000007d0: 6261 6261 2e6d 6964 646c 6577 6172 653c baba.middleware<\n-000007e0: 2f67 726f 7570 4964 3e0d 0a20 2020 2020 /groupId>.. \n-000007f0: 203c 6172 7469 6661 6374 4964 3e6d 6574 met\n-00000800: 7269 6373 2d63 6f72 652d 6170 693c 2f61 rics-core-api.. \n-00000820: 3c2f 6465 7065 6e64 656e 6379 3e0d 0a20 .. \n-00000830: 2020 203c 6465 7065 6e64 656e 6379 3e0d .\n-00000840: 0a20 2020 2020 203c 6772 6f75 7049 643e . \n-00000850: 636f 6d2e 616c 6962 6162 612e 6d69 6464 com.alibaba.midd\n-00000860: 6c65 7761 7265 3c2f 6772 6f75 7049 643e leware\n-00000870: 0d0a 2020 2020 2020 3c61 7274 6966 6163 .. metrics-core\n-00000890: 2d69 6d70 6c3c 2f61 7274 6966 6163 7449 -impl.. .. .. <\n-000008d0: 6772 6f75 7049 643e 636f 6d2e 616c 6962 groupId>com.alib\n-000008e0: 6162 612e 6d69 6464 6c65 7761 7265 3c2f aba.middleware.. \n-00000900: 3c61 7274 6966 6163 7449 643e 6d65 7472 metr\n-00000910: 6963 732d 636f 6d6d 6f6e 3c2f 6172 7469 ics-common.. .. \n-00000940: 3c64 6570 656e 6465 6e63 793e 0d0a 2020 .. \n-00000950: 2020 2020 3c67 726f 7570 4964 3e6f 7267 org\n-00000960: 2e61 7061 6368 652e 6475 6262 6f3c 2f67 .apache.dubbo.. <\n-00000980: 6172 7469 6661 6374 4964 3e64 7562 626f artifactId>dubbo\n-00000990: 2d72 7063 2d64 7562 626f 3c2f 6172 7469 -rpc-dubbo.. <\n-000009b0: 7665 7273 696f 6e3e 247b 7072 6f6a 6563 version>${projec\n-000009c0: 742e 7061 7265 6e74 2e76 6572 7369 6f6e t.parent.version\n-000009d0: 7d3c 2f76 6572 7369 6f6e 3e0d 0a20 2020 }.. \n-000009e0: 2020 203c 7363 6f70 653e 7465 7374 3c2f test.. .. <\n-00000a10: 6465 7065 6e64 656e 6379 3e0d 0a20 2020 dependency>.. \n-00000a20: 2020 203c 6772 6f75 7049 643e 6f72 672e org.\n-00000a30: 6170 6163 6865 2e64 7562 626f 3c2f 6772 apache.dubbo.. dubbo-\n-00000a60: 7265 6d6f 7469 6e67 2d6e 6574 7479 343c remoting-netty4<\n-00000a70: 2f61 7274 6966 6163 7449 643e 0d0a 2020 /artifactId>.. \n-00000a80: 2020 2020 3c76 6572 7369 6f6e 3e24 7b70 ${p\n-00000a90: 726f 6a65 6374 2e70 6172 656e 742e 7665 roject.parent.ve\n-00000aa0: 7273 696f 6e7d 3c2f 7665 7273 696f 6e3e rsion}\n-00000ab0: 0d0a 2020 2020 2020 3c73 636f 7065 3e74 .. t\n-00000ac0: 6573 743c 2f73 636f 7065 3e0d 0a20 2020 est.. \n-00000ad0: 203c 2f64 6570 656e 6465 6e63 793e 0d0a ..\n-00000ae0: 2020 2020 3c64 6570 656e 6465 6e63 793e \n-00000af0: 0d0a 2020 2020 2020 3c67 726f 7570 4964 .. org.apache.dubb\n-00000b10: 6f3c 2f67 726f 7570 4964 3e0d 0a20 2020 o.. \n-00000b20: 2020 203c 6172 7469 6661 6374 4964 3e64 d\n-00000b30: 7562 626f 2d73 6572 6961 6c69 7a61 7469 ubbo-serializati\n-00000b40: 6f6e 2d68 6573 7369 616e 323c 2f61 7274 on-hessian2.. \n-00000b60: 3c76 6572 7369 6f6e 3e24 7b70 726f 6a65 ${proje\n-00000b70: 6374 2e70 6172 656e 742e 7665 7273 696f ct.parent.versio\n-00000b80: 6e7d 3c2f 7665 7273 696f 6e3e 0d0a 2020 n}.. \n-00000b90: 2020 2020 3c73 636f 7065 3e74 6573 743c test<\n-00000ba0: 2f73 636f 7065 3e0d 0a20 2020 203c 2f64 /scope>.. .. \n-00000bc0: 3c64 6570 656e 6465 6e63 793e 0d0a 2020 .. \n-00000bd0: 2020 2020 3c67 726f 7570 4964 3e63 6f6d com\n-00000be0: 2e67 6f6f 676c 652e 636f 6465 2e67 736f .google.code.gso\n-00000bf0: 6e3c 2f67 726f 7570 4964 3e0d 0a20 2020 n.. \n-00000c00: 2020 203c 6172 7469 6661 6374 4964 3e67 g\n-00000c10: 736f 6e3c 2f61 7274 6966 6163 7449 643e son\n-00000c20: 0d0a 2020 2020 2020 3c73 636f 7065 3e74 .. t\n-00000c30: 6573 743c 2f73 636f 7065 3e0d 0a20 2020 est.. \n-00000c40: 203c 2f64 6570 656e 6465 6e63 793e 0d0a ..\n-00000c50: 2020 3c2f 6465 7065 6e64 656e 6369 6573 ....\n+00000020: 462d 3822 3f3e 0a3c 212d 2d0a 2020 4c69 F-8\"?>... \n+00000410: 203c 6d6f 6465 6c56 6572 7369 6f6e 3e34 4\n+00000420: 2e30 2e30 3c2f 6d6f 6465 6c56 6572 7369 .0.0. . \n+00000440: 2020 203c 6772 6f75 7049 643e 6f72 672e org.\n+00000450: 6170 6163 6865 2e64 7562 626f 3c2f 6772 apache.dubbo. dubbo-mon\n+00000480: 6974 6f72 3c2f 6172 7469 6661 6374 4964 itor. 2\n+000004a0: 2e37 2e31 303c 2f76 6572 7369 6f6e 3e0a .7.10.\n+000004b0: 2020 3c2f 7061 7265 6e74 3e0a 2020 3c67 . org.apach\n+000004d0: 652e 6475 6262 6f3c 2f67 726f 7570 4964 e.dubbo. \n+000004f0: 6475 6262 6f2d 6d6f 6e69 746f 722d 6465 dubbo-monitor-de\n+00000500: 6661 756c 743c 2f61 7274 6966 6163 7449 fault. 2.\n+00000520: 372e 3130 3c2f 7665 7273 696f 6e3e 0a20 7.10. \n+00000530: 203c 6e61 6d65 3e24 7b70 726f 6a65 6374 ${project\n+00000540: 2e61 7274 6966 6163 7449 647d 3c2f 6e61 .artifactId}. The default m\n+00000570: 6f6e 6974 6f72 206d 6f64 756c 6520 6f66 onitor module of\n+00000580: 2064 7562 626f 2070 726f 6a65 6374 3c2f dubbo project. <\n+000005a0: 6c69 6365 6e73 6573 3e0a 2020 2020 3c6c licenses>. . Apache Licen\n+000005d0: 7365 2c20 5665 7273 696f 6e20 322e 303c se, Version 2.0<\n+000005e0: 2f6e 616d 653e 0a20 2020 2020 203c 7572 /name>. http://www.apa\n+00000600: 6368 652e 6f72 672f 6c69 6365 6e73 6573 che.org/licenses\n+00000610: 2f4c 4943 454e 5345 2d32 2e30 3c2f 7572 /LICENSE-2.0. repo. <\n+00000650: 2f6c 6963 656e 7365 3e0a 2020 3c2f 6c69 /license>. . . fa\n+00000690: 6c73 653c 2f73 6b69 705f 6d61 7665 6e5f lse. . . . \n+000006e0: 3c67 726f 7570 4964 3e6f 7267 2e61 7061 org.apa\n+000006f0: 6368 652e 6475 6262 6f3c 2f67 726f 7570 che.dubbo. dubbo-moni\n+00000720: 746f 722d 6170 693c 2f61 7274 6966 6163 tor-api. ${project.pa\n+00000750: 7265 6e74 2e76 6572 7369 6f6e 7d3c 2f76 rent.version}. . . \n+00000790: 203c 6772 6f75 7049 643e 636f 6d2e 616c com.al\n+000007a0: 6962 6162 612e 6d69 6464 6c65 7761 7265 ibaba.middleware\n+000007b0: 3c2f 6772 6f75 7049 643e 0a20 2020 2020 . \n+000007c0: 203c 6172 7469 6661 6374 4964 3e6d 6574 met\n+000007d0: 7269 6373 2d63 6f72 652d 6170 693c 2f61 rics-core-api. <\n+000007f0: 2f64 6570 656e 6465 6e63 793e 0a20 2020 /dependency>. \n+00000800: 203c 6465 7065 6e64 656e 6379 3e0a 2020 . \n+00000810: 2020 2020 3c67 726f 7570 4964 3e63 6f6d com\n+00000820: 2e61 6c69 6261 6261 2e6d 6964 646c 6577 .alibaba.middlew\n+00000830: 6172 653c 2f67 726f 7570 4964 3e0a 2020 are. \n+00000840: 2020 2020 3c61 7274 6966 6163 7449 643e \n+00000850: 6d65 7472 6963 732d 636f 7265 2d69 6d70 metrics-core-imp\n+00000860: 6c3c 2f61 7274 6966 6163 7449 643e 0a20 l. \n+00000870: 2020 203c 2f64 6570 656e 6465 6e63 793e \n+00000880: 0a20 2020 203c 6465 7065 6e64 656e 6379 . . com.alibaba.mid\n+000008b0: 646c 6577 6172 653c 2f67 726f 7570 4964 dleware. metrics-comm\n+000008e0: 6f6e 3c2f 6172 7469 6661 6374 4964 3e0a on.\n+000008f0: 2020 2020 3c2f 6465 7065 6e64 656e 6379 . . org.apache.dub\n+00000930: 626f 3c2f 6772 6f75 7049 643e 0a20 2020 bo. \n+00000940: 2020 203c 6172 7469 6661 6374 4964 3e64 d\n+00000950: 7562 626f 2d72 7063 2d64 7562 626f 3c2f ubbo-rpc-dubbo. \n+00000970: 2020 3c76 6572 7369 6f6e 3e24 7b70 726f ${pro\n+00000980: 6a65 6374 2e70 6172 656e 742e 7665 7273 ject.parent.vers\n+00000990: 696f 6e7d 3c2f 7665 7273 696f 6e3e 0a20 ion}. \n+000009a0: 2020 2020 203c 7363 6f70 653e 7465 7374 test\n+000009b0: 3c2f 7363 6f70 653e 0a20 2020 203c 2f64 . . <\n+000009d0: 6465 7065 6e64 656e 6379 3e0a 2020 2020 dependency>. \n+000009e0: 2020 3c67 726f 7570 4964 3e6f 7267 2e61 org.a\n+000009f0: 7061 6368 652e 6475 6262 6f3c 2f67 726f pache.dubbo. dubbo-re\n+00000a20: 6d6f 7469 6e67 2d6e 6574 7479 343c 2f61 moting-netty4. \n+00000a40: 203c 7665 7273 696f 6e3e 247b 7072 6f6a ${proj\n+00000a50: 6563 742e 7061 7265 6e74 2e76 6572 7369 ect.parent.versi\n+00000a60: 6f6e 7d3c 2f76 6572 7369 6f6e 3e0a 2020 on}. \n+00000a70: 2020 2020 3c73 636f 7065 3e74 6573 743c test<\n+00000a80: 2f73 636f 7065 3e0a 2020 2020 3c2f 6465 /scope>. . . \n+00000ab0: 203c 6772 6f75 7049 643e 6f72 672e 6170 org.ap\n+00000ac0: 6163 6865 2e64 7562 626f 3c2f 6772 6f75 ache.dubbo. dubbo-ser\n+00000af0: 6961 6c69 7a61 7469 6f6e 2d68 6573 7369 ialization-hessi\n+00000b00: 616e 323c 2f61 7274 6966 6163 7449 643e an2\n+00000b10: 0a20 2020 2020 203c 7665 7273 696f 6e3e . \n+00000b20: 247b 7072 6f6a 6563 742e 7061 7265 6e74 ${project.parent\n+00000b30: 2e76 6572 7369 6f6e 7d3c 2f76 6572 7369 .version}. test. \n+00000b60: 2020 3c2f 6465 7065 6e64 656e 6379 3e0a .\n+00000b70: 2020 2020 3c64 6570 656e 6465 6e63 793e \n+00000b80: 0a20 2020 2020 203c 6772 6f75 7049 643e . \n+00000b90: 636f 6d2e 676f 6f67 6c65 2e63 6f64 652e com.google.code.\n+00000ba0: 6773 6f6e 3c2f 6772 6f75 7049 643e 0a20 gson. \n+00000bb0: 2020 2020 203c 6172 7469 6661 6374 4964 gson. \n+00000be0: 7465 7374 3c2f 7363 6f70 653e 0a20 2020 test. \n+00000bf0: 203c 2f64 6570 656e 6465 6e63 793e 0a20 . \n+00000c00: 203c 2f64 6570 656e 6465 6e63 6965 733e \n+00000c10: 0a3c 2f70 726f 6a65 6374 3e0a ..\n"}]}