Skip to content

Commit 0adb6ab

Browse files
kruskallkruskall
authored
Merge branch 'main' into otel-adapter
2 parents 128b5b9 + 035d82e commit 0adb6ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1174
-539
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
- uses: actions/checkout@v4
124124
- name: Get changed files
125125
id: changed-files
126-
uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366 # v45.0.5
126+
uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f # v45.0.6
127127
with:
128128
files: .go-version
129129

‎.github/workflows/mergify-labels-copier.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: mergify backport labels copier
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
mergify-backport-labels-copier:
13+
runs-on: ubuntu-latest
14+
if: startsWith(github.head_ref, 'mergify/bp/')
15+
permissions:
16+
# Add GH labels
17+
pull-requests: write
18+
# See https://github.com/cli/cli/issues/6274
19+
repository-projects: read
20+
steps:
21+
- uses: elastic/oblt-actions/mergify/labels-copier@v1
22+
with:
23+
excluded-labels-regex: "^backport-*"

‎NOTICE.txt

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Elastic APM Server
2-
Copyright 2014-2024 Elasticsearch BV
2+
Copyright 2014-2025 Elasticsearch BV
33

44
This product includes software developed by The Apache Software
55
Foundation (http://www.apache.org/).
@@ -11,11 +11,11 @@ Third party libraries used by the Elastic APM Server project:
1111

1212
--------------------------------------------------------------------------------
1313
Dependency : github.com/KimMachineGun/automemlimit
14-
Version: v0.7.0-pre.3
14+
Version: v0.7.0
1515
Licence type (autodetected): MIT
1616
--------------------------------------------------------------------------------
1717

18-
Contents of probable licence file $GOMODCACHE/github.com/!kim!machine!gun/[email protected]-pre.3/LICENSE:
18+
Contents of probable licence file $GOMODCACHE/github.com/!kim!machine!gun/[email protected]/LICENSE:
1919

2020
MIT License
2121

@@ -393,11 +393,11 @@ these terms.
393393

394394
--------------------------------------------------------------------------------
395395
Dependency : github.com/elastic/apm-data
396-
Version: v1.14.4
396+
Version: v1.16.0
397397
Licence type (autodetected): Apache-2.0
398398
--------------------------------------------------------------------------------
399399

400-
Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.14.4/LICENSE:
400+
Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.16.0/LICENSE:
401401

402402
Apache License
403403
Version 2.0, January 2004
@@ -860,11 +860,11 @@ SOFTWARE
860860

861861
--------------------------------------------------------------------------------
862862
Dependency : github.com/elastic/elastic-agent-libs
863-
Version: v0.17.5
863+
Version: v0.18.1
864864
Licence type (autodetected): Apache-2.0
865865
--------------------------------------------------------------------------------
866866

867-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.17.5/LICENSE:
867+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.1/LICENSE:
868868

869869
Apache License
870870
Version 2.0, January 2004
@@ -1493,11 +1493,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LIC
14931493

14941494
--------------------------------------------------------------------------------
14951495
Dependency : github.com/elastic/go-docappender/v2
1496-
Version: v2.3.2
1496+
Version: v2.3.3
14971497
Licence type (autodetected): Apache-2.0
14981498
--------------------------------------------------------------------------------
14991499

1500-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/[email protected].2/LICENSE:
1500+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/[email protected].3/LICENSE:
15011501

15021502
Apache License
15031503
Version 2.0, January 2004
@@ -3476,11 +3476,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34763476

34773477
--------------------------------------------------------------------------------
34783478
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
3479-
Version: v2.6.2
3479+
Version: v2.6.3
34803480
Licence type (autodetected): Apache-2.0
34813481
--------------------------------------------------------------------------------
34823482

3483-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/[email protected].2/LICENSE:
3483+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/[email protected].3/LICENSE:
34843484

34853485
Apache License
34863486
Version 2.0, January 2004
@@ -3687,11 +3687,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti
36873687

36883688
--------------------------------------------------------------------------------
36893689
Dependency : go.elastic.co/apm/module/apmgorilla/v2
3690-
Version: v2.6.2
3690+
Version: v2.6.3
36913691
Licence type (autodetected): Apache-2.0
36923692
--------------------------------------------------------------------------------
36933693

3694-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/[email protected].2/LICENSE:
3694+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/[email protected].3/LICENSE:
36953695

36963696
Apache License
36973697
Version 2.0, January 2004
@@ -3898,11 +3898,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorill
38983898

38993899
--------------------------------------------------------------------------------
39003900
Dependency : go.elastic.co/apm/module/apmgrpc/v2
3901-
Version: v2.6.2
3901+
Version: v2.6.3
39023902
Licence type (autodetected): Apache-2.0
39033903
--------------------------------------------------------------------------------
39043904

3905-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/[email protected].2/LICENSE:
3905+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/[email protected].3/LICENSE:
39063906

39073907
Apache License
39083908
Version 2.0, January 2004
@@ -4109,11 +4109,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v
41094109

41104110
--------------------------------------------------------------------------------
41114111
Dependency : go.elastic.co/apm/module/apmhttp/v2
4112-
Version: v2.6.2
4112+
Version: v2.6.3
41134113
Licence type (autodetected): Apache-2.0
41144114
--------------------------------------------------------------------------------
41154115

4116-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/[email protected].2/LICENSE:
4116+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/[email protected].3/LICENSE:
41174117

41184118
Apache License
41194119
Version 2.0, January 2004
@@ -4320,11 +4320,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v
43204320

43214321
--------------------------------------------------------------------------------
43224322
Dependency : go.elastic.co/apm/module/apmotel/v2
4323-
Version: v2.6.2
4323+
Version: v2.6.3
43244324
Licence type (autodetected): Apache-2.0
43254325
--------------------------------------------------------------------------------
43264326

4327-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/[email protected].2/LICENSE:
4327+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/[email protected].3/LICENSE:
43284328

43294329
Apache License
43304330
Version 2.0, January 2004
@@ -4531,11 +4531,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v
45314531

45324532
--------------------------------------------------------------------------------
45334533
Dependency : go.elastic.co/apm/v2
4534-
Version: v2.6.2
4534+
Version: v2.6.3
45354535
Licence type (autodetected): Apache-2.0
45364536
--------------------------------------------------------------------------------
45374537

4538-
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/[email protected].2/LICENSE:
4538+
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/[email protected].3/LICENSE:
45394539

45404540
Apache License
45414541
Version 2.0, January 2004
@@ -4775,11 +4775,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
47754775

47764776
--------------------------------------------------------------------------------
47774777
Dependency : go.opentelemetry.io/collector/pdata
4778-
Version: v1.22.0
4778+
Version: v1.23.0
47794779
Licence type (autodetected): Apache-2.0
47804780
--------------------------------------------------------------------------------
47814781

4782-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.22.0/LICENSE:
4782+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.23.0/LICENSE:
47834783

47844784

47854785
Apache License
@@ -5706,11 +5706,11 @@ THE SOFTWARE.
57065706

57075707
--------------------------------------------------------------------------------
57085708
Dependency : golang.org/x/net
5709-
Version: v0.33.0
5709+
Version: v0.34.0
57105710
Licence type (autodetected): BSD-3-Clause
57115711
--------------------------------------------------------------------------------
57125712

5713-
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.33.0/LICENSE:
5713+
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.34.0/LICENSE:
57145714

57155715
Copyright 2009 The Go Authors.
57165716

@@ -5780,11 +5780,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
57805780

57815781
--------------------------------------------------------------------------------
57825782
Dependency : golang.org/x/term
5783-
Version: v0.27.0
5783+
Version: v0.28.0
57845784
Licence type (autodetected): BSD-3-Clause
57855785
--------------------------------------------------------------------------------
57865786

5787-
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.27.0/LICENSE:
5787+
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.28.0/LICENSE:
57885788

57895789
Copyright 2009 The Go Authors.
57905790

@@ -5817,11 +5817,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
58175817

58185818
--------------------------------------------------------------------------------
58195819
Dependency : golang.org/x/time
5820-
Version: v0.8.0
5820+
Version: v0.9.0
58215821
Licence type (autodetected): BSD-3-Clause
58225822
--------------------------------------------------------------------------------
58235823

5824-
Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.8.0/LICENSE:
5824+
Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.9.0/LICENSE:
58255825

58265826
Copyright 2009 The Go Authors.
58275827

@@ -5854,11 +5854,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
58545854

58555855
--------------------------------------------------------------------------------
58565856
Dependency : google.golang.org/grpc
5857-
Version: v1.69.2
5857+
Version: v1.69.4
58585858
Licence type (autodetected): Apache-2.0
58595859
--------------------------------------------------------------------------------
58605860

5861-
Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected].2/LICENSE:
5861+
Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected].4/LICENSE:
58625862

58635863

58645864
Apache License
@@ -6066,11 +6066,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]/LIC
60666066

60676067
--------------------------------------------------------------------------------
60686068
Dependency : google.golang.org/protobuf
6069-
Version: v1.36.1
6069+
Version: v1.36.2
60706070
Licence type (autodetected): BSD-3-Clause
60716071
--------------------------------------------------------------------------------
60726072

6073-
Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected].1/LICENSE:
6073+
Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected].2/LICENSE:
60746074

60756075
Copyright (c) 2018 The Go Authors. All rights reserved.
60766076

@@ -9166,11 +9166,11 @@ limitations under the License.
91669166

91679167
--------------------------------------------------------------------------------
91689168
Dependency : github.com/elastic/opentelemetry-lib
9169-
Version: v0.13.0
9169+
Version: v0.14.0
91709170
Licence type (autodetected): Apache-2.0
91719171
--------------------------------------------------------------------------------
91729172

9173-
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.13.0/LICENSE:
9173+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.14.0/LICENSE:
91749174

91759175
Apache License
91769176
Version 2.0, January 2004
@@ -16004,11 +16004,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/auto/[email protected].
1600416004

1600516005
--------------------------------------------------------------------------------
1600616006
Dependency : go.opentelemetry.io/collector/consumer
16007-
Version: v1.21.0
16007+
Version: v1.22.0
1600816008
Licence type (autodetected): Apache-2.0
1600916009
--------------------------------------------------------------------------------
1601016010

16011-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v1.21.0/LICENSE:
16011+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v1.22.0/LICENSE:
1601216012

1601316013

1601416014
Apache License
@@ -16216,11 +16216,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
1621616216

1621716217
--------------------------------------------------------------------------------
1621816218
Dependency : go.opentelemetry.io/collector/semconv
16219-
Version: v0.115.0
16219+
Version: v0.116.0
1622016220
Licence type (autodetected): Apache-2.0
1622116221
--------------------------------------------------------------------------------
1622216222

16223-
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.115.0/LICENSE:
16223+
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.116.0/LICENSE:
1622416224

1622516225

1622616226
Apache License
@@ -16879,11 +16879,11 @@ THE SOFTWARE.
1687916879

1688016880
--------------------------------------------------------------------------------
1688116881
Dependency : golang.org/x/crypto
16882-
Version: v0.31.0
16882+
Version: v0.32.0
1688316883
Licence type (autodetected): BSD-3-Clause
1688416884
--------------------------------------------------------------------------------
1688516885

16886-
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.31.0/LICENSE:
16886+
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.32.0/LICENSE:
1688716887

1688816888
Copyright 2009 The Go Authors.
1688916889

@@ -16953,11 +16953,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1695316953

1695416954
--------------------------------------------------------------------------------
1695516955
Dependency : golang.org/x/sys
16956-
Version: v0.28.0
16956+
Version: v0.29.0
1695716957
Licence type (autodetected): BSD-3-Clause
1695816958
--------------------------------------------------------------------------------
1695916959

16960-
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.28.0/LICENSE:
16960+
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.29.0/LICENSE:
1696116961

1696216962
Copyright 2009 The Go Authors.
1696316963

0 commit comments

Comments
 (0)