Skip to content

Commit d538023

Browse files
bmorelli25bmorelli25
authored
Merge branch 'master' into add-php-agent-instructions
2 parents c9b17b5 + ce812f6 commit d538023

30 files changed

Lines changed: 788 additions & 355 deletions

‎NOTICE.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Elastic APM Server
22
Copyright 2014-2021 Elasticsearch BV
33

4-
This product includes software developed by The Apache Software
4+
This product includes software developed by The Apache Software
55
Foundation (http://www.apache.org/).
66

77
================================================================================
@@ -509,11 +509,11 @@ SOFTWARE.
509509

510510
--------------------------------------------------------------------------------
511511
Dependency : github.com/elastic/beats/v7
512-
Version: v7.0.0-alpha2.0.20210215225204-ba423212a660
512+
Version: v7.0.0-alpha2.0.20210217153456-1b31c268017d
513513
Licence type (autodetected): Elastic
514514
--------------------------------------------------------------------------------
515515

516-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20210215225204-ba423212a660/LICENSE.txt:
516+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20210217153456-1b31c268017d/LICENSE.txt:
517517

518518
Source code in this repository is variously licensed under the Apache License
519519
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -532,11 +532,11 @@ License Version 2.0.
532532

533533
--------------------------------------------------------------------------------
534534
Dependency : github.com/elastic/ecs
535-
Version: v1.6.0
535+
Version: v1.8.0
536536
Licence type (autodetected): Apache-2.0
537537
--------------------------------------------------------------------------------
538538

539-
Contents of probable licence file $GOMODCACHE/github.com/elastic/ecs@v1.6.0/LICENSE.txt:
539+
Contents of probable licence file $GOMODCACHE/github.com/elastic/ecs@v1.8.0/LICENSE.txt:
540540

541541

542542
Apache License
@@ -18101,11 +18101,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1810118101

1810218102
--------------------------------------------------------------------------------
1810318103
Dependency : golang.org/x/sys
18104-
Version: v0.0.0-20210124154548-22da62e12c0c
18104+
Version: v0.0.0-20210217105451-b926d437f341
1810518105
Licence type (autodetected): BSD-3-Clause
1810618106
--------------------------------------------------------------------------------
1810718107

18108-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20210124154548-22da62e12c0c/LICENSE:
18108+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20210217105451-b926d437f341/LICENSE:
1810918109

1811018110
Copyright (c) 2009 The Go Authors. All rights reserved.
1811118111

@@ -19976,13 +19976,13 @@ Contents of probable licence file $GOMODCACHE/howett.net/plist@v0.0.0-2020120308
1997619976
Copyright (c) 2013, Dustin L. Howett. All rights reserved.
1997719977

1997819978
Redistribution and use in source and binary forms, with or without
19979-
modification, are permitted provided that the following conditions are met:
19979+
modification, are permitted provided that the following conditions are met:
1998019980

1998119981
1. Redistributions of source code must retain the above copyright notice, this
19982-
list of conditions and the following disclaimer.
19982+
list of conditions and the following disclaimer.
1998319983
2. Redistributions in binary form must reproduce the above copyright notice,
1998419984
this list of conditions and the following disclaimer in the documentation
19985-
and/or other materials provided with the distribution.
19985+
and/or other materials provided with the distribution.
1998619986

1998719987
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1998819988
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19996,7 +19996,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1999619996
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1999719997

1999819998
The views and conclusions contained in the software and documentation are those
19999-
of the authors and should not be interpreted as representing official policies,
19999+
of the authors and should not be interpreted as representing official policies,
2000020000
either expressed or implied, of the FreeBSD Project.
2000120001

2000220002
--------------------------------------------------------------------------------

‎apmpackage/apm/0.1.0/docs/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Traces are written to `traces-apm.*` indices.
205205
"id": "container-id"
206206
},
207207
"ecs": {
208-
"version": "1.6.0"
208+
"version": "1.8.0"
209209
},
210210
"event": {
211211
"ingested": "2020-08-11T09:55:04.391451Z",
@@ -301,7 +301,7 @@ Traces are written to `traces-apm.*` indices.
301301
"version": "3.14.0"
302302
},
303303
"ecs": {
304-
"version": "1.6.0"
304+
"version": "1.8.0"
305305
},
306306
"event": {
307307
"outcome": "unknown"
@@ -508,7 +508,7 @@ Metrics are written to `metrics-apm.*`, `metrics-apm.internal.*` and `metrics-ap
508508
"version": "3.14.0"
509509
},
510510
"ecs": {
511-
"version": "1.6.0"
511+
"version": "1.8.0"
512512
},
513513
"event": {
514514
"ingested": "2020-04-22T14:55:05.425020Z"
@@ -687,7 +687,7 @@ Logs are written to `logs-apm.error.*` indices.
687687
"id": "container-id"
688688
},
689689
"ecs": {
690-
"version": "1.6.0"
690+
"version": "1.8.0"
691691
},
692692
"error": {
693693
"grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",

‎beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"id": "container-id"
3838
},
3939
"ecs": {
40-
"version": "1.6.0"
40+
"version": "1.8.0"
4141
},
4242
"error": {
4343
"culprit": "my.module.function_name",
@@ -393,7 +393,7 @@
393393
"id": "container-id"
394394
},
395395
"ecs": {
396-
"version": "1.6.0"
396+
"version": "1.8.0"
397397
},
398398
"error": {
399399
"grouping_key": "dc8dd667f7036ec5f0bae87bf2188243",
@@ -511,7 +511,7 @@
511511
"id": "container-id"
512512
},
513513
"ecs": {
514-
"version": "1.6.0"
514+
"version": "1.8.0"
515515
},
516516
"error": {
517517
"exception": [
@@ -625,7 +625,7 @@
625625
"id": "container-id"
626626
},
627627
"ecs": {
628-
"version": "1.6.0"
628+
"version": "1.8.0"
629629
},
630630
"error": {
631631
"exception": [
@@ -745,7 +745,7 @@
745745
"id": "container-id"
746746
},
747747
"ecs": {
748-
"version": "1.6.0"
748+
"version": "1.8.0"
749749
},
750750
"error": {
751751
"grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",

‎beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
1515
},
1616
"ecs": {
17-
"version": "1.6.0"
17+
"version": "1.8.0"
1818
},
1919
"event": {
2020
"outcome": "success"
@@ -207,7 +207,7 @@
207207
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
208208
},
209209
"ecs": {
210-
"version": "1.6.0"
210+
"version": "1.8.0"
211211
},
212212
"event": {
213213
"outcome": "success"
@@ -369,7 +369,7 @@
369369
},
370370
"double_gauge": 3.141592653589793,
371371
"ecs": {
372-
"version": "1.6.0"
372+
"version": "1.8.0"
373373
},
374374
"float_gauge": 9.16,
375375
"host": {
@@ -498,7 +498,7 @@
498498
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
499499
},
500500
"ecs": {
501-
"version": "1.6.0"
501+
"version": "1.8.0"
502502
},
503503
"error": {
504504
"culprit": "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)",

‎beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"double_gauge": 3.141592653589793,
1616
"ecs": {
17-
"version": "1.6.0"
17+
"version": "1.8.0"
1818
},
1919
"float_gauge": 9.16,
2020
"host": {
@@ -109,7 +109,7 @@
109109
"version": "3.14.0"
110110
},
111111
"ecs": {
112-
"version": "1.6.0"
112+
"version": "1.8.0"
113113
},
114114
"go": {
115115
"memstats": {
@@ -164,7 +164,7 @@
164164
"version": "3.14.0"
165165
},
166166
"ecs": {
167-
"version": "1.6.0"
167+
"version": "1.8.0"
168168
},
169169
"host": {
170170
"ip": "127.0.0.1"

‎beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": "3.14.0"
88
},
99
"ecs": {
10-
"version": "1.6.0"
10+
"version": "1.8.0"
1111
},
1212
"event": {
1313
"outcome": "unknown"
@@ -58,7 +58,7 @@
5858
"version": "3.14.0"
5959
},
6060
"ecs": {
61-
"version": "1.6.0"
61+
"version": "1.8.0"
6262
},
6363
"event": {
6464
"outcome": "unknown"
@@ -109,7 +109,7 @@
109109
"version": "3.14.0"
110110
},
111111
"ecs": {
112-
"version": "1.6.0"
112+
"version": "1.8.0"
113113
},
114114
"event": {
115115
"outcome": "unknown"
@@ -158,7 +158,7 @@
158158
"version": "3.14.0"
159159
},
160160
"ecs": {
161-
"version": "1.6.0"
161+
"version": "1.8.0"
162162
},
163163
"host": {
164164
"ip": "127.0.0.1"
@@ -186,7 +186,7 @@
186186
"version": "3.14.0"
187187
},
188188
"ecs": {
189-
"version": "1.6.0"
189+
"version": "1.8.0"
190190
},
191191
"error": {
192192
"grouping_key": "0b9cba09845a097a271c6beb4c6207f3",
@@ -224,7 +224,7 @@
224224
"version": "3.14.0"
225225
},
226226
"ecs": {
227-
"version": "1.6.0"
227+
"version": "1.8.0"
228228
},
229229
"error": {
230230
"exception": [
@@ -264,7 +264,7 @@
264264
"version": "3.14.0"
265265
},
266266
"ecs": {
267-
"version": "1.6.0"
267+
"version": "1.8.0"
268268
},
269269
"error": {
270270
"exception": [

0 commit comments

Comments
 (0)