From 87a7df2baab20c0621f8da8efdc956009a035022 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:11:26 +0000 Subject: [PATCH 001/133] Add 8.12.1 release notes (#12680) (#12681) (cherry picked from commit aadfc3bf7e1f4eb5f6a158bf5e85677014a70c21) Co-authored-by: Carson Ip --- changelogs/8.12.asciidoc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index df36348770a..08cdaadfe42 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -1,8 +1,28 @@ [[release-notes-8.12]] == APM version 8.12 +* <> * <> +[float] +[[release-notes-8.12.1]] +=== APM version 8.12.1 + +https://github.com/elastic/apm-server/compare/v8.12.0\...v8.12.1[View commits] + +[float] +==== Bug fixes +- Define value for all constant_keyword fields in apmpackage to fix integration upgrade issues in rare cases {pull}12219[12219] +- Tail-based sampling: Fix missing entry TTL in badger.ErrTxnTooBig handling {pull}12453[12453] +- Tail-based sampling: Compute entry size before writing and flush to avoid losing events silently due to storage limit {pull}12120[12120] +- APM instrumentation: Use UpDownCounter for docsActive and availableBulkIndexer {pull}12179[12179] +- Remove field preview in error reason returned by Elasticsearch from logs. https://discuss.elastic.co/t/apm-server-8-12-1-security-update-esa-2024-03/352688[Please see our security advisory for more details]. {pull}12179[12179] + +[float] +==== Added +- Disable default instrumentation metrics sending to batch processor by removing local exporter {pull}12228[12228] +- Log a single consolidated line per unique error instead of per each failed document {pull}12179[12179] + [float] [[release-notes-8.12.0]] === APM version 8.12.0 From 405663fda33e8650bcae9502f94f36a52a220991 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 21 Feb 2024 23:12:15 +0800 Subject: [PATCH 002/133] changelog: Remove apmpackage constant_keyword fix from 8.12.1 (#12691) The fix did not go into 8.12.1 due to automation issues. See #12219 --- changelogs/8.12.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index 08cdaadfe42..34a43725fa4 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -12,7 +12,6 @@ https://github.com/elastic/apm-server/compare/v8.12.0\...v8.12.1[View commits] [float] ==== Bug fixes -- Define value for all constant_keyword fields in apmpackage to fix integration upgrade issues in rare cases {pull}12219[12219] - Tail-based sampling: Fix missing entry TTL in badger.ErrTxnTooBig handling {pull}12453[12453] - Tail-based sampling: Compute entry size before writing and flush to avoid losing events silently due to storage limit {pull}12120[12120] - APM instrumentation: Use UpDownCounter for docsActive and availableBulkIndexer {pull}12179[12179] From 79c4599ab9bd65e1cc688eed1169505933f6f405 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 22 Feb 2024 11:18:31 -0500 Subject: [PATCH 003/133] [updatecli] Bump elastic stack version to 8.14.0-74a79bf3 (#12704) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * test: remove ingestion version enforcement systemtest --------- Co-authored-by: apmmachine Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com> --- docker-compose.yml | 6 ++-- systemtest/ingest_test.go | 29 ------------------- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- .../infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 5 files changed, 6 insertions(+), 35 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6878d6363d3..c77d2f68627 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-7ad20c93-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-74a79bf3-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.13.0-7ad20c93-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-74a79bf3-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.13.0-7ad20c93-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-74a79bf3-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/systemtest/ingest_test.go b/systemtest/ingest_test.go index c1bd709dd6e..4b6ff344694 100644 --- a/systemtest/ingest_test.go +++ b/systemtest/ingest_test.go @@ -20,7 +20,6 @@ package systemtest_test import ( "context" "encoding/json" - "io" "net/http" "net/url" "strings" @@ -83,34 +82,6 @@ func TestIngestPipeline(t *testing.T) { assert.False(t, destinationIP.Exists()) // destination.address is not an IP } -func TestIngestPipelineVersionEnforcement(t *testing.T) { - source := `{"observer": {"version": "100.200.300"}}` // apm-server version is too new - dataStreams := []string{ - "traces-apm-default", - "traces-apm.rum-default", - "metrics-apm.internal-default", - "metrics-apm.app.service_name-default", - "logs-apm.error-default", - } - - for _, dataStream := range dataStreams { - body := strings.NewReader(source) - resp, err := systemtest.Elasticsearch.Index(dataStream, body) - require.NoError(t, err) - - respBody, err := io.ReadAll(resp.Body) - require.NoError(t, err) - resp.Body.Close() - - if !assert.Equal(t, http.StatusInternalServerError, resp.StatusCode, "%s: %s", dataStream, respBody) { - continue - } - assert.Contains(t, string(respBody), - `Document produced by APM Server v100.200.300, which is newer than the installed APM integration`, - ) - } -} - func TestIngestPipelineEventDuration(t *testing.T) { type test struct { source string diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index cb56b8446fc..f2ec28ea2b5 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.13.0-7ad20c93-SNAPSHOT + version: 8.14.0-74a79bf3-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 6ad5397282a..d4b6aebce81 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.13.0-7ad20c93-SNAPSHOT + version: 8.14.0-74a79bf3-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index a8e72ea0787..952697ed517 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.13.0-7ad20c93-SNAPSHOT + version: 8.14.0-74a79bf3-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 5aab23be02aea77e3008037d41e6c70419a8343d Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Fri, 23 Feb 2024 02:06:15 +0800 Subject: [PATCH 004/133] test: Add TBS whitebox test for ErrTxnTooBig handling (#12688) Add a whitebox test for ErrTxnTooBig handling in TBS storage. Existing storage_test.go is in a separate package, making it unable to access private fields under ReadWriter. --- .../eventstorage/storage_whitebox_test.go | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 x-pack/apm-server/sampling/eventstorage/storage_whitebox_test.go diff --git a/x-pack/apm-server/sampling/eventstorage/storage_whitebox_test.go b/x-pack/apm-server/sampling/eventstorage/storage_whitebox_test.go new file mode 100644 index 00000000000..7abae0980ed --- /dev/null +++ b/x-pack/apm-server/sampling/eventstorage/storage_whitebox_test.go @@ -0,0 +1,94 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License 2.0; +// you may not use this file except in compliance with the Elastic License 2.0. + +package eventstorage + +import ( + "testing" + "time" + + "github.com/dgraph-io/badger/v2" + "github.com/gofrs/uuid" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/elastic/apm-data/model/modelpb" +) + +func newReadWriter(tb testing.TB) *ReadWriter { + tempdir := tb.TempDir() + opts := badger.DefaultOptions("").WithLogger(nil) + opts = opts.WithInMemory(false) + opts = opts.WithDir(tempdir).WithValueDir(tempdir) + + db, err := badger.Open(opts) + if err != nil { + panic(err) + } + tb.Cleanup(func() { db.Close() }) + + store := New(db, ProtobufCodec{}) + readWriter := store.NewReadWriter() + tb.Cleanup(func() { readWriter.Close() }) + + return readWriter +} + +func TestDeleteTraceEvent_ErrTxnTooBig(t *testing.T) { + readWriter := newReadWriter(t) + + traceID, transactionID := writeEvent(t, readWriter) + assert.True(t, eventExists(t, readWriter, traceID, transactionID)) + + fillTxnUntilTxnTooBig(readWriter.txn) + + err := readWriter.DeleteTraceEvent(traceID, transactionID) + assert.NoError(t, err) + + assert.False(t, eventExists(t, readWriter, traceID, transactionID)) +} + +func TestWriteTraceEvent_ErrTxnTooBig(t *testing.T) { + readWriter := newReadWriter(t) + + fillTxnUntilTxnTooBig(readWriter.txn) + + traceID, transactionID := writeEvent(t, readWriter) + assert.True(t, eventExists(t, readWriter, traceID, transactionID)) +} + +func writeEvent(t *testing.T, readWriter *ReadWriter) (traceID, transactionID string) { + traceID = uuid.Must(uuid.NewV4()).String() + transactionID = uuid.Must(uuid.NewV4()).String() + transaction := modelpb.APMEvent{Transaction: &modelpb.Transaction{Id: transactionID}} + err := readWriter.WriteTraceEvent(traceID, transactionID, &transaction, WriterOpts{ + TTL: time.Minute, + StorageLimitInBytes: 0, + }) + assert.NoError(t, err) + return +} + +func eventExists(t *testing.T, readWriter *ReadWriter, traceID, transactionID string) (ok bool) { + var batch modelpb.Batch + err := readWriter.ReadTraceEvents(traceID, &batch) + require.NoError(t, err) + for _, e := range batch { + if e.GetTransaction().GetId() == transactionID { + ok = true + } + } + return +} + +func fillTxnUntilTxnTooBig(txn *badger.Txn) { + var err error + for { + if err == badger.ErrTxnTooBig { + break + } + entry := badger.NewEntry([]byte{0}, []byte{}) + err = txn.SetEntry(entry) + } +} From 34136d1c3f85a4af3b37e40c3ee6755b5b810bb6 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 22 Feb 2024 19:27:36 +0100 Subject: [PATCH 005/133] docs: add 8.12.2 release notes (#12711) Co-authored-by: Carson Ip Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- changelogs/8.12.asciidoc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index 34a43725fa4..2862e98a682 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -1,9 +1,21 @@ [[release-notes-8.12]] == APM version 8.12 +* <> * <> * <> +[float] +[[release-notes-8.12.2]] +=== APM version 8.12.2 + +https://github.com/elastic/apm-server/compare/v8.12.1\...v8.12.2[View commits] + +[float] +==== Bug fixes +- Tail-based sampling: do not stop sampling processor when failing to delete trace events {pull}12509[12509] +- Define value for all constant_keyword fields in apmpackage to fix integration upgrade issues in rare cases {pull}12219[12219] + [float] [[release-notes-8.12.1]] === APM version 8.12.1 From 5a1d36ef1ab78f1ac9ffa470b2277ca26162100d Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:31:04 -0500 Subject: [PATCH 006/133] chore: Update to elastic/beats@b1c0c15c384e (#12708) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index bd844fb409a..7fd2b99ea30 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240214091752-ecaf12cd07b5 +Version: v7.0.0-alpha2.0.20240222065451-b1c0c15c384e Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240214091752-ecaf12cd07b5/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240222065451-b1c0c15c384e/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 75df2891458..74434ad835c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240214091752-ecaf12cd07b5 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222065451-b1c0c15c384e github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index 4edf782abfe..cf35f3d9d4f 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240214091752-ecaf12cd07b5 h1:GLgfpcd0vWRnlVwCpsnN0YBy1b0MG3npRy/8ckox23k= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240214091752-ecaf12cd07b5/go.mod h1:GtyUmZtaZCsMUtZlq7wk1m/2Xj+HWc+J+sVG5xi9wyk= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222065451-b1c0c15c384e h1:Nx/GhiW+xK0rPuX8hY8s1VPb1qmjur23+ED9WaC3JP4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222065451-b1c0c15c384e/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= From 495beb37a404456bbb6629797086089a849823c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 19:53:09 +0000 Subject: [PATCH 007/133] build(deps): bump the github-actions group (#12674) Bumps the github-actions group in /.github/workflows/setup-cluster-env with 1 update: [hashicorp/vault-action](https://github.com/hashicorp/vault-action). Updates `hashicorp/vault-action` from 2.8.0 to 3.0.0 - [Release notes](https://github.com/hashicorp/vault-action/releases) - [Changelog](https://github.com/hashicorp/vault-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/vault-action/compare/v2.8.0...v3.0.0) --- updated-dependencies: - dependency-name: hashicorp/vault-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- .github/workflows/setup-cluster-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup-cluster-env/action.yml b/.github/workflows/setup-cluster-env/action.yml index 41f959d702d..55412575dc1 100644 --- a/.github/workflows/setup-cluster-env/action.yml +++ b/.github/workflows/setup-cluster-env/action.yml @@ -31,7 +31,7 @@ runs: cache-dependency-path: | go.sum tools/go.sum - - uses: hashicorp/vault-action@v2.8.0 + - uses: hashicorp/vault-action@v3.0.0 with: url: ${{ inputs.vault-url }} roleId: ${{ inputs.vault-role-id }} From b5f099467a775c93b71c31f37dfc9718cd511ee9 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:29:50 -0500 Subject: [PATCH 008/133] chore: Update to elastic/beats@6dc03053c4eb (#12715) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 7fd2b99ea30..ad8d8c65a57 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240222065451-b1c0c15c384e +Version: v7.0.0-alpha2.0.20240222184312-6dc03053c4eb Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240222065451-b1c0c15c384e/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240222184312-6dc03053c4eb/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 74434ad835c..d691012b66e 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222065451-b1c0c15c384e + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222184312-6dc03053c4eb github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index cf35f3d9d4f..4602df4954d 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222065451-b1c0c15c384e h1:Nx/GhiW+xK0rPuX8hY8s1VPb1qmjur23+ED9WaC3JP4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222065451-b1c0c15c384e/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222184312-6dc03053c4eb h1:FWv5TR8G61VzMISXpTy3JBtGDgVn40RuhAuWgCiElbA= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222184312-6dc03053c4eb/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= From 685fd66f9dcdb891f9adcc81da4d2c83b3567637 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:05:08 +0000 Subject: [PATCH 009/133] build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.12.0 to 8.12.1 (#12712) * build(deps): bump github.com/elastic/go-elasticsearch/v8 Bumps [github.com/elastic/go-elasticsearch/v8](https://github.com/elastic/go-elasticsearch) from 8.12.0 to 8.12.1. - [Release notes](https://github.com/elastic/go-elasticsearch/releases) - [Changelog](https://github.com/elastic/go-elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/go-elasticsearch/compare/v8.12.0...v8.12.1) --- updated-dependencies: - dependency-name: github.com/elastic/go-elasticsearch/v8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ad8d8c65a57..f66dacdc4c0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1673,11 +1673,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@ -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.12.0 +Version: v8.12.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.12.1/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index d691012b66e..3c9d57a3f1d 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/elastic/elastic-agent-system-metrics v0.9.1 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v1.0.0 - github.com/elastic/go-elasticsearch/v8 v8.12.0 + github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-sysinfo v1.13.1 github.com/elastic/go-ucfg v0.8.6 github.com/go-sourcemap/sourcemap v2.1.3+incompatible diff --git a/go.sum b/go.sum index 4602df4954d..acf0aab053c 100644 --- a/go.sum +++ b/go.sum @@ -152,8 +152,8 @@ github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= github.com/elastic/gmux v0.3.1/go.mod h1:IBFLojLnACU9tsUnoSavOaMdhq63/HOH/Aeiiha36jA= github.com/elastic/go-docappender v1.0.0 h1:fXCOd5MEx+4qHIJjJqdtXODC2UNj0sxpO2K84N+/E7Y= github.com/elastic/go-docappender v1.0.0/go.mod h1:escVC67Qgu2xTKP92H30/tNW0F+VWty5JfkLzew3URI= -github.com/elastic/go-elasticsearch/v8 v8.12.0 h1:krkiCf4peJa7bZwGegy01b5xWWaYpik78wvisTeRO1U= -github.com/elastic/go-elasticsearch/v8 v8.12.0/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= +github.com/elastic/go-elasticsearch/v8 v8.12.1 h1:QcuFK5LaZS0pSIj/eAEsxmJWmMo7tUs1aVBbzdIgtnE= +github.com/elastic/go-elasticsearch/v8 v8.12.1/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= From cc42eda68de529908abb8c4076ae9bf543fbbeef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:34:39 +0000 Subject: [PATCH 010/133] build(deps): bump go.uber.org/zap from 1.26.0 to 1.27.0 (#12700) * build(deps): bump go.uber.org/zap from 1.26.0 to 1.27.0 Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber-go/zap/compare/v1.26.0...v1.27.0) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index f66dacdc4c0..016acab873c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6582,11 +6582,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : go.uber.org/zap -Version: v1.26.0 +Version: v1.27.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.26.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.27.0/LICENSE: Copyright (c) 2016-2017 Uber Technologies, Inc. diff --git a/go.mod b/go.mod index 3c9d57a3f1d..d76035649da 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( go.opentelemetry.io/otel/metric v1.23.1 go.opentelemetry.io/otel/sdk/metric v1.23.1 go.uber.org/automaxprocs v1.5.3 - go.uber.org/zap v1.26.0 + go.uber.org/zap v1.27.0 golang.org/x/net v0.21.0 golang.org/x/sync v0.6.0 golang.org/x/term v0.17.0 diff --git a/go.sum b/go.sum index acf0aab053c..de0f6d336d7 100644 --- a/go.sum +++ b/go.sum @@ -566,8 +566,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From 039db5ed6aa5ecb65b0a04bf3fe70e3acc6bbe32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:57:01 +0100 Subject: [PATCH 011/133] build(deps): bump the jaeger group with 1 update (#12699) * build(deps): bump the jaeger group with 1 update Bumps the jaeger group with 1 update: [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib). Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger` from 0.94.0 to 0.95.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.94.0...v0.95.0) --- updated-dependencies: - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger dependency-type: direct:production update-type: version-update:semver-minor dependency-group: jaeger ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 20 ++++++++++---------- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 016acab873c..86391608008 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3672,11 +3672,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/reflect2@v1.0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger -Version: v0.94.0 +Version: v0.95.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.94.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.95.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5497,11 +5497,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/consumer -Version: v0.94.1 +Version: v0.95.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.94.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.95.0/LICENSE: Apache License @@ -5709,11 +5709,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/pdata -Version: v1.1.0 +Version: v1.2.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.1.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.2.0/LICENSE: Apache License @@ -13875,11 +13875,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/concurrent@v0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal -Version: v0.94.0 +Version: v0.95.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.94.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.95.0/LICENSE: Apache License Version 2.0, January 2004 @@ -16698,11 +16698,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.2/LICENS -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/semconv -Version: v0.94.1 +Version: v0.95.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.94.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.95.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index d76035649da..c9e79277a7d 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/jaegertracing/jaeger v1.54.0 github.com/libp2p/go-reuseport v0.4.0 github.com/modern-go/reflect2 v1.0.2 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.94.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.95.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/ryanuber/go-glob v1.0.0 @@ -44,8 +44,8 @@ require ( go.elastic.co/apm/module/apmotel/v2 v2.4.8 go.elastic.co/apm/v2 v2.4.8 go.elastic.co/fastjson v1.3.0 - go.opentelemetry.io/collector/consumer v0.94.1 - go.opentelemetry.io/collector/pdata v1.1.0 + go.opentelemetry.io/collector/consumer v0.95.0 + go.opentelemetry.io/collector/pdata v1.2.0 go.opentelemetry.io/otel v1.23.1 go.opentelemetry.io/otel/metric v1.23.1 go.opentelemetry.io/otel/sdk/metric v1.23.1 @@ -124,7 +124,7 @@ require ( github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.94.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.95.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -147,7 +147,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect go.elastic.co/apm/module/apmzap/v2 v2.4.8 // indirect go.elastic.co/ecszap v1.0.2 // indirect - go.opentelemetry.io/collector/semconv v0.94.1 // indirect + go.opentelemetry.io/collector/semconv v0.95.0 // indirect go.opentelemetry.io/otel/sdk v1.23.1 // indirect go.opentelemetry.io/otel/trace v1.23.1 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/go.sum b/go.sum index de0f6d336d7..d18f764c775 100644 --- a/go.sum +++ b/go.sum @@ -395,10 +395,10 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.94.0 h1:0X1r/YZR+rbQqzKzQ40LTZUw1a8mKXV/BmO+BDuhx1w= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.94.0/go.mod h1:VR/KC70d5Jxfw71448BpbykhTK6+0bLjTgPobcm+7Vk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.94.0 h1:+gpgiUXzrx8YeVBfXPwxpfLrB6FQgTnfXp2HHx2LumI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.94.0/go.mod h1:73syuA2KFBpSVI9xIYXjMItqcfuR9aKbb5ffg3WgZjo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.95.0 h1:rvP/CsLCRB4YhwUonXBepCFKD1JmvJx15u6q9uohx/s= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.95.0/go.mod h1:dYvTF19uK+adX9RXqVQnx3vMAuVw0K9UqSN5bIqZhKo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.95.0 h1:gx+zEjG3dYYqeRG/tUQ2KjIMIl9cRvtzuRXj/rbJyxU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.95.0/go.mod h1:QaMTCmd8RXl96lwYTuRVE49jotvp20rT30DZMRdb7O4= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= @@ -540,12 +540,12 @@ go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= -go.opentelemetry.io/collector/consumer v0.94.1 h1:l/9h5L71xr/d93snQ9fdxgz64C4UuB8mEDxpp456X8o= -go.opentelemetry.io/collector/consumer v0.94.1/go.mod h1:BIPWmw8wES6jlPTPC+acJxLvUzIdOm6uh/p/X85ALsY= -go.opentelemetry.io/collector/pdata v1.1.0 h1:cE6Al1rQieUjMHro6p6cKwcu3sjHXGG59BZ3kRVUvsM= -go.opentelemetry.io/collector/pdata v1.1.0/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.94.1 h1:+FoBlzwFgwalgbdBhJHtHPvR7W0+aJDUAdQdsmfT/Ts= -go.opentelemetry.io/collector/semconv v0.94.1/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/consumer v0.95.0 h1:M/N5RDx8/6Hz5L1qWUXdtirtdoV8BEjIxCSdt6cCx+I= +go.opentelemetry.io/collector/consumer v0.95.0/go.mod h1:tM5aOolWS1zAByMbne2xVOkmVvZrF3VEKY6TkxhmkOs= +go.opentelemetry.io/collector/pdata v1.2.0 h1:N6VdyEFYJyoHIKqHd0F372eNVD5b+AbH0ZQf7Z2jJ9I= +go.opentelemetry.io/collector/pdata v1.2.0/go.mod h1:mKXb6527Syb8PT4P9CZOJNbkuHOHjjGTZNNwSKESJhc= +go.opentelemetry.io/collector/semconv v0.95.0 h1:Oa7NXmoatwKLS+RzuXtdjq9oXAeg8P0g3x238fKF0Do= +go.opentelemetry.io/collector/semconv v0.95.0/go.mod h1:zOm/U3pgMIWcvrcnPbR9Xx2HinoXj46ERMK8PUV9wrs= go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY= go.opentelemetry.io/otel v1.23.1/go.mod h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA= go.opentelemetry.io/otel/metric v1.23.1 h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo= From 61615f835ccdf8990d9849a4a98c9e4ff98338c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:18:09 +0000 Subject: [PATCH 012/133] build(deps): bump the github-actions group with 1 update (#12673) Bumps the github-actions group with 1 update: [hashicorp/vault-action](https://github.com/hashicorp/vault-action). Updates `hashicorp/vault-action` from 2.8.0 to 3.0.0 - [Release notes](https://github.com/hashicorp/vault-action/releases) - [Changelog](https://github.com/hashicorp/vault-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/vault-action/compare/v2.8.0...v3.0.0) --- updated-dependencies: - dependency-name: hashicorp/vault-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 3ccdf8507b1..d20a7c35178 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -67,7 +67,7 @@ jobs: echo "BENCHMARK_RUN=${{ inputs.benchmarkRun }}" >> "$GITHUB_ENV" fi - - uses: hashicorp/vault-action@v2.8.0 + - uses: hashicorp/vault-action@v3.0.0 env: AWS_CREDENTIALS_PATH: secret/observability-team/ci/elastic-observability-aws-account-auth BENCHMARK_CLOUD_CREDENTIALS_PATH: secret/observability-team/ci/benchmark-cloud From c6e42137179321f0092601ad1aca3ce9beca9f52 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:34:30 -0500 Subject: [PATCH 013/133] [updatecli] Bump elastic stack version to 8.14.0-d7334334 (#12720) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c77d2f68627..f15ced51cc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-74a79bf3-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-d7334334-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-74a79bf3-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-d7334334-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-74a79bf3-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-d7334334-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index f2ec28ea2b5..e74dca70fb2 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-74a79bf3-SNAPSHOT + version: 8.14.0-d7334334-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index d4b6aebce81..82ac8272225 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-74a79bf3-SNAPSHOT + version: 8.14.0-d7334334-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 952697ed517..c4d09c33d24 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-74a79bf3-SNAPSHOT + version: 8.14.0-d7334334-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 606d1a90d26e0f4a5bc22f1c9669a6b5296a25d6 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:53:27 -0500 Subject: [PATCH 014/133] chore: Update to elastic/beats@a27e4399dfad (#12717) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 86391608008..d43acfc4d7a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240222184312-6dc03053c4eb +Version: v7.0.0-alpha2.0.20240223002941-a27e4399dfad Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240222184312-6dc03053c4eb/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240223002941-a27e4399dfad/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index c9e79277a7d..b23e1a38853 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222184312-6dc03053c4eb + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240223002941-a27e4399dfad github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index d18f764c775..1c5821e7284 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222184312-6dc03053c4eb h1:FWv5TR8G61VzMISXpTy3JBtGDgVn40RuhAuWgCiElbA= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240222184312-6dc03053c4eb/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240223002941-a27e4399dfad h1:AlKs51/iRWm9e8OJ+RjgHV9XX+bQLkyD2goZ8Qf9c/Q= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240223002941-a27e4399dfad/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= From 692fb6ca198776d60ec8be0bbd055c9b087b7aa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:31:04 +0000 Subject: [PATCH 015/133] build(deps): bump the otel group with 3 updates (#12723) * build(deps): bump the otel group with 3 updates Bumps the otel group with 3 updates: [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go), [go.opentelemetry.io/otel/metric](https://github.com/open-telemetry/opentelemetry-go) and [go.opentelemetry.io/otel/sdk/metric](https://github.com/open-telemetry/opentelemetry-go). Updates `go.opentelemetry.io/otel` from 1.23.1 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0) Updates `go.opentelemetry.io/otel/metric` from 1.23.1 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0) Updates `go.opentelemetry.io/otel/sdk/metric` from 1.23.1 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/metric dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/sdk/metric dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 20 ++++++++++---------- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d43acfc4d7a..663693483c5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5921,11 +5921,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel -Version: v1.23.1 +Version: v1.24.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.23.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.24.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6132,11 +6132,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.23.1/L -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/metric -Version: v1.23.1 +Version: v1.24.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.23.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.24.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6343,11 +6343,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1 -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/sdk/metric -Version: v1.23.1 +Version: v1.24.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.23.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.24.0/LICENSE: Apache License Version 2.0, January 2004 @@ -16910,11 +16910,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semc -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/sdk -Version: v1.23.1 +Version: v1.24.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.23.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.24.0/LICENSE: Apache License Version 2.0, January 2004 @@ -17121,11 +17121,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.23 -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/trace -Version: v1.23.1 +Version: v1.24.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.23.1/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.24.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index b23e1a38853..f67718b6dd4 100644 --- a/go.mod +++ b/go.mod @@ -46,9 +46,9 @@ require ( go.elastic.co/fastjson v1.3.0 go.opentelemetry.io/collector/consumer v0.95.0 go.opentelemetry.io/collector/pdata v1.2.0 - go.opentelemetry.io/otel v1.23.1 - go.opentelemetry.io/otel/metric v1.23.1 - go.opentelemetry.io/otel/sdk/metric v1.23.1 + go.opentelemetry.io/otel v1.24.0 + go.opentelemetry.io/otel/metric v1.24.0 + go.opentelemetry.io/otel/sdk/metric v1.24.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 golang.org/x/net v0.21.0 @@ -148,8 +148,8 @@ require ( go.elastic.co/apm/module/apmzap/v2 v2.4.8 // indirect go.elastic.co/ecszap v1.0.2 // indirect go.opentelemetry.io/collector/semconv v0.95.0 // indirect - go.opentelemetry.io/otel/sdk v1.23.1 // indirect - go.opentelemetry.io/otel/trace v1.23.1 // indirect + go.opentelemetry.io/otel/sdk v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect diff --git a/go.sum b/go.sum index 1c5821e7284..8960aaf083b 100644 --- a/go.sum +++ b/go.sum @@ -546,16 +546,16 @@ go.opentelemetry.io/collector/pdata v1.2.0 h1:N6VdyEFYJyoHIKqHd0F372eNVD5b+AbH0Z go.opentelemetry.io/collector/pdata v1.2.0/go.mod h1:mKXb6527Syb8PT4P9CZOJNbkuHOHjjGTZNNwSKESJhc= go.opentelemetry.io/collector/semconv v0.95.0 h1:Oa7NXmoatwKLS+RzuXtdjq9oXAeg8P0g3x238fKF0Do= go.opentelemetry.io/collector/semconv v0.95.0/go.mod h1:zOm/U3pgMIWcvrcnPbR9Xx2HinoXj46ERMK8PUV9wrs= -go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY= -go.opentelemetry.io/otel v1.23.1/go.mod h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA= -go.opentelemetry.io/otel/metric v1.23.1 h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo= -go.opentelemetry.io/otel/metric v1.23.1/go.mod h1:mpG2QPlAfnK8yNhNJAxDZruU9Y1/HubbC+KyH8FaCWI= -go.opentelemetry.io/otel/sdk v1.23.1 h1:O7JmZw0h76if63LQdsBMKQDWNb5oEcOThG9IrxscV+E= -go.opentelemetry.io/otel/sdk v1.23.1/go.mod h1:LzdEVR5am1uKOOwfBWFef2DCi1nu3SA8XQxx2IerWFk= -go.opentelemetry.io/otel/sdk/metric v1.23.1 h1:T9/8WsYg+ZqIpMWwdISVVrlGb/N0Jr1OHjR/alpKwzg= -go.opentelemetry.io/otel/sdk/metric v1.23.1/go.mod h1:8WX6WnNtHCgUruJ4TJ+UssQjMtpxkpX0zveQC8JG/E0= -go.opentelemetry.io/otel/trace v1.23.1 h1:4LrmmEd8AU2rFvU1zegmvqW7+kWarxtNOPyeL6HmYY8= -go.opentelemetry.io/otel/trace v1.23.1/go.mod h1:4IpnpJFwr1mo/6HL8XIPJaE9y0+u1KcVmuW7dwFSVrI= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= +go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= +go.opentelemetry.io/otel/sdk/metric v1.24.0 h1:yyMQrPzF+k88/DbH7o4FMAs80puqd+9osbiBrJrz/w8= +go.opentelemetry.io/otel/sdk/metric v1.24.0/go.mod h1:I6Y5FjH6rvEnTTAYQz3Mmv2kl6Ek5IIrmwTLqMrrOE0= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= From 784a827d12962d2e7cca4b9ffa33c3ff56e9c2b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:49:41 +0000 Subject: [PATCH 016/133] build(deps): bump google.golang.org/grpc from 1.61.1 to 1.62.0 (#12724) * build(deps): bump google.golang.org/grpc from 1.61.1 to 1.62.0 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.61.1 to 1.62.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.61.1...v1.62.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 10 +++++----- go.mod | 6 +++--- go.sum | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 663693483c5..5362acfeae0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6759,11 +6759,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/grpc -Version: v1.61.1 +Version: v1.62.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.61.1/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.62.0/LICENSE: Apache License @@ -11014,7 +11014,7 @@ Apache License -------------------------------------------------------------------------------- Dependency : github.com/golang/glog -Version: v1.1.2 +Version: v1.2.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- @@ -17509,11 +17509,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/genproto/googleapis/rpc -Version: v0.0.0-20240102182953-50ed04b92917 +Version: v0.0.0-20240123012728-ef4313101c80 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240102182953-50ed04b92917/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240123012728-ef4313101c80/LICENSE: Apache License diff --git a/go.mod b/go.mod index f67718b6dd4..74e807fe2f3 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( golang.org/x/sync v0.6.0 golang.org/x/term v0.17.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.61.1 + google.golang.org/grpc v1.62.0 google.golang.org/protobuf v1.32.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -100,7 +100,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/gogo/googleapis v1.4.1 // indirect - github.com/golang/glog v1.1.2 // indirect + github.com/golang/glog v1.2.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect @@ -157,7 +157,7 @@ require ( golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect diff --git a/go.sum b/go.sum index 8960aaf083b..4bd1ada5967 100644 --- a/go.sum +++ b/go.sum @@ -704,15 +704,15 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= -google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= +google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27 h1:EB/3dtnYKOItaNPpOI/HmOCGbVZUiXcstRfiuxN+cFg= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27/go.mod h1:Crtq1t+mykyL5d6PR3z8zCxKx/Qjq/mlPWDPoWJANYA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From b058e582d5e7d169b215ddbb108eb594ea181005 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:16:34 -0500 Subject: [PATCH 017/133] [updatecli] Bump elastic stack version to 8.14.0-496ca828 (#12728) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f15ced51cc5..5d72964f3e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-d7334334-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-496ca828-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-d7334334-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-496ca828-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-d7334334-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-496ca828-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index e74dca70fb2..0cb61fc2416 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-d7334334-SNAPSHOT + version: 8.14.0-496ca828-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 82ac8272225..79ec1460d14 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-d7334334-SNAPSHOT + version: 8.14.0-496ca828-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index c4d09c33d24..d65a467603c 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-d7334334-SNAPSHOT + version: 8.14.0-496ca828-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 8fd179e0a07f85060f8af0f9cb5cf99628bb0ba8 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:36:35 -0500 Subject: [PATCH 018/133] chore: Update to elastic/beats@0361e30247f8 (#12730) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 5362acfeae0..7fe258aa8a2 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240223002941-a27e4399dfad +Version: v7.0.0-alpha2.0.20240226111616-0361e30247f8 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240223002941-a27e4399dfad/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240226111616-0361e30247f8/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 74e807fe2f3..c803ae852f4 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240223002941-a27e4399dfad + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240226111616-0361e30247f8 github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index 4bd1ada5967..14b83b2157f 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240223002941-a27e4399dfad h1:AlKs51/iRWm9e8OJ+RjgHV9XX+bQLkyD2goZ8Qf9c/Q= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240223002941-a27e4399dfad/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240226111616-0361e30247f8 h1:FgAcDT2NHYL8A/WFUaSJGBpbBaplg05UZz5Sm6cNzn0= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240226111616-0361e30247f8/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= From dd479caeb01ce4ec3228cefff9b8c1cab85a861c Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 26 Feb 2024 23:55:21 -0500 Subject: [PATCH 019/133] [updatecli] Bump Golang version to 1.21.7 (#12725) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Dockerfile with Golang version 1.21.7 Made with ❤️️ by updatecli * chore: Update .go-version with Golang version 1.21.7 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .go-version | 2 +- packaging/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index c262b1f0dfd..8819d012cee 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.6 +1.21.7 diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index a0d25eae35c..c24d3ca1500 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04 # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. -FROM golang:1.21.6 as builder +FROM golang:1.21.7 as builder WORKDIR /src COPY go.mod go.sum /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod From a9b5f66350bd4d2c7b220012e2c44bfcce5d5a4e Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 28 Feb 2024 19:42:42 -0500 Subject: [PATCH 020/133] [updatecli] Bump elastic stack version to 8.14.0-226c3ec4 (#12739) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5d72964f3e1..22f0be630dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-496ca828-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-226c3ec4-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-496ca828-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-226c3ec4-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-496ca828-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-226c3ec4-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 0cb61fc2416..d1cf631c513 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-496ca828-SNAPSHOT + version: 8.14.0-226c3ec4-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 79ec1460d14..877b8839bb1 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-496ca828-SNAPSHOT + version: 8.14.0-226c3ec4-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index d65a467603c..bd1063558b6 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-496ca828-SNAPSHOT + version: 8.14.0-226c3ec4-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 6173c78158aff317062d66b10df33095fc16a6ae Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:07:57 -0500 Subject: [PATCH 021/133] [updatecli] Bump elastic stack version to 8.14.0-ca4c9a13 (#12743) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 22f0be630dc..6b2c8db7104 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-226c3ec4-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-ca4c9a13-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-226c3ec4-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-ca4c9a13-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-226c3ec4-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-ca4c9a13-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index d1cf631c513..2cb2867d2ea 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-226c3ec4-SNAPSHOT + version: 8.14.0-ca4c9a13-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 877b8839bb1..6604a68edb4 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-226c3ec4-SNAPSHOT + version: 8.14.0-ca4c9a13-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index bd1063558b6..2c80c44e33f 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-226c3ec4-SNAPSHOT + version: 8.14.0-ca4c9a13-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 6ec69c1a96eba15f5c45019b5031dc1d262c1ee4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:25:51 -0500 Subject: [PATCH 022/133] [updatecli] Bump elastic stack version to 8.14.0-14244116 (#12751) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6b2c8db7104..718fb6972f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-ca4c9a13-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-14244116-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-ca4c9a13-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-14244116-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-ca4c9a13-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-14244116-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 2cb2867d2ea..bc67f3ac145 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-ca4c9a13-SNAPSHOT + version: 8.14.0-14244116-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 6604a68edb4..8dce56c355b 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-ca4c9a13-SNAPSHOT + version: 8.14.0-14244116-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 2c80c44e33f..46551fdbea0 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-ca4c9a13-SNAPSHOT + version: 8.14.0-14244116-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 55913bd3de488f7e1347f601a02bcbd33389eff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 21:09:37 +0000 Subject: [PATCH 023/133] build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#12756) * build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.8.4...v1.9.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- go.mod | 2 +- go.sum | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c803ae852f4..297ad676714 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/ryanuber/go-glob v1.0.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8 go.elastic.co/apm/module/apmgorilla/v2 v2.4.8 go.elastic.co/apm/module/apmgrpc/v2 v2.4.8 diff --git a/go.sum b/go.sum index 14b83b2157f..b7964b4e599 100644 --- a/go.sum +++ b/go.sum @@ -474,8 +474,9 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -484,8 +485,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= From 0d0a7828b7be578771fc536a8a3725dd6e3b9996 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 09:36:11 +0000 Subject: [PATCH 024/133] build(deps): bump the github-actions group with 1 update (#12758) Bumps the github-actions group with 1 update: [actions/add-to-project](https://github.com/actions/add-to-project). Updates `actions/add-to-project` from 0.5.0 to 0.6.0 - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](https://github.com/actions/add-to-project/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 2af0cb79800..62fd964b282 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -11,7 +11,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.5.0 + - uses: actions/add-to-project@v0.6.0 with: project-url: https://github.com/orgs/elastic/projects/1286 github-token: ${{ secrets.APM_TECH_USER_TOKEN }} \ No newline at end of file From 682deb141650ec07c9857949a520bfd432533b77 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 4 Mar 2024 19:45:46 +0800 Subject: [PATCH 025/133] Better logs on reading TBS subscriber position (#12759) --- x-pack/apm-server/sampling/processor.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/apm-server/sampling/processor.go b/x-pack/apm-server/sampling/processor.go index 10e464948f7..24121d8e473 100644 --- a/x-pack/apm-server/sampling/processor.go +++ b/x-pack/apm-server/sampling/processor.go @@ -7,6 +7,7 @@ package sampling import ( "context" "encoding/json" + "fmt" "os" "path/filepath" "sync" @@ -557,13 +558,14 @@ func readSubscriberPosition(logger *logp.Logger, storageDir string) (pubsub.Subs if errors.Is(err, os.ErrNotExist) { return pos, nil } else if err != nil { - return pos, err + return pos, fmt.Errorf("error reading subscriber position file: %w", err) } err = json.Unmarshal(data, &pos) if err != nil { logger.With(logp.Error(err)).With(logp.ByteString("file", data)).Debug("failed to read subscriber position") + return pos, fmt.Errorf("error parsing subscriber position file: %w", err) } - return pos, err + return pos, nil } func writeSubscriberPosition(storageDir string, pos pubsub.SubscriberPosition) error { From 348012bb6299e90af1bd0013d0f539a530bac996 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:23:01 -0500 Subject: [PATCH 026/133] [updatecli] Bump elastic stack version to 8.14.0-892e41b3 (#12765) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 718fb6972f8..eb3fac04ca8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-14244116-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-892e41b3-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-14244116-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-892e41b3-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-14244116-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-892e41b3-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index bc67f3ac145..dff0c2807a8 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-14244116-SNAPSHOT + version: 8.14.0-892e41b3-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 8dce56c355b..b0f029474ce 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-14244116-SNAPSHOT + version: 8.14.0-892e41b3-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 46551fdbea0..cc77e7a442d 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-14244116-SNAPSHOT + version: 8.14.0-892e41b3-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From ef500676e24333fcfeec72f4fbf5ca5e524eb6c6 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:46:31 -0500 Subject: [PATCH 027/133] chore: Update to elastic/beats@5f1e656e06fc (#12760) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 7fe258aa8a2..e43d7f3103e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240226111616-0361e30247f8 +Version: v7.0.0-alpha2.0.20240304124520-5f1e656e06fc Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240226111616-0361e30247f8/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240304124520-5f1e656e06fc/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 297ad676714..5c44c364061 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240226111616-0361e30247f8 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304124520-5f1e656e06fc github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index b7964b4e599..c35bfdf303f 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240226111616-0361e30247f8 h1:FgAcDT2NHYL8A/WFUaSJGBpbBaplg05UZz5Sm6cNzn0= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240226111616-0361e30247f8/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304124520-5f1e656e06fc h1:cZxf/fVKGyBYIFihv08ZlIMT5r79+IzEdUezYPjBvS4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304124520-5f1e656e06fc/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= From 4b9be178df4a7de480cfd439dc4de1a5c2de9eab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:22:12 +0000 Subject: [PATCH 028/133] build(deps): bump the jaeger group with 1 update (#12769) * build(deps): bump the jaeger group with 1 update Bumps the jaeger group with 1 update: [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib). Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger` from 0.95.0 to 0.96.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.95.0...v0.96.0) --- updated-dependencies: - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger dependency-type: direct:production update-type: version-update:semver-minor dependency-group: jaeger ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 32 ++++++++++++++++---------------- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e43d7f3103e..59e8882771f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3672,11 +3672,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/reflect2@v1.0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger -Version: v0.95.0 +Version: v0.96.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.95.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.96.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5497,11 +5497,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/consumer -Version: v0.95.0 +Version: v0.96.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.95.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.96.0/LICENSE: Apache License @@ -5709,11 +5709,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/pdata -Version: v1.2.0 +Version: v1.3.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.2.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.3.0/LICENSE: Apache License @@ -13875,11 +13875,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/concurrent@v0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal -Version: v0.95.0 +Version: v0.96.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.95.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.96.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14162,11 +14162,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/prometheus/client_golang -Version: v1.18.0 +Version: v1.19.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.18.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.19.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14373,11 +14373,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golan -------------------------------------------------------------------------------- Dependency : github.com/prometheus/client_model -Version: v0.5.0 +Version: v0.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model@v0.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model@v0.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14584,11 +14584,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model -------------------------------------------------------------------------------- Dependency : github.com/prometheus/common -Version: v0.46.0 +Version: v0.48.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.46.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.48.0/LICENSE: Apache License Version 2.0, January 2004 @@ -16698,11 +16698,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.2/LICENS -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/semconv -Version: v0.95.0 +Version: v0.96.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.95.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.96.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index 5c44c364061..3740b715540 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/jaegertracing/jaeger v1.54.0 github.com/libp2p/go-reuseport v0.4.0 github.com/modern-go/reflect2 v1.0.2 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.95.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/ryanuber/go-glob v1.0.0 @@ -44,8 +44,8 @@ require ( go.elastic.co/apm/module/apmotel/v2 v2.4.8 go.elastic.co/apm/v2 v2.4.8 go.elastic.co/fastjson v1.3.0 - go.opentelemetry.io/collector/consumer v0.95.0 - go.opentelemetry.io/collector/pdata v1.2.0 + go.opentelemetry.io/collector/consumer v0.96.0 + go.opentelemetry.io/collector/pdata v1.3.0 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 @@ -124,14 +124,14 @@ require ( github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.95.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.18.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.46.0 // indirect + github.com/prometheus/client_golang v1.19.0 // indirect + github.com/prometheus/client_model v0.6.0 // indirect + github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect @@ -147,7 +147,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect go.elastic.co/apm/module/apmzap/v2 v2.4.8 // indirect go.elastic.co/ecszap v1.0.2 // indirect - go.opentelemetry.io/collector/semconv v0.95.0 // indirect + go.opentelemetry.io/collector/semconv v0.96.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/go.sum b/go.sum index c35bfdf303f..08dff76f3f2 100644 --- a/go.sum +++ b/go.sum @@ -395,10 +395,10 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.95.0 h1:rvP/CsLCRB4YhwUonXBepCFKD1JmvJx15u6q9uohx/s= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.95.0/go.mod h1:dYvTF19uK+adX9RXqVQnx3vMAuVw0K9UqSN5bIqZhKo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.95.0 h1:gx+zEjG3dYYqeRG/tUQ2KjIMIl9cRvtzuRXj/rbJyxU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.95.0/go.mod h1:QaMTCmd8RXl96lwYTuRVE49jotvp20rT30DZMRdb7O4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 h1:tyNJ1qYXm1jMJV2NbskYosfo7xIyRP7YvbdcvldXAeA= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0/go.mod h1:f3d2OcVhcMGgcMkyf614jPfAD8eE+zlJ6Pd5P43qWyI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 h1:nRk4vyYsMkFht1Mo3n1d2X7WxLex0LzIWtQhE5/c2P8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0/go.mod h1:XTq2FQlb1ao2NHoZvkBC+LPUdMO4DG/4FJ7LqAyE8YU= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= @@ -424,13 +424,13 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= +github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= -github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= +github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= +github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= +github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -542,12 +542,12 @@ go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= -go.opentelemetry.io/collector/consumer v0.95.0 h1:M/N5RDx8/6Hz5L1qWUXdtirtdoV8BEjIxCSdt6cCx+I= -go.opentelemetry.io/collector/consumer v0.95.0/go.mod h1:tM5aOolWS1zAByMbne2xVOkmVvZrF3VEKY6TkxhmkOs= -go.opentelemetry.io/collector/pdata v1.2.0 h1:N6VdyEFYJyoHIKqHd0F372eNVD5b+AbH0ZQf7Z2jJ9I= -go.opentelemetry.io/collector/pdata v1.2.0/go.mod h1:mKXb6527Syb8PT4P9CZOJNbkuHOHjjGTZNNwSKESJhc= -go.opentelemetry.io/collector/semconv v0.95.0 h1:Oa7NXmoatwKLS+RzuXtdjq9oXAeg8P0g3x238fKF0Do= -go.opentelemetry.io/collector/semconv v0.95.0/go.mod h1:zOm/U3pgMIWcvrcnPbR9Xx2HinoXj46ERMK8PUV9wrs= +go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= +go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= +go.opentelemetry.io/collector/pdata v1.3.0 h1:JRYN7tVHYFwmtQhIYbxWeiKSa2L1nCohyAs8sYqKFZo= +go.opentelemetry.io/collector/pdata v1.3.0/go.mod h1:t7W0Undtes53HODPdSujPLTnfSR5fzT+WpL+RTaaayo= +go.opentelemetry.io/collector/semconv v0.96.0 h1:DrZy8BpzJDnN2zFxXRj6BhfGYxNlqpFHBqyuS9fVHRY= +go.opentelemetry.io/collector/semconv v0.96.0/go.mod h1:zOm/U3pgMIWcvrcnPbR9Xx2HinoXj46ERMK8PUV9wrs= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= From 1a1fae85ef991a7788cc6b8859c765dc05db59a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 20:01:34 +0000 Subject: [PATCH 029/133] build(deps): bump the golang-org-x group with 1 update (#12770) * build(deps): bump the golang-org-x group with 1 update Bumps the golang-org-x group with 1 update: [golang.org/x/term](https://github.com/golang/term). Updates `golang.org/x/term` from 0.17.0 to 0.18.0 - [Commits](https://github.com/golang/term/compare/v0.17.0...v0.18.0) --- updated-dependencies: - dependency-name: golang.org/x/term dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 59e8882771f..4081dbad0e9 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6685,11 +6685,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/term -Version: v0.17.0 +Version: v0.18.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.17.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.18.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17435,11 +17435,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sys -Version: v0.17.0 +Version: v0.18.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.17.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.18.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index 3740b715540..a2224b7196e 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/net v0.21.0 golang.org/x/sync v0.6.0 - golang.org/x/term v0.17.0 + golang.org/x/term v0.18.0 golang.org/x/time v0.5.0 google.golang.org/grpc v1.62.0 google.golang.org/protobuf v1.32.0 @@ -154,7 +154,7 @@ require ( golang.org/x/crypto v0.19.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect diff --git a/go.sum b/go.sum index 08dff76f3f2..45f209eb744 100644 --- a/go.sum +++ b/go.sum @@ -662,13 +662,13 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From 0c45b10417905576a883e48b4a0eee288b7aa7c7 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:37:35 -0500 Subject: [PATCH 030/133] chore: Update to elastic/beats@d23b4d336221 (#12775) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 4081dbad0e9..441b91f0ea7 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240304124520-5f1e656e06fc +Version: v7.0.0-alpha2.0.20240304175137-d23b4d336221 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240304124520-5f1e656e06fc/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240304175137-d23b4d336221/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index a2224b7196e..e9765461b22 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304124520-5f1e656e06fc + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304175137-d23b4d336221 github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 diff --git a/go.sum b/go.sum index 45f209eb744..2fee87bb2a7 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304124520-5f1e656e06fc h1:cZxf/fVKGyBYIFihv08ZlIMT5r79+IzEdUezYPjBvS4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304124520-5f1e656e06fc/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304175137-d23b4d336221 h1:0uR+d/Pj2ecSZIRz0bGdj5NxtlvmmepZGDNUdaHiJT4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304175137-d23b4d336221/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= @@ -764,8 +764,6 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= From 2fb7fbdff2a291a3b68db44c774a149b85f8573e Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:56:42 -0500 Subject: [PATCH 031/133] [updatecli] Bump elastic stack version to 8.14.0-1dcb9209 (#12774) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index eb3fac04ca8..a063634cb47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-892e41b3-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-1dcb9209-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-892e41b3-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-1dcb9209-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-892e41b3-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-1dcb9209-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index dff0c2807a8..03a843ad172 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-892e41b3-SNAPSHOT + version: 8.14.0-1dcb9209-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index b0f029474ce..bf74cde4bb9 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-892e41b3-SNAPSHOT + version: 8.14.0-1dcb9209-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index cc77e7a442d..470c6686381 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-892e41b3-SNAPSHOT + version: 8.14.0-1dcb9209-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 4faea0910732a254c070b4b2b8a17b80e4fecb1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:51:58 +0000 Subject: [PATCH 032/133] build(deps): bump the golang-org-x group with 1 update (#12779) * build(deps): bump the golang-org-x group with 1 update Bumps the golang-org-x group with 1 update: [golang.org/x/net](https://github.com/golang/net). Updates `golang.org/x/net` from 0.21.0 to 0.22.0 - [Commits](https://github.com/golang/net/compare/v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 441b91f0ea7..c79ce89e8f9 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6611,11 +6611,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.21.0 +Version: v0.22.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.21.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.22.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17361,11 +17361,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/crypto -Version: v0.19.0 +Version: v0.21.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.19.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.21.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index e9765461b22..afc4bd13f01 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.24.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 - golang.org/x/net v0.21.0 + golang.org/x/net v0.22.0 golang.org/x/sync v0.6.0 golang.org/x/term v0.18.0 golang.org/x/time v0.5.0 @@ -151,7 +151,7 @@ require ( go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.19.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/sys v0.18.0 // indirect diff --git a/go.sum b/go.sum index 2fee87bb2a7..80bec1ba581 100644 --- a/go.sum +++ b/go.sum @@ -580,8 +580,8 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= @@ -616,8 +616,8 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= From 652af44ef55ba4b3a4558ede7caa7702826e24a1 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Mon, 18 Mar 2024 17:41:41 +0800 Subject: [PATCH 033/133] .github: fix benchmark workflow? (#12806) --- .github/workflows/benchmarks.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index d20a7c35178..033c239e487 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -106,7 +106,7 @@ jobs: run: make apmbench $SSH_KEY terraform.tfvars - name: Override docker committed version - if: ${{ !github.event.inputs.runOnStable }} + if: ${{ ! inputs.runOnStable }} run: make docker-override-committed-version - name: Spin up benchmark environment @@ -118,11 +118,11 @@ jobs: echo "-> infra setup done" - name: Run benchmarks autotuned - if: ${{ github.event.inputs.benchmarkAgents == '' }} + if: ${{ inputs.benchmarkAgents == '' }} run: make run-benchmark-autotuned index-benchmark-results - name: Run benchmarks self tuned - if: ${{ github.event.inputs.benchmarkAgents != '' }} + if: ${{ inputs.benchmarkAgents != '' }} run: make run-benchmark index-benchmark-results - name: Download PNG From 807b05caf4753c2a6ee1ccc0aba0c95a776607f8 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 18 Mar 2024 11:02:41 +0100 Subject: [PATCH 034/133] security: add permissions block to workflows (#12672) * security: add permissions block to workflows * Update .github/workflows/test-reporter.yml --- .github/workflows/add-to-docs-project.yml | 3 +++ .github/workflows/add-to-project.yml | 3 +++ .github/workflows/benchmarks.yml | 3 +++ .github/workflows/terraform-fmt.yml | 3 +++ .github/workflows/test-reporter.yml | 5 +++++ 5 files changed, 17 insertions(+) diff --git a/.github/workflows/add-to-docs-project.yml b/.github/workflows/add-to-docs-project.yml index c6af3d80218..85125dc1bc3 100644 --- a/.github/workflows/add-to-docs-project.yml +++ b/.github/workflows/add-to-docs-project.yml @@ -3,6 +3,9 @@ on: issues: types: - labeled +permissions: + contents: read + jobs: add_to_project: runs-on: ubuntu-latest diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 62fd964b282..c2cabf4a250 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -6,6 +6,9 @@ on: - opened - transferred +permissions: + contents: read + jobs: add-to-project: name: Add issue to project diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 033c239e487..a51286ff618 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -28,6 +28,9 @@ env: BENCHMARK_RESULT: benchmark-result.txt WORKING_DIRECTORY: testing/benchmark +permissions: + contents: read + jobs: benchmarks: runs-on: ubuntu-latest diff --git a/.github/workflows/terraform-fmt.yml b/.github/workflows/terraform-fmt.yml index 2d610adb1b1..2234a4346e1 100644 --- a/.github/workflows/terraform-fmt.yml +++ b/.github/workflows/terraform-fmt.yml @@ -9,6 +9,9 @@ on: - '**.tf' merge_group: +permissions: + contents: read + jobs: terraform-fmt: runs-on: ubuntu-latest diff --git a/.github/workflows/test-reporter.yml b/.github/workflows/test-reporter.yml index c99e69979a2..03ec90e6717 100644 --- a/.github/workflows/test-reporter.yml +++ b/.github/workflows/test-reporter.yml @@ -7,6 +7,11 @@ on: types: - completed +permissions: + contents: read + actions: read + checks: write + jobs: system-test-results: runs-on: ubuntu-latest From 5a92e73509b638314fc04399ef3f206b5ba7f9ca Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:57:52 -0400 Subject: [PATCH 035/133] [updatecli] Update to elastic/beats@093ab5e824dd (#12780) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@ae312c5b288c Made with ❤️️ by updatecli * chore: Update to elastic/beats@07e231bd3842 Made with ❤️️ by updatecli * chore: Update to elastic/beats@ca07b8e680c9 Made with ❤️️ by updatecli * chore: Update to elastic/beats@7987272fc0dd Made with ❤️️ by updatecli * chore: Update to elastic/beats@843010c1cbdd Made with ❤️️ by updatecli * chore: Update to elastic/beats@8e790dec0ea0 Made with ❤️️ by updatecli * chore: Update to elastic/beats@e0675778b8ee Made with ❤️️ by updatecli * chore: Update to elastic/beats@9c9ae3568309 Made with ❤️️ by updatecli * chore: Update to elastic/beats@093ab5e824dd Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 27 +++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c79ce89e8f9..8eee72600e7 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240304175137-d23b4d336221 +Version: v7.0.0-alpha2.0.20240318132837-093ab5e824dd Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240304175137-d23b4d336221/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240318132837-093ab5e824dd/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of @@ -1040,11 +1040,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.9.1 +Version: v0.9.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.9.1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.9.2/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index afc4bd13f01..b166403d6ee 100644 --- a/go.mod +++ b/go.mod @@ -10,10 +10,10 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304175137-d23b4d336221 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240318132837-093ab5e824dd github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 - github.com/elastic/elastic-agent-system-metrics v0.9.1 + github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v1.0.0 github.com/elastic/go-elasticsearch/v8 v8.12.1 diff --git a/go.sum b/go.sum index 80bec1ba581..56b80430ea6 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,16 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/Azure/azure-sdk-for-go v59.0.0+incompatible h1:I1ULJqny1qQhUBFy11yDXHhW3pLvbhwV0PTn7mjp9V0= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 h1:fb8kj/Dh4CSwgsOzHeZY4Xh68cFVbzXx+ONXGMY//4w= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3qKzmAucSi51+SP1OhohieR821Q= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 h1:d81/ng9rET2YqdVkVwkb6EXeRrLJIwyGnJcAlAWKwhs= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.6.0 h1:AAIdAyPkFff6XTct2lQCxOWN/+LnA41S7kIkzKaMbyE= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.6.0/go.mod h1:noQIdW75SiQFB3mSFJBr4iRRH83S9skaFiBv4C0uEs0= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= @@ -134,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304175137-d23b4d336221 h1:0uR+d/Pj2ecSZIRz0bGdj5NxtlvmmepZGDNUdaHiJT4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240304175137-d23b4d336221/go.mod h1:DfXi6JrMZWNtWcB5s2haSTGg13046LR4qOP0JfGrq18= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240318132837-093ab5e824dd h1:EQQdCk3Ng7DHwwCTo2lfrC0jaWnO/UZ1eKx1wPgBt2E= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240318132837-093ab5e824dd/go.mod h1:6G1E7hIlCU2iZbLakTu9pjVOKpmN1Dwg3ad6yZdUhH0= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= @@ -144,8 +155,8 @@ github.com/elastic/elastic-agent-libs v0.7.5 h1:4UMqB3BREvhwecYTs/L23oQp1hs/XUkc github.com/elastic/elastic-agent-libs v0.7.5/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= -github.com/elastic/elastic-agent-system-metrics v0.9.1 h1:r0ofKHgPpl+W09ie7tzGcCDC0d4NZbQUv37rSgHf4FM= -github.com/elastic/elastic-agent-system-metrics v0.9.1/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= +github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= +github.com/elastic/elastic-agent-system-metrics v0.9.2/go.mod h1:VfJnKw4Jqrd9ddljXCwaGKJgN+7ADyyGk089NaXVsf0= github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM89+hdgcymI+KzJCGE= github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= @@ -224,6 +235,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -262,6 +275,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20230426061923-93006964c1fc h1:AGDHt781oIcL4EFk7cPnvBUYTwU8BEU6GDTO3ZMn1sE= github.com/google/pprof v0.0.0-20230426061923-93006964c1fc/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= @@ -350,6 +365,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s= @@ -413,6 +430,8 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From a1b3a818f7ec8a63fe1478eadfb80483342b921d Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:00:17 -0400 Subject: [PATCH 036/133] [updatecli] Bump elastic stack version to 8.14.0-09a11c1c (#12781) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a063634cb47..952d77b2538 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-1dcb9209-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-09a11c1c-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-1dcb9209-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-09a11c1c-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-1dcb9209-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-09a11c1c-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 03a843ad172..a6181a7e930 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-1dcb9209-SNAPSHOT + version: 8.14.0-09a11c1c-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index bf74cde4bb9..afdd14459cf 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-1dcb9209-SNAPSHOT + version: 8.14.0-09a11c1c-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 470c6686381..4841c173bef 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-1dcb9209-SNAPSHOT + version: 8.14.0-09a11c1c-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From f1a4ecaf9fe3204e5adc66aa1b50ab508bb97967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 19:04:35 +0000 Subject: [PATCH 037/133] build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 in /tools (#12798) * build(deps): bump google.golang.org/protobuf in /tools Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index b4891e58088..bbe9f4bd7ff 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -140,7 +140,7 @@ require ( golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tools/go.sum b/tools/go.sum index a8ac4d0620f..1f0dd1a2363 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -2735,8 +2735,8 @@ google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QO google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From de4a52c19a46ae440aa45cb9507637aebf57b4b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:09:24 +0000 Subject: [PATCH 038/133] build(deps): bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /systemtest (#12797) * build(deps): bump google.golang.org/protobuf in /systemtest Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- systemtest/go.mod | 2 +- systemtest/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/systemtest/go.mod b/systemtest/go.mod index c22780a94d5..e0a3c2d52eb 100644 --- a/systemtest/go.mod +++ b/systemtest/go.mod @@ -100,7 +100,7 @@ require ( golang.org/x/tools v0.12.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect howett.net/plist v1.0.0 // indirect ) diff --git a/systemtest/go.sum b/systemtest/go.sum index 1b010c14fc7..439d720635e 100644 --- a/systemtest/go.sum +++ b/systemtest/go.sum @@ -252,8 +252,8 @@ google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 3e02db4e343323b2cd4ebc015f2470339de477b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:15:49 +0000 Subject: [PATCH 039/133] build(deps): bump the jaeger group with 1 update (#12789) * build(deps): bump the jaeger group with 1 update Bumps the jaeger group with 1 update: [github.com/jaegertracing/jaeger](https://github.com/jaegertracing/jaeger). Updates `github.com/jaegertracing/jaeger` from 1.54.0 to 1.55.0 - [Release notes](https://github.com/jaegertracing/jaeger/releases) - [Changelog](https://github.com/jaegertracing/jaeger/blob/main/CHANGELOG.md) - [Commits](https://github.com/jaegertracing/jaeger/compare/v1.54.0...v1.55.0) --- updated-dependencies: - dependency-name: github.com/jaegertracing/jaeger dependency-type: direct:production update-type: version-update:semver-minor dependency-group: jaeger ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 20 ++++++++++---------- go.mod | 10 +++++----- go.sum | 24 ++++++++++++------------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 8eee72600e7..5240ee0687c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3228,11 +3228,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------------------- Dependency : github.com/jaegertracing/jaeger -Version: v1.54.0 +Version: v1.55.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/jaegertracing/jaeger@v1.54.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/jaegertracing/jaeger@v1.55.0/LICENSE: Apache License Version 2.0, January 2004 @@ -9065,11 +9065,11 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -------------------------------------------------------------------------------- Dependency : github.com/eapache/go-resiliency -Version: v1.4.0 +Version: v1.5.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/eapache/go-resiliency@v1.4.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/eapache/go-resiliency@v1.5.0/LICENSE: The MIT License (MIT) @@ -13211,11 +13211,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/klauspost/compress -Version: v1.17.4 +Version: v1.17.6 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/klauspost/compress@v1.17.4/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/klauspost/compress@v1.17.6/LICENSE: Copyright (c) 2012 The Go Authors. All rights reserved. Copyright (c) 2019 Klaus Post. All rights reserved. @@ -14124,11 +14124,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/pierrec/lz4/v4 -Version: v4.1.18 +Version: v4.1.21 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.18/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.21/LICENSE: Copyright (c) 2015, Pierre Curto All rights reserved. @@ -14584,11 +14584,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model -------------------------------------------------------------------------------- Dependency : github.com/prometheus/common -Version: v0.48.0 +Version: v0.49.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.48.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.49.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index b166403d6ee..440f471a0f6 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 - github.com/jaegertracing/jaeger v1.54.0 + github.com/jaegertracing/jaeger v1.55.0 github.com/libp2p/go-reuseport v0.4.0 github.com/modern-go/reflect2 v1.0.2 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 @@ -84,7 +84,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/dop251/goja v0.0.0-20230427124612-428fc442ff5f // indirect github.com/dop251/goja_nodejs v0.0.0-20230322100729-2550c7b6c124 // indirect - github.com/eapache/go-resiliency v1.4.0 // indirect + github.com/eapache/go-resiliency v1.5.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 // indirect @@ -116,7 +116,7 @@ require ( github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.6 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect @@ -126,12 +126,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/common v0.49.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect diff --git a/go.sum b/go.sum index 56b80430ea6..c301f5e733a 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.4.0 h1:3OK9bWpPk5q6pbFAaYSEwD9CLUSHG8bnZuqX2yMt3B0= -github.com/eapache/go-resiliency v1.4.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-resiliency v1.5.0 h1:dRsaR00whmQD+SgVKlq/vCRFNgtEb5yppyeVos3Yce0= +github.com/eapache/go-resiliency v1.5.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= @@ -311,8 +311,8 @@ github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbk github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= -github.com/jaegertracing/jaeger v1.54.0 h1:BfQiFxrE/2Fw+qU24qjSuUGsgJQLwKHi1TXBy6J3qKo= -github.com/jaegertracing/jaeger v1.54.0/go.mod h1:wNmtyrAJ/sJAgOvC9BltyKErJY8glTHCvWLTsvhaqkY= +github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= +github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -353,8 +353,8 @@ github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= +github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -426,8 +426,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9 github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= @@ -448,8 +448,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= +github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -638,8 +638,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From a7c427276f8caafea4d223ad9be6beb876a15b0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:35:42 +0000 Subject: [PATCH 040/133] build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 (#12787) * build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 5240ee0687c..f6650bff1e8 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6971,11 +6971,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.62.0/LIC -------------------------------------------------------------------------------- Dependency : google.golang.org/protobuf -Version: v1.32.0 +Version: v1.33.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.32.0/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.33.0/LICENSE: Copyright (c) 2018 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index 440f471a0f6..86ff4108404 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( golang.org/x/term v0.18.0 golang.org/x/time v0.5.0 google.golang.org/grpc v1.62.0 - google.golang.org/protobuf v1.32.0 + google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index c301f5e733a..f2140485bdb 100644 --- a/go.sum +++ b/go.sum @@ -744,8 +744,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 58ad470767c69bbcdeee6bbc2e2a72cd41cfc2f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 00:58:57 +0000 Subject: [PATCH 041/133] build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1 (#12786) * build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.62.0 to 1.62.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.62.0...v1.62.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index f6650bff1e8..1fbc32b84bd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6759,11 +6759,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/grpc -Version: v1.62.0 +Version: v1.62.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.62.0/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.62.1/LICENSE: Apache License diff --git a/go.mod b/go.mod index 86ff4108404..8b940d45382 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( golang.org/x/sync v0.6.0 golang.org/x/term v0.18.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.62.0 + google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index f2140485bdb..a4dad9c6ed0 100644 --- a/go.sum +++ b/go.sum @@ -732,8 +732,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk= -google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27 h1:EB/3dtnYKOItaNPpOI/HmOCGbVZUiXcstRfiuxN+cFg= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27/go.mod h1:Crtq1t+mykyL5d6PR3z8zCxKx/Qjq/mlPWDPoWJANYA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From 6e241f7a522dd3ea85c504ae10045bb5a1e6fcb5 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:46:27 -0400 Subject: [PATCH 042/133] chore: Update to elastic/beats@1b13c648feef (#12810) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 1fbc32b84bd..6496abe4ca8 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240318132837-093ab5e824dd +Version: v7.0.0-alpha2.0.20240319130044-1b13c648feef Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240318132837-093ab5e824dd/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240319130044-1b13c648feef/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of @@ -2096,11 +2096,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-ucfg -Version: v0.8.6 +Version: v0.8.7 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.6/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.7/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 8b940d45382..86ba247a518 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240318132837-093ab5e824dd + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240319130044-1b13c648feef github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.2 @@ -18,7 +18,7 @@ require ( github.com/elastic/go-docappender v1.0.0 github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-sysinfo v1.13.1 - github.com/elastic/go-ucfg v0.8.6 + github.com/elastic/go-ucfg v0.8.7 github.com/go-sourcemap/sourcemap v2.1.3+incompatible github.com/gofrs/flock v0.8.1 github.com/gofrs/uuid v4.4.0+incompatible diff --git a/go.sum b/go.sum index a4dad9c6ed0..55921dca220 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240318132837-093ab5e824dd h1:EQQdCk3Ng7DHwwCTo2lfrC0jaWnO/UZ1eKx1wPgBt2E= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240318132837-093ab5e824dd/go.mod h1:6G1E7hIlCU2iZbLakTu9pjVOKpmN1Dwg3ad6yZdUhH0= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240319130044-1b13c648feef h1:0Jyb62J1B+/bKfTFgB8f+89m+sZSmh9g101SY4JWQaY= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240319130044-1b13c648feef/go.mod h1:2l168s9POU+PmSpGOVSwbCkJGwlh04AL929k6tK7/sU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= @@ -171,8 +171,8 @@ github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gn github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.13.1 h1:U5Jlx6c/rLkR72O8wXXXo1abnGlWGJU/wbzNJ2AfQa4= github.com/elastic/go-sysinfo v1.13.1/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ= -github.com/elastic/go-ucfg v0.8.6 h1:stUeyh2goTgGX+/wb9gzKvTv0YB0231LTpKUgCKj4U0= -github.com/elastic/go-ucfg v0.8.6/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= +github.com/elastic/go-ucfg v0.8.7 h1:/bKaN553LY3MsfEIz2XOEEs+tRw03TzJCARrnVPpOyc= +github.com/elastic/go-ucfg v0.8.7/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4= From 66b7fc383433a6e222b81206bf929dbbc2cf2219 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:06:53 -0400 Subject: [PATCH 043/133] [updatecli] Bump elastic stack version to 8.14.0-892adbf2 (#12809) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 952d77b2538..312d50d117b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-09a11c1c-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-892adbf2-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-09a11c1c-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-892adbf2-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-09a11c1c-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-892adbf2-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index a6181a7e930..fcebd4fbda2 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-09a11c1c-SNAPSHOT + version: 8.14.0-892adbf2-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index afdd14459cf..73da28276f7 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-09a11c1c-SNAPSHOT + version: 8.14.0-892adbf2-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 4841c173bef..e1d8cf68526 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-09a11c1c-SNAPSHOT + version: 8.14.0-892adbf2-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 8d4f944f28de18aa671dc8cd8f6f1c031ba68870 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 18:09:53 +0000 Subject: [PATCH 044/133] build(deps): bump github.com/elastic/go-ucfg from 0.8.7 to 0.8.8 (#12819) * build(deps): bump github.com/elastic/go-ucfg from 0.8.7 to 0.8.8 Bumps [github.com/elastic/go-ucfg](https://github.com/elastic/go-ucfg) from 0.8.7 to 0.8.8. - [Release notes](https://github.com/elastic/go-ucfg/releases) - [Changelog](https://github.com/elastic/go-ucfg/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/go-ucfg/compare/v0.8.7...v0.8.8) --- updated-dependencies: - dependency-name: github.com/elastic/go-ucfg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 6496abe4ca8..70a18d1b4ef 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2096,11 +2096,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-ucfg -Version: v0.8.7 +Version: v0.8.8 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.7/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.8/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 86ba247a518..4f008794134 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/elastic/go-docappender v1.0.0 github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-sysinfo v1.13.1 - github.com/elastic/go-ucfg v0.8.7 + github.com/elastic/go-ucfg v0.8.8 github.com/go-sourcemap/sourcemap v2.1.3+incompatible github.com/gofrs/flock v0.8.1 github.com/gofrs/uuid v4.4.0+incompatible diff --git a/go.sum b/go.sum index 55921dca220..df380cb0e0d 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gn github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.13.1 h1:U5Jlx6c/rLkR72O8wXXXo1abnGlWGJU/wbzNJ2AfQa4= github.com/elastic/go-sysinfo v1.13.1/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ= -github.com/elastic/go-ucfg v0.8.7 h1:/bKaN553LY3MsfEIz2XOEEs+tRw03TzJCARrnVPpOyc= -github.com/elastic/go-ucfg v0.8.7/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= +github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk= +github.com/elastic/go-ucfg v0.8.8/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4= From 61448d1e3202218303aa795c3b14144bc9723c8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:31:09 +0000 Subject: [PATCH 045/133] build(deps): bump github.com/go-sourcemap/sourcemap from 2.1.3+incompatible to 2.1.4+incompatible (#12817) * build(deps): bump github.com/go-sourcemap/sourcemap Bumps [github.com/go-sourcemap/sourcemap](https://github.com/go-sourcemap/sourcemap) from 2.1.3+incompatible to 2.1.4+incompatible. - [Commits](https://github.com/go-sourcemap/sourcemap/compare/v2.1.3...v2.1.4) --- updated-dependencies: - dependency-name: github.com/go-sourcemap/sourcemap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 70a18d1b4ef..c2436d949ab 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2307,11 +2307,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.8/ -------------------------------------------------------------------------------- Dependency : github.com/go-sourcemap/sourcemap -Version: v2.1.3+incompatible +Version: v2.1.4+incompatible Licence type (autodetected): BSD-2-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/go-sourcemap/sourcemap@v2.1.3+incompatible/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-sourcemap/sourcemap@v2.1.4+incompatible/LICENSE: Copyright (c) 2016 The github.com/go-sourcemap/sourcemap Contributors. All rights reserved. diff --git a/go.mod b/go.mod index 4f008794134..fdfeed3221f 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-sysinfo v1.13.1 github.com/elastic/go-ucfg v0.8.8 - github.com/go-sourcemap/sourcemap v2.1.3+incompatible + github.com/go-sourcemap/sourcemap v2.1.4+incompatible github.com/gofrs/flock v0.8.1 github.com/gofrs/uuid v4.4.0+incompatible github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index df380cb0e0d..85d7599653c 100644 --- a/go.sum +++ b/go.sum @@ -218,8 +218,8 @@ github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZ github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= -github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= +github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q= +github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= From 9b06eedb8940adaefba3bf8bd2a7a0e58f233170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:54:20 +0000 Subject: [PATCH 046/133] build(deps): bump the go-agent group with 6 updates (#12816) * build(deps): bump the go-agent group with 6 updates Bumps the go-agent group with 6 updates: | Package | From | To | | --- | --- | --- | | [go.elastic.co/apm/module/apmelasticsearch/v2](https://github.com/elastic/apm-agent-go) | `2.4.8` | `2.5.0` | | [go.elastic.co/apm/module/apmgorilla/v2](https://github.com/elastic/apm-agent-go) | `2.4.8` | `2.5.0` | | [go.elastic.co/apm/module/apmgrpc/v2](https://github.com/elastic/apm-agent-go) | `2.4.8` | `2.5.0` | | [go.elastic.co/apm/module/apmhttp/v2](https://github.com/elastic/apm-agent-go) | `2.4.8` | `2.5.0` | | [go.elastic.co/apm/module/apmotel/v2](https://github.com/elastic/apm-agent-go) | `2.4.8` | `2.5.0` | | [go.elastic.co/apm/v2](https://github.com/elastic/apm-agent-go) | `2.4.8` | `2.5.0` | Updates `go.elastic.co/apm/module/apmelasticsearch/v2` from 2.4.8 to 2.5.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.4.8...v2.5.0) Updates `go.elastic.co/apm/module/apmgorilla/v2` from 2.4.8 to 2.5.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.4.8...v2.5.0) Updates `go.elastic.co/apm/module/apmgrpc/v2` from 2.4.8 to 2.5.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.4.8...v2.5.0) Updates `go.elastic.co/apm/module/apmhttp/v2` from 2.4.8 to 2.5.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.4.8...v2.5.0) Updates `go.elastic.co/apm/module/apmotel/v2` from 2.4.8 to 2.5.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.4.8...v2.5.0) Updates `go.elastic.co/apm/v2` from 2.4.8 to 2.5.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.4.8...v2.5.0) --- updated-dependencies: - dependency-name: go.elastic.co/apm/module/apmelasticsearch/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmgorilla/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmgrpc/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmhttp/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmotel/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 24 ++++++++++++------------ go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c2436d949ab..dff5c0c9dfc 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -4198,11 +4198,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmelasticsearch/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 @@ -4409,11 +4409,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmgorilla/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 @@ -4620,11 +4620,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorill -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmgrpc/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 @@ -4831,11 +4831,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmhttp/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5042,11 +5042,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmotel/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5253,11 +5253,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index fdfeed3221f..93ce2ba27de 100644 --- a/go.mod +++ b/go.mod @@ -37,12 +37,12 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8 - go.elastic.co/apm/module/apmgorilla/v2 v2.4.8 - go.elastic.co/apm/module/apmgrpc/v2 v2.4.8 - go.elastic.co/apm/module/apmhttp/v2 v2.4.8 - go.elastic.co/apm/module/apmotel/v2 v2.4.8 - go.elastic.co/apm/v2 v2.4.8 + go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 + go.elastic.co/apm/module/apmgorilla/v2 v2.5.0 + go.elastic.co/apm/module/apmgrpc/v2 v2.5.0 + go.elastic.co/apm/module/apmhttp/v2 v2.5.0 + go.elastic.co/apm/module/apmotel/v2 v2.5.0 + go.elastic.co/apm/v2 v2.5.0 go.elastic.co/fastjson v1.3.0 go.opentelemetry.io/collector/consumer v0.96.0 go.opentelemetry.io/collector/pdata v1.3.0 diff --git a/go.sum b/go.sum index 85d7599653c..52064110a11 100644 --- a/go.sum +++ b/go.sum @@ -543,20 +543,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8 h1:4j3wI1e+WV6u+9ZR7lorkJI2rnJfjOWtkMeZG08PbRI= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.4.8/go.mod h1:C9ajbSjZ3akTrFOjBr+pMq8bPVOH9vhIG+knZAuPW3s= -go.elastic.co/apm/module/apmgorilla/v2 v2.4.8 h1:Yulr18ASd4fK3nzQsCxGgFSE4bbS8nouQlS1/ZgmDRs= -go.elastic.co/apm/module/apmgorilla/v2 v2.4.8/go.mod h1:Ot65wffFOTJlXL6ugbCM7d81sxYVof1SiMj8kpNTYgk= -go.elastic.co/apm/module/apmgrpc/v2 v2.4.8 h1:V9WodJVrBsSP0zJ1NHuU3cyo0X8PSEOiFd6ZMNnUZBw= -go.elastic.co/apm/module/apmgrpc/v2 v2.4.8/go.mod h1:jw743gRa7FGsp7LITqx+lfj5qrEVc/m+4QbT9sOTx40= -go.elastic.co/apm/module/apmhttp/v2 v2.4.8 h1:C1piLq4wcFHFB7jpFW1WPEyEl6zbRpf9SAY8S8tX7Qk= -go.elastic.co/apm/module/apmhttp/v2 v2.4.8/go.mod h1:FzO5ptAs5oKB3xE1/hpxMA0a7mLIycp2RZdBtp4+uTA= -go.elastic.co/apm/module/apmotel/v2 v2.4.8 h1:XprKEoUFjcDFwWrmS56Go7D7Ndxa8uy+DVA4k1tItnY= -go.elastic.co/apm/module/apmotel/v2 v2.4.8/go.mod h1:NA3k4fTqsQhhZBlMOGJy8ol20tJKLafEDWAr5ELNpTg= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4= +go.elastic.co/apm/module/apmgorilla/v2 v2.5.0 h1:XeKkwqXWBEoU68AYPvFaOJYcs+c56S9sLV2wtRdwf3g= +go.elastic.co/apm/module/apmgorilla/v2 v2.5.0/go.mod h1:EORWcVUh8p3Z2d2GdoHMQs07fhkXRqV3lInehgMMnao= +go.elastic.co/apm/module/apmgrpc/v2 v2.5.0 h1:4wpg5I4KztfSFWw4pSU+EhpSeTdoZD3CPwfRmy62JKY= +go.elastic.co/apm/module/apmgrpc/v2 v2.5.0/go.mod h1:urZQQAB9p6J0uXmtK6YZE6nfmiY7JsxFbJXck495/Ls= +go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe4eySAnURo= +go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk= +go.elastic.co/apm/module/apmotel/v2 v2.5.0 h1:/U83qrMC7dEtByhrCNXqjLkwJ+krsp6bkLQEURJwYsI= +go.elastic.co/apm/module/apmotel/v2 v2.5.0/go.mod h1:v0m8Jq9VX5s9zasL35MGTVLMreT8BFOzEq+mTtHuF1I= go.elastic.co/apm/module/apmzap/v2 v2.4.8 h1:bU1ESD6Pm2cx1Nmlos0YRQQrdQoFynbYP3imTfIxee4= go.elastic.co/apm/module/apmzap/v2 v2.4.8/go.mod h1:+pWYgTIT9utt48DVOiBesXQZ3rOVERsE1cS+q0wUafo= -go.elastic.co/apm/v2 v2.4.8 h1:3RuqxDjhgumT1BYxJGnVPdGY12lCzF+KGyvtSTynCYo= -go.elastic.co/apm/v2 v2.4.8/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= +go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ= +go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= From 570960391c0754dcf0ac150ddcf9301648620225 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 19 Mar 2024 13:24:01 -0700 Subject: [PATCH 047/133] change headings to include `apm-` (#12820) --- CHANGELOG.asciidoc | 28 ++++++++++++++-------------- changelogs/8.0.asciidoc | 30 +++++++++++++++--------------- changelogs/8.1.asciidoc | 18 +++++++++--------- changelogs/8.10.asciidoc | 22 +++++++++++----------- changelogs/8.11.asciidoc | 22 +++++++++++----------- changelogs/8.12.asciidoc | 14 +++++++------- changelogs/8.13.asciidoc | 6 +++--- changelogs/8.2.asciidoc | 18 +++++++++--------- changelogs/8.3.asciidoc | 18 +++++++++--------- changelogs/8.4.asciidoc | 18 +++++++++--------- changelogs/8.5.asciidoc | 18 +++++++++--------- changelogs/8.6.asciidoc | 14 +++++++------- changelogs/8.7.asciidoc | 14 +++++++------- changelogs/8.8.asciidoc | 14 +++++++------- changelogs/8.9.asciidoc | 14 +++++++------- dev_docs/RELEASES.md | 6 +++--- 16 files changed, 137 insertions(+), 137 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 7de561ebddf..e57b067927a 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,18 +1,18 @@ // tag::list[] -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> // end::list[] // tag::includes[] diff --git a/changelogs/8.0.asciidoc b/changelogs/8.0.asciidoc index 9edc47f7a0b..3a18fbe9d89 100644 --- a/changelogs/8.0.asciidoc +++ b/changelogs/8.0.asciidoc @@ -1,16 +1,16 @@ -[[release-notes-8.0]] +[[apm-release-notes-8.0]] == APM version 8.0 -* <> -* <> -* <> -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.0.1]] +[[apm-release-notes-8.0.1]] === APM version 8.0.1 https://github.com/elastic/apm-server/compare/v8.0.0\...v8.0.1[View commits] @@ -23,7 +23,7 @@ https://github.com/elastic/apm-server/compare/v8.0.0\...v8.0.1[View commits] - Fix waiting for events to be flushed when shutting down APM Server {pull}7352[7352] [float] -[[release-notes-8.0.0]] +[[apm-release-notes-8.0.0]] === APM version 8.0.0 https://github.com/elastic/apm-server/compare/v7.16.3\...v8.0.0[View commits] @@ -88,7 +88,7 @@ releases of 8.0.0. - Updated the `x-pack` source files license to the Elastic License 2.0 {pull}6524[6524] [float] -[[release-notes-8.0.0-rc2]] +[[apm-release-notes-8.0.0-rc2]] === APM version 8.0.0-rc2 https://github.com/elastic/apm-server/compare/v8.0.0-rc1\...v8.0.0-rc2[View commits] @@ -96,7 +96,7 @@ https://github.com/elastic/apm-server/compare/v8.0.0-rc1\...v8.0.0-rc2[View comm No significant changes. [float] -[[release-notes-8.0.0-rc1]] +[[apm-release-notes-8.0.0-rc1]] === APM version 8.0.0-rc1 https://github.com/elastic/apm-server/compare/v8.0.0-beta1\...v8.0.0-rc1[View commits] @@ -147,7 +147,7 @@ https://github.com/elastic/apm-server/compare/v8.0.0-beta1\...v8.0.0-rc1[View co - Updated the `x-pack` source files license to the Elastic License 2.0 {pull}6524[6524] [float] -[[release-notes-8.0.0-beta1]] +[[apm-release-notes-8.0.0-beta1]] === APM version 8.0.0-beta1 https://github.com/elastic/apm-server/compare/v8.0.0-alpha2\...v8.0.0-beta1[View commits] @@ -161,7 +161,7 @@ https://github.com/elastic/apm-server/compare/v8.0.0-alpha2\...v8.0.0-beta1[View - Allow to overwrite `service.name` and `service.version` for metricset objects {pull}6407[6407] [float] -[[release-notes-8.0.0-alpha2]] +[[apm-release-notes-8.0.0-alpha2]] === APM version 8.0.0-alpha2 https://github.com/elastic/apm-server/compare/v8.0.0-alpha1\...v8.0.0-alpha2[View commits] @@ -169,7 +169,7 @@ https://github.com/elastic/apm-server/compare/v8.0.0-alpha1\...v8.0.0-alpha2[Vie No significant changes. [float] -[[release-notes-8.0.0-alpha1]] +[[apm-release-notes-8.0.0-alpha1]] === APM version 8.0.0-alpha1 [float] diff --git a/changelogs/8.1.asciidoc b/changelogs/8.1.asciidoc index 8676b67582d..217cc2f209d 100644 --- a/changelogs/8.1.asciidoc +++ b/changelogs/8.1.asciidoc @@ -1,13 +1,13 @@ -[[release-notes-8.1]] +[[apm-release-notes-8.1]] == APM version 8.1 -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.1.3]] +[[apm-release-notes-8.1.3]] === APM version 8.1.3 https://github.com/elastic/apm-server/compare/v8.1.2\...v8.1.3[View commits] @@ -20,7 +20,7 @@ Users running APM Server version 8.0.0 and above should upgrade immediately. - Fix a bug that caused the APM Server to run out of memory when it receives events from a high number of APM agents {pull}7809[7809] [float] -[[release-notes-8.1.2]] +[[apm-release-notes-8.1.2]] === APM version 8.1.2 https://github.com/elastic/apm-server/compare/v8.1.1\...v8.1.2[View commits] @@ -32,7 +32,7 @@ https://github.com/elastic/apm-server/compare/v8.1.1\...v8.1.2[View commits] - modelindexer: Fix indexing performance regression due to locking bug {pull}7649[7649] [float] -[[release-notes-8.1.1]] +[[apm-release-notes-8.1.1]] === APM version 8.1.1 https://github.com/elastic/apm-server/compare/v8.1.0\...v8.1.1[View commits] @@ -43,7 +43,7 @@ https://github.com/elastic/apm-server/compare/v8.1.0\...v8.1.1[View commits] [float] -[[release-notes-8.1.0]] +[[apm-release-notes-8.1.0]] === APM version 8.1.0 https://github.com/elastic/apm-server/compare/v8.0.1\...v8.1.0[View commits] diff --git a/changelogs/8.10.asciidoc b/changelogs/8.10.asciidoc index 5ad04cc9cfd..f6da24ef814 100644 --- a/changelogs/8.10.asciidoc +++ b/changelogs/8.10.asciidoc @@ -1,14 +1,14 @@ -[[release-notes-8.10]] +[[apm-release-notes-8.10]] == APM version 8.10 -* <> -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.10.4]] +[[apm-release-notes-8.10.4]] === APM version 8.10.4 https://github.com/elastic/apm-server/compare/v8.10.3\...v8.10.4[View commits] @@ -19,7 +19,7 @@ https://github.com/elastic/apm-server/compare/v8.10.3\...v8.10.4[View commits] - RPM package upgrade no longer overwrites the apm-server.yml config {pull}11808[11808] [float] -[[release-notes-8.10.3]] +[[apm-release-notes-8.10.3]] === APM version 8.10.3 https://github.com/elastic/apm-server/compare/v8.10.2\...v8.10.3[View commits] @@ -27,7 +27,7 @@ https://github.com/elastic/apm-server/compare/v8.10.2\...v8.10.3[View commits] No significant changes. [float] -[[release-notes-8.10.2]] +[[apm-release-notes-8.10.2]] === APM version 8.10.2 https://github.com/elastic/apm-server/compare/v8.10.1\...v8.10.2[View commits] @@ -35,7 +35,7 @@ https://github.com/elastic/apm-server/compare/v8.10.1\...v8.10.2[View commits] No significant changes. [float] -[[release-notes-8.10.1]] +[[apm-release-notes-8.10.1]] === APM version 8.10.1 https://github.com/elastic/apm-server/compare/v8.10.0\...v8.10.1[View commits] @@ -45,7 +45,7 @@ https://github.com/elastic/apm-server/compare/v8.10.0\...v8.10.1[View commits] Fix tail-based sampling discarding low throughput and low sample rate traces {pull}11642[11642] [float] -[[release-notes-8.10.0]] +[[apm-release-notes-8.10.0]] === APM version 8.10.0 https://github.com/elastic/apm-server/compare/v8.9.2\...v8.10.0[View commits] diff --git a/changelogs/8.11.asciidoc b/changelogs/8.11.asciidoc index a2cb9647e9c..e7263cb388a 100644 --- a/changelogs/8.11.asciidoc +++ b/changelogs/8.11.asciidoc @@ -1,14 +1,14 @@ -[[release-notes-8.11]] +[[apm-release-notes-8.11]] == APM version 8.11 -* <> -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.11.4]] +[[apm-release-notes-8.11.4]] === APM version 8.11.4 https://github.com/elastic/apm-server/compare/v8.11.3\...v8.11.4[View commits] @@ -18,7 +18,7 @@ https://github.com/elastic/apm-server/compare/v8.11.3\...v8.11.4[View commits] - Fix source maps not being applied when an event contains both a span and an error {pull}12221[12221] [float] -[[release-notes-8.11.3]] +[[apm-release-notes-8.11.3]] === APM version 8.11.3 https://github.com/elastic/apm-server/compare/v8.11.2\...v8.11.3[View commits] @@ -26,7 +26,7 @@ https://github.com/elastic/apm-server/compare/v8.11.2\...v8.11.3[View commits] No significant changes. [float] -[[release-notes-8.11.2]] +[[apm-release-notes-8.11.2]] === APM version 8.11.2 https://github.com/elastic/apm-server/compare/v8.11.1\...v8.11.2[View commits] @@ -34,7 +34,7 @@ https://github.com/elastic/apm-server/compare/v8.11.1\...v8.11.2[View commits] No significant changes. [float] -[[release-notes-8.11.1]] +[[apm-release-notes-8.11.1]] === APM version 8.11.1 https://github.com/elastic/apm-server/compare/v8.11.0\...v8.11.1[View commits] @@ -42,7 +42,7 @@ https://github.com/elastic/apm-server/compare/v8.11.0\...v8.11.1[View commits] No significant changes. [float] -[[release-notes-8.11.0]] +[[apm-release-notes-8.11.0]] === APM version 8.11.0 https://github.com/elastic/apm-server/compare/v8.10.4\...v8.11.0[View commits] diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index 2862e98a682..6626701d5fa 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -1,12 +1,12 @@ -[[release-notes-8.12]] +[[apm-release-notes-8.12]] == APM version 8.12 -* <> -* <> -* <> +* <> +* <> +* <> [float] -[[release-notes-8.12.2]] +[[apm-release-notes-8.12.2]] === APM version 8.12.2 https://github.com/elastic/apm-server/compare/v8.12.1\...v8.12.2[View commits] @@ -17,7 +17,7 @@ https://github.com/elastic/apm-server/compare/v8.12.1\...v8.12.2[View commits] - Define value for all constant_keyword fields in apmpackage to fix integration upgrade issues in rare cases {pull}12219[12219] [float] -[[release-notes-8.12.1]] +[[apm-release-notes-8.12.1]] === APM version 8.12.1 https://github.com/elastic/apm-server/compare/v8.12.0\...v8.12.1[View commits] @@ -35,7 +35,7 @@ https://github.com/elastic/apm-server/compare/v8.12.0\...v8.12.1[View commits] - Log a single consolidated line per unique error instead of per each failed document {pull}12179[12179] [float] -[[release-notes-8.12.0]] +[[apm-release-notes-8.12.0]] === APM version 8.12.0 https://github.com/elastic/apm-server/compare/v8.11.4\...v8.12.0[View commits] diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index 6bb901cbff4..2130d3304e8 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -1,12 +1,12 @@ -[[release-notes-8.13]] +[[apm-release-notes-8.13]] == APM version 8.13 https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] -* <> +* <> [float] -[[release-notes-8.13.0]] +[[apm-release-notes-8.13.0]] === APM version 8.13.0 [float] diff --git a/changelogs/8.2.asciidoc b/changelogs/8.2.asciidoc index 69dacf5dd0e..8880e090361 100644 --- a/changelogs/8.2.asciidoc +++ b/changelogs/8.2.asciidoc @@ -1,13 +1,13 @@ -[[release-notes-8.2]] +[[apm-release-notes-8.2]] == APM version 8.2 -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.2.3]] +[[apm-release-notes-8.2.3]] === APM version 8.2.3 https://github.com/elastic/apm-server/compare/v8.2.2\...v8.2.3[View commits] @@ -17,7 +17,7 @@ https://github.com/elastic/apm-server/compare/v8.2.2\...v8.2.3[View commits] - Added `tags` field mapping to `internal_metrics` data stream {pull}8292[8292] [float] -[[release-notes-8.2.2]] +[[apm-release-notes-8.2.2]] === APM version 8.2.2 https://github.com/elastic/apm-server/compare/v8.2.1\...v8.2.2[View commits] @@ -25,7 +25,7 @@ https://github.com/elastic/apm-server/compare/v8.2.1\...v8.2.2[View commits] No significant changes. [float] -[[release-notes-8.2.1]] +[[apm-release-notes-8.2.1]] === APM version 8.2.1 https://github.com/elastic/apm-server/compare/v8.2.0\...v8.2.1[View commits] @@ -35,7 +35,7 @@ https://github.com/elastic/apm-server/compare/v8.2.0\...v8.2.1[View commits] - Fixes a bug that caused events within batches with `metadata.labels` set to contain labels from other events in the same batch {pull}8081[8081] [float] -[[release-notes-8.2.0]] +[[apm-release-notes-8.2.0]] === APM version 8.2.0 https://github.com/elastic/apm-server/compare/v8.1.3\...v8.2.0[View commits] diff --git a/changelogs/8.3.asciidoc b/changelogs/8.3.asciidoc index 3685b811644..2f07f3da27c 100644 --- a/changelogs/8.3.asciidoc +++ b/changelogs/8.3.asciidoc @@ -1,13 +1,13 @@ -[[release-notes-8.3]] +[[apm-release-notes-8.3]] == APM version 8.3 -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.3.3]] +[[apm-release-notes-8.3.3]] === APM version 8.3.3 https://github.com/elastic/apm-server/compare/v8.3.2\...v8.3.3[View commits] @@ -17,7 +17,7 @@ https://github.com/elastic/apm-server/compare/v8.3.2\...v8.3.3[View commits] - Update APM integration description {pull}8592[8592] [float] -[[release-notes-8.3.2]] +[[apm-release-notes-8.3.2]] === APM version 8.3.2 https://github.com/elastic/apm-server/compare/v8.3.1\...v8.3.2[View commits] @@ -27,7 +27,7 @@ https://github.com/elastic/apm-server/compare/v8.3.1\...v8.3.2[View commits] - When tail-based sampling is enabled, limit the local disk space for the feature to 3GB {pull}8407[8407] [float] -[[release-notes-8.3.1]] +[[apm-release-notes-8.3.1]] === APM version 8.3.1 https://github.com/elastic/apm-server/compare/v8.3.0\...v8.3.1[View commits] @@ -35,7 +35,7 @@ https://github.com/elastic/apm-server/compare/v8.3.0\...v8.3.1[View commits] No significant changes. [float] -[[release-notes-8.3.0]] +[[apm-release-notes-8.3.0]] === APM version 8.3.0 https://github.com/elastic/apm-server/compare/v8.2.2\...v8.3.0[View commits] diff --git a/changelogs/8.4.asciidoc b/changelogs/8.4.asciidoc index a3d4cbc65da..8cabcf81871 100644 --- a/changelogs/8.4.asciidoc +++ b/changelogs/8.4.asciidoc @@ -1,13 +1,13 @@ -[[release-notes-8.4]] +[[apm-release-notes-8.4]] == APM version 8.4 -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.4.3]] +[[apm-release-notes-8.4.3]] === APM version 8.4.3 https://github.com/elastic/apm-server/compare/v8.4.2\...v8.4.3[View commits] @@ -15,7 +15,7 @@ https://github.com/elastic/apm-server/compare/v8.4.2\...v8.4.3[View commits] No significant changes. [float] -[[release-notes-8.4.2]] +[[apm-release-notes-8.4.2]] === APM version 8.4.2 https://github.com/elastic/apm-server/compare/v8.4.1\...v8.4.2[View commits] @@ -25,7 +25,7 @@ https://github.com/elastic/apm-server/compare/v8.4.1\...v8.4.2[View commits] - The data stream migration ingest pipeline now handles `observer.version_major` and `process.ppid` translation {pull}9095[9095] [float] -[[release-notes-8.4.1]] +[[apm-release-notes-8.4.1]] === APM version 8.4.1 https://github.com/elastic/apm-server/compare/v8.4.0\...v8.4.1[View commits] @@ -36,7 +36,7 @@ https://github.com/elastic/apm-server/compare/v8.4.0\...v8.4.1[View commits] - Fix sporadically missing custom libbeat metrics {pull}8900[8900] [float] -[[release-notes-8.4.0]] +[[apm-release-notes-8.4.0]] === APM version 8.4.0 https://github.com/elastic/apm-server/compare/v8.3.3\...v8.4.0[View commits] diff --git a/changelogs/8.5.asciidoc b/changelogs/8.5.asciidoc index 99d8ca6119d..b23d6dac379 100644 --- a/changelogs/8.5.asciidoc +++ b/changelogs/8.5.asciidoc @@ -1,13 +1,13 @@ -[[release-notes-8.5]] +[[apm-release-notes-8.5]] == APM version 8.5 -* <> -* <> -* <> -* <> +* <> +* <> +* <> +* <> [float] -[[release-notes-8.5.3]] +[[apm-release-notes-8.5.3]] === APM version 8.5.3 https://github.com/elastic/apm-server/compare/v8.5.2\...v8.5.3[View commits] @@ -17,7 +17,7 @@ https://github.com/elastic/apm-server/compare/v8.5.2\...v8.5.3[View commits] - OpenTelemetry GRPC Spans from the Javascript API/SDK/Instrumentations are now correctly transformed into transactions with type=`request` {pull}9308[9308] [float] -[[release-notes-8.5.2]] +[[apm-release-notes-8.5.2]] === APM version 8.5.2 This release includes an important APM Server bug fix. @@ -31,7 +31,7 @@ https://github.com/elastic/apm-server/compare/v8.5.1\...v8.5.2[View commits] - Null APM agent configuration entries are now treated as empty, and will not cause the server to exit with an error {pull}9546[9546] [float] -[[release-notes-8.5.1]] +[[apm-release-notes-8.5.1]] === APM version 8.5.1 https://github.com/elastic/apm-server/compare/v8.5.0\...v8.5.1[View commits] @@ -42,7 +42,7 @@ https://github.com/elastic/apm-server/compare/v8.5.0\...v8.5.1[View commits] - Add an `apm-server` user to /etc/passwd in the Docker images {pull}9496[9496] [float] -[[release-notes-8.5.0]] +[[apm-release-notes-8.5.0]] === APM version 8.5.0 https://github.com/elastic/apm-server/compare/v8.4.3\...v8.5.0[View commits] diff --git a/changelogs/8.6.asciidoc b/changelogs/8.6.asciidoc index 0f16eb32e0f..14c8f665a11 100644 --- a/changelogs/8.6.asciidoc +++ b/changelogs/8.6.asciidoc @@ -1,12 +1,12 @@ -[[release-notes-8.6]] +[[apm-release-notes-8.6]] == APM version 8.6 -* <> -* <> -* <> +* <> +* <> +* <> [float] -[[release-notes-8.6.2]] +[[apm-release-notes-8.6.2]] === APM version 8.6.2 https://github.com/elastic/apm-server/compare/v8.6.1\...v8.6.2[View commits] @@ -14,7 +14,7 @@ https://github.com/elastic/apm-server/compare/v8.6.1\...v8.6.2[View commits] No significant changes. [float] -[[release-notes-8.6.1]] +[[apm-release-notes-8.6.1]] === APM version 8.6.1 https://github.com/elastic/apm-server/compare/v8.6.0\...v8.6.1[View commits] @@ -25,7 +25,7 @@ https://github.com/elastic/apm-server/compare/v8.6.0\...v8.6.1[View commits] - Fix internal traffic filter handling on Elastic Cloud when managed by Elastic Agent (Integrations Server) [float] -[[release-notes-8.6.0]] +[[apm-release-notes-8.6.0]] === APM version 8.6.0 https://github.com/elastic/apm-server/compare/v8.5.3\...v8.6.0[View commits] diff --git a/changelogs/8.7.asciidoc b/changelogs/8.7.asciidoc index d51776bc2ed..90f765d5ef7 100644 --- a/changelogs/8.7.asciidoc +++ b/changelogs/8.7.asciidoc @@ -1,12 +1,12 @@ -[[release-notes-8.7]] +[[apm-release-notes-8.7]] == APM version 8.7 -* <> -* <> -* <> +* <> +* <> +* <> [float] -[[release-notes-8.7.2]] +[[apm-release-notes-8.7.2]] === APM version 8.7.2 https://github.com/elastic/apm-server/compare/v8.7.1\...v8.7.2[View commits] @@ -15,7 +15,7 @@ https://github.com/elastic/apm-server/compare/v8.7.1\...v8.7.2[View commits] ==== Bug fixes [float] -[[release-notes-8.7.1]] +[[apm-release-notes-8.7.1]] === APM version 8.7.1 https://github.com/elastic/apm-server/compare/v8.7.0\...v8.7.1[View commits] @@ -30,7 +30,7 @@ https://github.com/elastic/apm-server/compare/v8.7.0\...v8.7.1[View commits] - Remove redundant aggregation groups on `faas.coldstart` in transaction metrics {pull}10635[10635] [float] -[[release-notes-8.7.0]] +[[apm-release-notes-8.7.0]] === APM version 8.7.0 https://github.com/elastic/apm-server/compare/v8.6.2\...v8.7.0[View commits] diff --git a/changelogs/8.8.asciidoc b/changelogs/8.8.asciidoc index 3113668b664..717c8dda039 100644 --- a/changelogs/8.8.asciidoc +++ b/changelogs/8.8.asciidoc @@ -1,12 +1,12 @@ -[[release-notes-8.8]] +[[apm-release-notes-8.8]] == APM version 8.8 -* <> -* <> -* <> +* <> +* <> +* <> [float] -[[release-notes-8.8.2]] +[[apm-release-notes-8.8.2]] === APM Server version 8.8.2 https://github.com/elastic/apm-server/compare/v8.8.1\...v8.8.2[View commits] @@ -16,7 +16,7 @@ https://github.com/elastic/apm-server/compare/v8.8.1\...v8.8.2[View commits] - Added CA certificates bundle to the Docker images {pull}11015[11015] [float] -[[release-notes-8.8.1]] +[[apm-release-notes-8.8.1]] === APM version 8.8.1 https://github.com/elastic/apm-server/compare/v8.8.0\...v8.8.1[View commits] @@ -26,7 +26,7 @@ https://github.com/elastic/apm-server/compare/v8.8.0\...v8.8.1[View commits] - Fix indexing failures for 10m and 60m aggregation rollup data streams after upgrading from 8.7.x to 8.8.0. See Fleet changelog for details. [float] -[[release-notes-8.8.0]] +[[apm-release-notes-8.8.0]] === APM version 8.8.0 https://github.com/elastic/apm-server/compare/v8.7.2\...v8.8.0[View commits] diff --git a/changelogs/8.9.asciidoc b/changelogs/8.9.asciidoc index 3a7fdb965d1..8436f41a9cf 100644 --- a/changelogs/8.9.asciidoc +++ b/changelogs/8.9.asciidoc @@ -1,12 +1,12 @@ -[[release-notes-8.9]] +[[apm-release-notes-8.9]] == APM version 8.9 -* <> -* <> -* <> +* <> +* <> +* <> [float] -[[release-notes-8.9.2]] +[[apm-release-notes-8.9.2]] === APM version 8.9.2 https://github.com/elastic/apm-server/compare/v8.9.1\...v8.9.2[View commits] @@ -16,7 +16,7 @@ https://github.com/elastic/apm-server/compare/v8.9.1\...v8.9.2[View commits] - Add back handling of `queue.*` config for libbeat outputs, such as logstash and kafka {pull}11534[11534] [float] -[[release-notes-8.9.1]] +[[apm-release-notes-8.9.1]] === APM version 8.9.1 https://github.com/elastic/apm-server/compare/v8.9.0\...v8.9.1[View commits] @@ -24,7 +24,7 @@ https://github.com/elastic/apm-server/compare/v8.9.0\...v8.9.1[View commits] No significant changes. [float] -[[release-notes-8.9.0]] +[[apm-release-notes-8.9.0]] === APM version 8.9.0 https://github.com/elastic/apm-server/compare/v8.8.2\...v8.9.0[View commits] diff --git a/dev_docs/RELEASES.md b/dev_docs/RELEASES.md index 5dfe56a166d..776f6918b4b 100644 --- a/dev_docs/RELEASES.md +++ b/dev_docs/RELEASES.md @@ -93,14 +93,14 @@ Templates for adding release notes, breaking changes, and highlights.
/changelogs/*.asciidoc template ```asciidoc -[[release-notes-8.1]] +[[apm-release-notes-8.1]] == APM Server version 8.1 https://github.com/elastic/apm-server/compare/8.0\...8.1[View commits] -* <> +* <> -[[release-notes-8.1.0]] +[[apm-release-notes-8.1.0]] === APM Server version 8.1.0 https://github.com/elastic/apm-server/compare/v8.0.1\...v8.1.0[View commits] From cc5eb1312490b9023ad3383b0ad62a25f10bd331 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 22:22:07 +0000 Subject: [PATCH 048/133] build(deps): bump github.com/elastic/go-docappender from 1.0.0 to 1.0.1 (#12818) * build(deps): bump github.com/elastic/go-docappender from 1.0.0 to 1.0.1 Bumps [github.com/elastic/go-docappender](https://github.com/elastic/go-docappender) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/elastic/go-docappender/releases) - [Commits](https://github.com/elastic/go-docappender/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: github.com/elastic/go-docappender dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index dff5c0c9dfc..4054d6646b8 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1462,11 +1462,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.1/LIC -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-docappender -Version: v1.0.0 +Version: v1.0.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@v1.0.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@v1.0.1/LICENSE: Apache License Version 2.0, January 2004 @@ -16276,11 +16276,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmzap/v2 -Version: v2.4.8 +Version: v2.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.4.8/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.5.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 93ce2ba27de..1de8a2d32bf 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 - github.com/elastic/go-docappender v1.0.0 + github.com/elastic/go-docappender v1.0.1 github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-sysinfo v1.13.1 github.com/elastic/go-ucfg v0.8.8 @@ -145,7 +145,7 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.elastic.co/apm/module/apmzap/v2 v2.4.8 // indirect + go.elastic.co/apm/module/apmzap/v2 v2.5.0 // indirect go.elastic.co/ecszap v1.0.2 // indirect go.opentelemetry.io/collector/semconv v0.96.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect diff --git a/go.sum b/go.sum index 52064110a11..82a6a45022f 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM8 github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= github.com/elastic/gmux v0.3.1/go.mod h1:IBFLojLnACU9tsUnoSavOaMdhq63/HOH/Aeiiha36jA= -github.com/elastic/go-docappender v1.0.0 h1:fXCOd5MEx+4qHIJjJqdtXODC2UNj0sxpO2K84N+/E7Y= -github.com/elastic/go-docappender v1.0.0/go.mod h1:escVC67Qgu2xTKP92H30/tNW0F+VWty5JfkLzew3URI= +github.com/elastic/go-docappender v1.0.1 h1:Mp10xm2CSFObyhQ1Byx+0dAFhzPZHVLm/gnnzOqUOT0= +github.com/elastic/go-docappender v1.0.1/go.mod h1:GkjVUHU9YEU5SaPoS5+4sc0bTY3uq0/l0wjWpZucgV8= github.com/elastic/go-elasticsearch/v8 v8.12.1 h1:QcuFK5LaZS0pSIj/eAEsxmJWmMo7tUs1aVBbzdIgtnE= github.com/elastic/go-elasticsearch/v8 v8.12.1/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4= @@ -553,8 +553,8 @@ go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk= go.elastic.co/apm/module/apmotel/v2 v2.5.0 h1:/U83qrMC7dEtByhrCNXqjLkwJ+krsp6bkLQEURJwYsI= go.elastic.co/apm/module/apmotel/v2 v2.5.0/go.mod h1:v0m8Jq9VX5s9zasL35MGTVLMreT8BFOzEq+mTtHuF1I= -go.elastic.co/apm/module/apmzap/v2 v2.4.8 h1:bU1ESD6Pm2cx1Nmlos0YRQQrdQoFynbYP3imTfIxee4= -go.elastic.co/apm/module/apmzap/v2 v2.4.8/go.mod h1:+pWYgTIT9utt48DVOiBesXQZ3rOVERsE1cS+q0wUafo= +go.elastic.co/apm/module/apmzap/v2 v2.5.0 h1:COXqVte4i75XQmV+H4m4g+2JubK3Y1WRIzY/ppKa3bQ= +go.elastic.co/apm/module/apmzap/v2 v2.5.0/go.mod h1:PHKFbSROQPFZ2+X3oZyaF8lie5DhK0gtcRMpz//S54g= go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ= go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= From c706600c41ad97dcda450bf4a6433b7fbf8321c4 Mon Sep 17 00:00:00 2001 From: Marc Lopez Rubio Date: Wed, 20 Mar 2024 15:45:54 +0100 Subject: [PATCH 049/133] Update changelog to include go-docappender changes (#12823) Signed-off-by: Marc Lopez Rubio --- changelogs/8.13.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index 2130d3304e8..72e71aa9653 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -29,3 +29,4 @@ https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] - Use `messaging.system` and `messaging.operation` to detect OTel messaging span for transactions {pull}12506[12506] - Add support for OTel data stream routing by parsing `data_stream.dataset` and `data_stream.namespace` from: (from lowest to highest precedence) resource attributes, instrumentation scope attributes, and signal-level attributes. This is a breaking change only for users relying on the existing `data_stream` attributes being stored as labels. {pull}12578[12578] - Map OTel transaction `elastic.profiler_stack_trace_ids` attribute {pull}12493[12493] +- Reduce go-docappender error logging verbosity. Groups all errors by groups and reports a new "document" field {pull}12604[12604] From 8563cc5d1b39e37253328b9bf8c0a6a5e7dc26da Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:23:29 -0400 Subject: [PATCH 050/133] [updatecli] Bump elastic stack version to 8.14.0-14d688f1 (#12829) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 312d50d117b..f189ce780de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-892adbf2-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-14d688f1-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-892adbf2-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-14d688f1-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-892adbf2-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-14d688f1-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index fcebd4fbda2..40f8c8941ea 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-892adbf2-SNAPSHOT + version: 8.14.0-14d688f1-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 73da28276f7..98602210d5e 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-892adbf2-SNAPSHOT + version: 8.14.0-14d688f1-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index e1d8cf68526..6e35b439fbb 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-892adbf2-SNAPSHOT + version: 8.14.0-14d688f1-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 2d594fd45608cb96273492d65def26645083c2d1 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:49:37 -0400 Subject: [PATCH 051/133] chore: Update to elastic/beats@22af217d8121 (#12830) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 4054d6646b8..0d1481b4aa9 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240319130044-1b13c648feef +Version: v7.0.0-alpha2.0.20240320143421-22af217d8121 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240319130044-1b13c648feef/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240320143421-22af217d8121/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of @@ -596,11 +596,11 @@ License Version 2.0. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-client/v7 -Version: v7.8.0 +Version: v7.8.1 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.8.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.8.1/LICENSE.txt: ELASTIC LICENSE AGREEMENT diff --git a/go.mod b/go.mod index 1de8a2d32bf..afe8a76244d 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240319130044-1b13c648feef - github.com/elastic/elastic-agent-client/v7 v7.8.0 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240320143421-22af217d8121 + github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 diff --git a/go.sum b/go.sum index 82a6a45022f..4ebb90a0f6c 100644 --- a/go.sum +++ b/go.sum @@ -145,12 +145,12 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240319130044-1b13c648feef h1:0Jyb62J1B+/bKfTFgB8f+89m+sZSmh9g101SY4JWQaY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240319130044-1b13c648feef/go.mod h1:2l168s9POU+PmSpGOVSwbCkJGwlh04AL929k6tK7/sU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240320143421-22af217d8121 h1:iatE8m3oKybJVkatcc6maCzB6DOpaa6XmfDi6yH4s/8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240320143421-22af217d8121/go.mod h1:uabclBmAnlQQAB3Z0BMmMpU3QJXint135aQbUhHoicw= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= -github.com/elastic/elastic-agent-client/v7 v7.8.0 h1:GHFzDJIWpdgI0qDk5EcqbQJGvwTsl2E2vQK3/xe+MYQ= -github.com/elastic/elastic-agent-client/v7 v7.8.0/go.mod h1:ihtjqJzYiIltlRhNruaSSc0ogxIhqPD5hOMKq16cI1s= +github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= +github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY= github.com/elastic/elastic-agent-libs v0.7.5 h1:4UMqB3BREvhwecYTs/L23oQp1hs/XUkcunPlmTZn5yg= github.com/elastic/elastic-agent-libs v0.7.5/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= From e41741f337483fef8a21e79644d0b59556b3b27b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:38:10 +0000 Subject: [PATCH 052/133] build(deps): bump github.com/elastic/go-docappender from 1.0.1 to 1.1.0 (#12834) * build(deps): bump github.com/elastic/go-docappender from 1.0.1 to 1.1.0 Bumps [github.com/elastic/go-docappender](https://github.com/elastic/go-docappender) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/elastic/go-docappender/releases) - [Commits](https://github.com/elastic/go-docappender/compare/v1.0.1...v1.1.0) --- updated-dependencies: - dependency-name: github.com/elastic/go-docappender dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 0d1481b4aa9..fd73e71f3db 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1462,11 +1462,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.1/LIC -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-docappender -Version: v1.0.1 +Version: v1.1.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@v1.0.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@v1.1.0/LICENSE: Apache License Version 2.0, January 2004 @@ -13211,11 +13211,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/klauspost/compress -Version: v1.17.6 +Version: v1.17.7 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/klauspost/compress@v1.17.6/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/klauspost/compress@v1.17.7/LICENSE: Copyright (c) 2012 The Go Authors. All rights reserved. Copyright (c) 2019 Klaus Post. All rights reserved. diff --git a/go.mod b/go.mod index afe8a76244d..3dc23b3d6bd 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 - github.com/elastic/go-docappender v1.0.1 + github.com/elastic/go-docappender v1.1.0 github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-sysinfo v1.13.1 github.com/elastic/go-ucfg v0.8.8 @@ -116,7 +116,7 @@ require ( github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.6 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect diff --git a/go.sum b/go.sum index 4ebb90a0f6c..0607d061ffa 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM8 github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= github.com/elastic/gmux v0.3.1/go.mod h1:IBFLojLnACU9tsUnoSavOaMdhq63/HOH/Aeiiha36jA= -github.com/elastic/go-docappender v1.0.1 h1:Mp10xm2CSFObyhQ1Byx+0dAFhzPZHVLm/gnnzOqUOT0= -github.com/elastic/go-docappender v1.0.1/go.mod h1:GkjVUHU9YEU5SaPoS5+4sc0bTY3uq0/l0wjWpZucgV8= +github.com/elastic/go-docappender v1.1.0 h1:wuA3Im+Y0PuQQ/FzLZUb0+6eT64oLhGCqQV49OvR9EU= +github.com/elastic/go-docappender v1.1.0/go.mod h1:u0hkrzDr9w81uNFWUxeOyM0IX9aZUag/gHlOnHyCrzA= github.com/elastic/go-elasticsearch/v8 v8.12.1 h1:QcuFK5LaZS0pSIj/eAEsxmJWmMo7tUs1aVBbzdIgtnE= github.com/elastic/go-elasticsearch/v8 v8.12.1/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4= @@ -353,8 +353,8 @@ github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= -github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= From 474ef34e6dc44f90b810ff7f31f9a20af172c46f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 19:10:39 +0000 Subject: [PATCH 053/133] build(deps): bump github.com/docker/docker from 24.0.7+incompatible to 24.0.9+incompatible in /systemtest (#12833) * build(deps): bump github.com/docker/docker in /systemtest Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.7+incompatible to 24.0.9+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v24.0.7...v24.0.9) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- systemtest/go.mod | 2 +- systemtest/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/systemtest/go.mod b/systemtest/go.mod index e0a3c2d52eb..4bfd93952a5 100644 --- a/systemtest/go.mod +++ b/systemtest/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.3 require ( - github.com/docker/docker v24.0.7+incompatible + github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.4.0 github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6 github.com/elastic/apm-tools v0.0.0-20231123072934-d85ff07a8390 diff --git a/systemtest/go.sum b/systemtest/go.sum index 439d720635e..366de551ec2 100644 --- a/systemtest/go.sum +++ b/systemtest/go.sum @@ -27,8 +27,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= +github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= From 22d6c5b6ba2b7b2f41655b6084df1a475ba89b11 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:09:20 +0100 Subject: [PATCH 054/133] test: update smoketest to run elastic-agent in unprivileged mode (#12821) --- testing/infra/terraform/modules/standalone_apm_server/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/infra/terraform/modules/standalone_apm_server/main.tf b/testing/infra/terraform/modules/standalone_apm_server/main.tf index 985f86b5485..194c6ea5071 100644 --- a/testing/infra/terraform/modules/standalone_apm_server/main.tf +++ b/testing/infra/terraform/modules/standalone_apm_server/main.tf @@ -26,7 +26,7 @@ locals { ea_provision_commands = [ "curl ${data.external.latest_elastic_agent.result.deb} -o elastic-agent.deb && curl ${data.external.latest_elastic_agent.result.rpm} -o elastic-agent.rpm", "sudo dpkg -i elastic-agent.deb || sudo yum -y install elastic-agent.rpm", - "sudo elastic-agent install -n", + "sudo elastic-agent install -n --unprivileged", "sudo cp ${local.conf_path} /etc/elastic-agent/elastic-agent.yml", "sudo systemctl start elastic-agent", "sleep 1", From 035ccac92915dfb6debc3647081b09699a1b9db1 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:23:13 -0400 Subject: [PATCH 055/133] [updatecli] Bump elastic stack version to 8.14.0-c03b2a22 (#12839) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f189ce780de..5a89087f7cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-14d688f1-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-c03b2a22-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-14d688f1-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-c03b2a22-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-14d688f1-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-c03b2a22-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 40f8c8941ea..5d2cea1054a 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-14d688f1-SNAPSHOT + version: 8.14.0-c03b2a22-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 98602210d5e..132c38ee47c 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-14d688f1-SNAPSHOT + version: 8.14.0-c03b2a22-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 6e35b439fbb..9aed0c674cd 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-14d688f1-SNAPSHOT + version: 8.14.0-c03b2a22-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 63a735ee44dea0c7945a94ab2bec436da814dd39 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:45:54 -0400 Subject: [PATCH 056/133] chore: Update to elastic/beats@c91eaeecc669 (#12836) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index fd73e71f3db..31a874578f0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240320143421-22af217d8121 +Version: v7.0.0-alpha2.0.20240321121944-c91eaeecc669 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240320143421-22af217d8121/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240321121944-c91eaeecc669/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of @@ -10107,11 +10107,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-windows@v1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/gosigar -Version: v0.14.2 +Version: v0.14.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.3/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 3dc23b3d6bd..7dcd86b3da6 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240320143421-22af217d8121 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.2 @@ -92,7 +92,7 @@ require ( github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect github.com/elastic/go-structform v0.0.10 // indirect github.com/elastic/go-windows v1.0.1 // indirect - github.com/elastic/gosigar v0.14.2 // indirect + github.com/elastic/gosigar v0.14.3 // indirect github.com/emicklei/go-restful/v3 v3.10.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/frankban/quicktest v1.14.0 // indirect diff --git a/go.sum b/go.sum index 0607d061ffa..f376908fa86 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240320143421-22af217d8121 h1:iatE8m3oKybJVkatcc6maCzB6DOpaa6XmfDi6yH4s/8= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240320143421-22af217d8121/go.mod h1:uabclBmAnlQQAB3Z0BMmMpU3QJXint135aQbUhHoicw= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669 h1:N1VOiOEZcySMfC3K+6kKseHjzg0cFomasIXB5itxU90= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= @@ -175,8 +175,8 @@ github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk github.com/elastic/go-ucfg v0.8.8/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= -github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4= -github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= +github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo= +github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/elastic/sarama v1.19.1-0.20210823122811-11c3ef800752 h1:5/RUNg7rkIvayjPhAIoI3v8p45NfWcfWs5DZSElycis= github.com/elastic/sarama v1.19.1-0.20210823122811-11c3ef800752/go.mod h1:mdtqvCSg8JOxk8PmpTNGyo6wzd4BMm4QXSfDnTXmgkE= github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= From 0fbdcc37266e3f6a4388427f309edc1fcbcc86e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:07:54 +0000 Subject: [PATCH 057/133] build(deps): bump github.com/elastic/elastic-agent-libs from 0.7.5 to 0.8.0 (#12842) * build(deps): bump github.com/elastic/elastic-agent-libs Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.7.5 to 0.8.0. - [Release notes](https://github.com/elastic/elastic-agent-libs/releases) - [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.7.5...v0.8.0) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-libs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 31a874578f0..0682245f857 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.7.5 +Version: v0.8.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.7.5/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.8.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 7dcd86b3da6..9dacf2ae43b 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/elastic/apm-data v1.0.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669 github.com/elastic/elastic-agent-client/v7 v7.8.1 - github.com/elastic/elastic-agent-libs v0.7.5 + github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v1.1.0 diff --git a/go.sum b/go.sum index f376908fa86..90ac930d90b 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lO github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY= -github.com/elastic/elastic-agent-libs v0.7.5 h1:4UMqB3BREvhwecYTs/L23oQp1hs/XUkcunPlmTZn5yg= -github.com/elastic/elastic-agent-libs v0.7.5/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= +github.com/elastic/elastic-agent-libs v0.8.0 h1:q8N6zXWbVTRWXD0mqyLrYzh3MNpHpE2iURoDX9XCU2o= +github.com/elastic/elastic-agent-libs v0.8.0/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= From 4bb667660c63e0aa70d3dba734e1caabf62fc185 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:23:51 -0400 Subject: [PATCH 058/133] [updatecli] Bump elastic stack version to 8.14.0-0321523b (#12844) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5a89087f7cd..269f77552ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-c03b2a22-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-0321523b-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-c03b2a22-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-0321523b-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-c03b2a22-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-0321523b-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 5d2cea1054a..9a83c031213 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-c03b2a22-SNAPSHOT + version: 8.14.0-0321523b-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 132c38ee47c..475ca8f3722 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-c03b2a22-SNAPSHOT + version: 8.14.0-0321523b-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 9aed0c674cd..03025c39a8f 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-c03b2a22-SNAPSHOT + version: 8.14.0-0321523b-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From be08370bf21b2d7dba5b7279d64588fc6230240a Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:44:02 -0400 Subject: [PATCH 059/133] chore: Update to elastic/beats@55321809127d (#12845) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 0682245f857..28e17395c93 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240321121944-c91eaeecc669 +Version: v7.0.0-alpha2.0.20240322143401-55321809127d Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240321121944-c91eaeecc669/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240322143401-55321809127d/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 9dacf2ae43b..c15f2004ca1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240322143401-55321809127d github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 90ac930d90b..2142775669b 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669 h1:N1VOiOEZcySMfC3K+6kKseHjzg0cFomasIXB5itxU90= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240321121944-c91eaeecc669/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240322143401-55321809127d h1:7VHw+V82K3ZqqgEof5U+mN5NQDBBblC2tp/CYtdLhGA= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240322143401-55321809127d/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From e9ff523647565e9f22715658e32f7260a39ebe9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:35:53 +0100 Subject: [PATCH 060/133] build(deps): bump the github-actions group with 1 update (#12850) Bumps the github-actions group with 1 update: [actions/add-to-project](https://github.com/actions/add-to-project). Updates `actions/add-to-project` from 0.6.0 to 0.6.1 - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](https://github.com/actions/add-to-project/compare/v0.6.0...v0.6.1) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index c2cabf4a250..8dee10cb225 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -14,7 +14,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.6.0 + - uses: actions/add-to-project@v0.6.1 with: project-url: https://github.com/orgs/elastic/projects/1286 github-token: ${{ secrets.APM_TECH_USER_TOKEN }} \ No newline at end of file From 6f7d4b7b7980e3cdb703d31eada68c32a6add410 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 25 Mar 2024 14:02:39 +0100 Subject: [PATCH 061/133] build: bump go to 1.22 (#12835) * build: bump go to 1.22 * lint: run go mod tidy --- .go-version | 2 +- README.md | 2 +- cmd/intake-receiver/go.mod | 4 ++-- go.mod | 4 ++-- internal/glog/go.mod | 4 ++-- packaging/docker/Dockerfile | 2 +- systemtest/go.mod | 4 ++-- tools/go.mod | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.go-version b/.go-version index 8819d012cee..6245beecd39 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.7 +1.22.1 diff --git a/README.md b/README.md index aab51704333..a454d0adb12 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ To get started with APM, see our [Quick start guide](https://www.elastic.co/guid ### Requirements -* [Go][golang-download] 1.21.x +* [Go][golang-download] 1.22.x [golang-download]: https://golang.org/dl/ diff --git a/cmd/intake-receiver/go.mod b/cmd/intake-receiver/go.mod index c64217c60d7..0833f7b5920 100644 --- a/cmd/intake-receiver/go.mod +++ b/cmd/intake-receiver/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/apm-server/cmd/intake-receiver -go 1.21 +go 1.22 -toolchain go1.21.3 +toolchain go1.22.1 require ( github.com/stretchr/testify v1.6.1 diff --git a/go.mod b/go.mod index c15f2004ca1..660c752af53 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/apm-server -go 1.21 +go 1.22 -toolchain go1.21.3 +toolchain go1.22.1 require ( github.com/cespare/xxhash/v2 v2.2.0 diff --git a/internal/glog/go.mod b/internal/glog/go.mod index 265d1569169..117d275f9eb 100644 --- a/internal/glog/go.mod +++ b/internal/glog/go.mod @@ -1,5 +1,5 @@ module github.com/golang/glog -go 1.21 +go 1.22 -toolchain go1.21.3 +toolchain go1.22.1 diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index c24d3ca1500..d17c5f07da8 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04 # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. -FROM golang:1.21.7 as builder +FROM golang:1.22.1 as builder WORKDIR /src COPY go.mod go.sum /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod diff --git a/systemtest/go.mod b/systemtest/go.mod index 4bfd93952a5..49baa4550bc 100644 --- a/systemtest/go.mod +++ b/systemtest/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/apm-server/systemtest -go 1.21 +go 1.22 -toolchain go1.21.3 +toolchain go1.22.1 require ( github.com/docker/docker v24.0.9+incompatible diff --git a/tools/go.mod b/tools/go.mod index bbe9f4bd7ff..284276cb773 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/apm-server/tools -go 1.21.0 +go 1.22 -toolchain go1.21.3 +toolchain go1.22.1 require ( github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b From f768769f7356733078889708cec63d7f1f92e399 Mon Sep 17 00:00:00 2001 From: Vishal Raj Date: Mon, 25 Mar 2024 15:56:02 +0000 Subject: [PATCH 062/133] Update 8.13 changelog to include missing PR and link (#12852) --- changelogs/8.13.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index 72e71aa9653..5c59ccbbe04 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -9,6 +9,8 @@ https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] [[apm-release-notes-8.13.0]] === APM version 8.13.0 +https://github.com/elastic/apm-server/compare/v8.12.2\...v8.13.0[View commits] + [float] ==== Breaking Changes @@ -23,7 +25,7 @@ https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] [float] ==== Added -- map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown` +- map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown` {pull}12199[12199] - Add support for Otel code.stacktrace {pull}12096[12096] - `http.request.body.bytes` now reports the bytes read from request body even if Content-Length is -1 {pull}12451[12451] - Use `messaging.system` and `messaging.operation` to detect OTel messaging span for transactions {pull}12506[12506] From 1b090ed3eb94a1032cf5427d32a47e3ef6c202e8 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:17:11 -0400 Subject: [PATCH 063/133] [updatecli] Bump elastic stack version to 8.14.0-4e9e4428 (#12855) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 269f77552ed..fb7fa02a411 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-0321523b-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-4e9e4428-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-0321523b-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-4e9e4428-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-0321523b-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-4e9e4428-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 9a83c031213..f5ca750363a 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-0321523b-SNAPSHOT + version: 8.14.0-4e9e4428-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 475ca8f3722..6d94c61f719 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-0321523b-SNAPSHOT + version: 8.14.0-4e9e4428-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 03025c39a8f..909b50d886c 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-0321523b-SNAPSHOT + version: 8.14.0-4e9e4428-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From e88fca72fcf979d9f87fd760de2e884c90cd697b Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:36:26 -0400 Subject: [PATCH 064/133] chore: Update to elastic/beats@5750480ebf63 (#12853) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 28e17395c93..2d2044ddefe 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240322143401-55321809127d +Version: v7.0.0-alpha2.0.20240325141120-5750480ebf63 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240322143401-55321809127d/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240325141120-5750480ebf63/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 660c752af53..86be486fc8a 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240322143401-55321809127d + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240325141120-5750480ebf63 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 2142775669b..6896a5f196f 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240322143401-55321809127d h1:7VHw+V82K3ZqqgEof5U+mN5NQDBBblC2tp/CYtdLhGA= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240322143401-55321809127d/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240325141120-5750480ebf63 h1:RVcrzfj8rJXlChkWoVilbRnJngz9fEJyC4NWN38zAm4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240325141120-5750480ebf63/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From ee82890854a6ba57168e9723c2c43f62a9be12c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 18:48:16 +0100 Subject: [PATCH 065/133] build(deps): bump honnef.co/go/tools from 0.4.6 to 0.4.7 in /tools (#12734) * build(deps): bump honnef.co/go/tools from 0.4.6 to 0.4.7 in /tools Bumps [honnef.co/go/tools](https://github.com/dominikh/go-tools) from 0.4.6 to 0.4.7. - [Release notes](https://github.com/dominikh/go-tools/releases) - [Commits](https://github.com/dominikh/go-tools/compare/v0.4.6...v0.4.7) --- updated-dependencies: - dependency-name: honnef.co/go/tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Carson Ip Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 284276cb773..0cf35489cad 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -14,7 +14,7 @@ require ( github.com/terraform-docs/terraform-docs v0.17.0 go.elastic.co/go-licence-detector v0.6.0 gotest.tools/gotestsum v1.11.0 - honnef.co/go/tools v0.4.6 + honnef.co/go/tools v0.4.7 ) require ( diff --git a/tools/go.sum b/tools/go.sum index 1f0dd1a2363..95e1d033e18 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -2774,8 +2774,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -honnef.co/go/tools v0.4.6 h1:oFEHCKeID7to/3autwsWfnuv69j3NsfcXbvJKuIcep8= -honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= +honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= From a52e571c11748830587e3520e509804263e9d08e Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:28:34 -0400 Subject: [PATCH 066/133] chore: Update to elastic/beats@a1c292dc6514 (#12869) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 2d2044ddefe..c3d6ce1a7a5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240325141120-5750480ebf63 +Version: v7.0.0-alpha2.0.20240326143228-a1c292dc6514 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240325141120-5750480ebf63/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240326143228-a1c292dc6514/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 86be486fc8a..58d170d7cfc 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240325141120-5750480ebf63 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240326143228-a1c292dc6514 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 6896a5f196f..531af9be070 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240325141120-5750480ebf63 h1:RVcrzfj8rJXlChkWoVilbRnJngz9fEJyC4NWN38zAm4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240325141120-5750480ebf63/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240326143228-a1c292dc6514 h1:mZAsPZTxbB2N0MiR99BIpJ/8t9XR0Y+f4gilBC5LRjs= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240326143228-a1c292dc6514/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From a0afdea064e170295547de75bb02c16f8a55a1af Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:48:15 -0400 Subject: [PATCH 067/133] [updatecli] Bump elastic stack version to 8.14.0-433ba96e (#12866) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fb7fa02a411..7d15fc475bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-4e9e4428-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-433ba96e-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-4e9e4428-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-433ba96e-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-4e9e4428-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-433ba96e-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index f5ca750363a..1013395ac3d 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-4e9e4428-SNAPSHOT + version: 8.14.0-433ba96e-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 6d94c61f719..2d88bce9b15 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-4e9e4428-SNAPSHOT + version: 8.14.0-433ba96e-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 909b50d886c..1dc0e5309de 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-4e9e4428-SNAPSHOT + version: 8.14.0-433ba96e-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From d7bb075bf1b14e70458123155c05cae35c0d3187 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 18:38:28 +0000 Subject: [PATCH 068/133] build(deps): bump the otel group with 2 updates (#12873) * build(deps): bump the otel group with 2 updates Bumps the otel group with 2 updates: [go.opentelemetry.io/collector/consumer](https://github.com/open-telemetry/opentelemetry-collector) and [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector). Updates `go.opentelemetry.io/collector/consumer` from 0.96.0 to 0.97.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.96.0...v0.97.0) Updates `go.opentelemetry.io/collector/pdata` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.3.0...pdata/v1.4.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/consumer dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/collector/pdata dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c3d6ce1a7a5..47fc2329a74 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5497,11 +5497,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/consumer -Version: v0.96.0 +Version: v0.97.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.96.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.97.0/LICENSE: Apache License @@ -5709,11 +5709,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/pdata -Version: v1.3.0 +Version: v1.4.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.3.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.4.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index 58d170d7cfc..49da70c01f0 100644 --- a/go.mod +++ b/go.mod @@ -44,8 +44,8 @@ require ( go.elastic.co/apm/module/apmotel/v2 v2.5.0 go.elastic.co/apm/v2 v2.5.0 go.elastic.co/fastjson v1.3.0 - go.opentelemetry.io/collector/consumer v0.96.0 - go.opentelemetry.io/collector/pdata v1.3.0 + go.opentelemetry.io/collector/consumer v0.97.0 + go.opentelemetry.io/collector/pdata v1.4.0 go.opentelemetry.io/otel v1.24.0 go.opentelemetry.io/otel/metric v1.24.0 go.opentelemetry.io/otel/sdk/metric v1.24.0 diff --git a/go.sum b/go.sum index 531af9be070..19ed5236888 100644 --- a/go.sum +++ b/go.sum @@ -561,10 +561,10 @@ go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= -go.opentelemetry.io/collector/consumer v0.96.0 h1:JN4JHelp5EGMGoC2UVelTMG6hyZjgtgdLLt5eZfVynU= -go.opentelemetry.io/collector/consumer v0.96.0/go.mod h1:Vn+qzzKgekDFayCVV8peSH5Btx1xrt/bmzD9gTxgidQ= -go.opentelemetry.io/collector/pdata v1.3.0 h1:JRYN7tVHYFwmtQhIYbxWeiKSa2L1nCohyAs8sYqKFZo= -go.opentelemetry.io/collector/pdata v1.3.0/go.mod h1:t7W0Undtes53HODPdSujPLTnfSR5fzT+WpL+RTaaayo= +go.opentelemetry.io/collector/consumer v0.97.0 h1:S0BZQtJQxSHT156S8a5rLt3TeWYP8Rq+jn8QEyWQUYk= +go.opentelemetry.io/collector/consumer v0.97.0/go.mod h1:1D06LURiZ/1KA2OnuKNeSn9bvFmJ5ZWe6L8kLu0osSY= +go.opentelemetry.io/collector/pdata v1.4.0 h1:cA6Pr7Z2V7mE+i7FmYpavX7nefzd6H4CICgW0T9aJX0= +go.opentelemetry.io/collector/pdata v1.4.0/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/collector/semconv v0.96.0 h1:DrZy8BpzJDnN2zFxXRj6BhfGYxNlqpFHBqyuS9fVHRY= go.opentelemetry.io/collector/semconv v0.96.0/go.mod h1:zOm/U3pgMIWcvrcnPbR9Xx2HinoXj46ERMK8PUV9wrs= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= From 849e506d03637e1072f8c90b168d580bf7dc6a6e Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 27 Mar 2024 14:21:28 +0000 Subject: [PATCH 069/133] changelog: Add missing entry for #10994 TBS protobuf (#12874) --- changelogs/8.9.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/changelogs/8.9.asciidoc b/changelogs/8.9.asciidoc index 8436f41a9cf..abc2a27df54 100644 --- a/changelogs/8.9.asciidoc +++ b/changelogs/8.9.asciidoc @@ -48,3 +48,4 @@ https://github.com/elastic/apm-server/compare/v8.8.2\...v8.9.0[View commits] - apmpackage: Remove `timeseries.instance` in ingest pipeline for pre-8.6 compatibility {pull}10973[10973] - apmpackage: Use "dynamic: runtime" instead of strict mapping for internal, TBS, and aggregation indices {pull}10968[10968] - Corrected as of 5 July 2023 to align with the correct license text for Elastic License 2.0 {pull}11120[11120] +- Tail-based sampling: Migrate to protobuf codec for storage efficiency and performance {pull}10994[10994] From 3bcd26af7cf1de68cdf1236bacc7d8d5c9e668f5 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 28 Mar 2024 07:33:55 -0400 Subject: [PATCH 070/133] [updatecli] Bump elastic stack version to 8.14.0-7d0b3a7e (#12880) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7d15fc475bc..f3c63c20bef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-433ba96e-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-7d0b3a7e-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-433ba96e-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-7d0b3a7e-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-433ba96e-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-7d0b3a7e-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 1013395ac3d..0e6e73d737e 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-433ba96e-SNAPSHOT + version: 8.14.0-7d0b3a7e-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 2d88bce9b15..af62cade442 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-433ba96e-SNAPSHOT + version: 8.14.0-7d0b3a7e-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 1dc0e5309de..348657c5e8c 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-433ba96e-SNAPSHOT + version: 8.14.0-7d0b3a7e-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 4c59f133262fcb3d1822a37a1e77f8a192fe53b2 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Thu, 28 Mar 2024 12:57:04 +0100 Subject: [PATCH 071/133] test: add cpuprofile arg support to benchmark make task (#12073) --- testing/benchmark/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testing/benchmark/Makefile b/testing/benchmark/Makefile index 4ab45bcba3c..5008a4cc925 100644 --- a/testing/benchmark/Makefile +++ b/testing/benchmark/Makefile @@ -79,6 +79,9 @@ apply: destroy: @terraform destroy -auto-approve +cp-cpuprof: + @[ "${BENCHMARK_CPU_OUT}" ] && scp $(SSH_OPTS) -i $(SSH_KEY) "$(SSH_USER)@$(WORKER_IP):./$(BENCHMARK_CPU_OUT)" $(BENCHMARK_CPU_OUT) || echo "skipping cpu out copy" + .PHONY: log-benckmark-profile log-benckmark-profile: @echo "Running benchmarks..." @@ -93,7 +96,7 @@ log-benckmark-profile: run-benchmark: log-benckmark-profile @ssh $(SSH_OPTS) -i $(SSH_KEY) $(SSH_USER)@$(WORKER_IP) ". .envrc && bin/apmbench -run='$(BENCHMARK_RUN)' \ -benchtime=$(BENCHMARK_TIME) -count=$(BENCHMARK_COUNT) -warmup-time=$(BENCHMARK_WARMUP_TIME) \ - -agents=$(BENCHMARK_AGENTS) -detailed=$(BENCHMARK_DETAILED) -event-rate=$(BENCHMARK_EVENT_RATE)" 2>&1 | tee $(BENCHMARK_RESULT) + -agents=$(BENCHMARK_AGENTS) -detailed=$(BENCHMARK_DETAILED) -event-rate=$(BENCHMARK_EVENT_RATE) -cpuprofile=$(BENCHMARK_CPU_OUT)" 2>&1 | tee $(BENCHMARK_RESULT) .PHONY: run-benchmark-autotuned run-benchmark-autotuned: From 7977e9199523f87dab7b490ae723f132a768ab12 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Thu, 28 Mar 2024 13:12:37 +0000 Subject: [PATCH 072/133] changelog: Tidy up 8.13 (#12885) --- changelogs/8.13.asciidoc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index 5c59ccbbe04..d5142661c3d 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -1,8 +1,6 @@ [[apm-release-notes-8.13]] == APM version 8.13 -https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] - * <> [float] @@ -11,18 +9,6 @@ https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] https://github.com/elastic/apm-server/compare/v8.12.2\...v8.13.0[View commits] -[float] -==== Breaking Changes - -[float] -==== Bug fixes - -[float] -==== Deprecations - -[float] -==== Intake API Changes - [float] ==== Added - map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown` {pull}12199[12199] From 7fa53c01c82d0d51c975cb3547685ff61883dd4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:07:04 +0000 Subject: [PATCH 073/133] build(deps): bump the jaeger group with 1 update (#12886) * build(deps): bump the jaeger group with 1 update Bumps the jaeger group with 1 update: [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib). Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger` from 0.96.0 to 0.97.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.96.0...v0.97.0) --- updated-dependencies: - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger dependency-type: direct:production update-type: version-update:semver-minor dependency-group: jaeger ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 20 ++++++++++---------- go.mod | 12 ++++++------ go.sum | 34 +++++++++++++++++----------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 47fc2329a74..73cb39201ae 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3672,11 +3672,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/reflect2@v1.0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger -Version: v0.96.0 +Version: v0.97.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.96.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.97.0/LICENSE: Apache License Version 2.0, January 2004 @@ -13875,11 +13875,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/concurrent@v0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal -Version: v0.96.0 +Version: v0.97.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.96.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.97.0/LICENSE: Apache License Version 2.0, January 2004 @@ -15152,11 +15152,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/shirou/gopsutil/v3 -Version: v3.24.1 +Version: v3.24.2 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.24.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.24.2/LICENSE: gopsutil is distributed under BSD license reproduced below. @@ -16246,11 +16246,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/yusufpapurcu/wmi -Version: v1.2.3 +Version: v1.2.4 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/yusufpapurcu/wmi@v1.2.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/yusufpapurcu/wmi@v1.2.4/LICENSE: The MIT License (MIT) @@ -16698,11 +16698,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.2/LICENS -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/semconv -Version: v0.96.0 +Version: v0.97.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.96.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.97.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index 49da70c01f0..bfe26b05492 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/jaegertracing/jaeger v1.55.0 github.com/libp2p/go-reuseport v0.4.0 github.com/modern-go/reflect2 v1.0.2 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/ryanuber/go-glob v1.0.0 @@ -124,7 +124,7 @@ require ( github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect @@ -136,7 +136,7 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect - github.com/shirou/gopsutil/v3 v3.24.1 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect @@ -144,16 +144,16 @@ require ( github.com/xdg/stringprep v1.0.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.elastic.co/apm/module/apmzap/v2 v2.5.0 // indirect go.elastic.co/ecszap v1.0.2 // indirect - go.opentelemetry.io/collector/semconv v0.96.0 // indirect + go.opentelemetry.io/collector/semconv v0.97.0 // indirect go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect - golang.org/x/mod v0.14.0 // indirect + golang.org/x/mod v0.16.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.0 // indirect diff --git a/go.sum b/go.sum index 19ed5236888..1a8e3419439 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 h1:DJK8W/iB+s/qkTtmXSrHA49lp5O3OsR7E6z4byOLy34= github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= -github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= +github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -412,14 +412,14 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0 h1:tyNJ1qYXm1jMJV2NbskYosfo7xIyRP7YvbdcvldXAeA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.96.0/go.mod h1:f3d2OcVhcMGgcMkyf614jPfAD8eE+zlJ6Pd5P43qWyI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0 h1:nRk4vyYsMkFht1Mo3n1d2X7WxLex0LzIWtQhE5/c2P8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.96.0/go.mod h1:XTq2FQlb1ao2NHoZvkBC+LPUdMO4DG/4FJ7LqAyE8YU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 h1:vX/BkTfd7/cvydXJ7FmUy5iSviQeNGAgTCoXcLu7/Ww= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0/go.mod h1:yrlbvRlLeny1kFmj4Ac9BSqv/pOr2h7sOIvDE6OMCKk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0 h1:5/19bkuB0GDo+vScgEnNy/TcXAkmyTu7BenfpaD2a/M= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0/go.mod h1:CuGIeYSpb4Kmyq4Ez83gHbTjNQGxptjYcC4T5dWkPnM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= -github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -467,8 +467,8 @@ github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI= -github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -541,8 +541,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI= go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4= go.elastic.co/apm/module/apmgorilla/v2 v2.5.0 h1:XeKkwqXWBEoU68AYPvFaOJYcs+c56S9sLV2wtRdwf3g= @@ -565,8 +565,8 @@ go.opentelemetry.io/collector/consumer v0.97.0 h1:S0BZQtJQxSHT156S8a5rLt3TeWYP8R go.opentelemetry.io/collector/consumer v0.97.0/go.mod h1:1D06LURiZ/1KA2OnuKNeSn9bvFmJ5ZWe6L8kLu0osSY= go.opentelemetry.io/collector/pdata v1.4.0 h1:cA6Pr7Z2V7mE+i7FmYpavX7nefzd6H4CICgW0T9aJX0= go.opentelemetry.io/collector/pdata v1.4.0/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= -go.opentelemetry.io/collector/semconv v0.96.0 h1:DrZy8BpzJDnN2zFxXRj6BhfGYxNlqpFHBqyuS9fVHRY= -go.opentelemetry.io/collector/semconv v0.96.0/go.mod h1:zOm/U3pgMIWcvrcnPbR9Xx2HinoXj46ERMK8PUV9wrs= +go.opentelemetry.io/collector/semconv v0.97.0 h1:iF3nTfThbiOwz7o5Pocn0dDnDoffd18ijDuf6Mwzi1s= +go.opentelemetry.io/collector/semconv v0.97.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= @@ -612,8 +612,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -680,7 +680,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From ec2b287fb8ff29a01225b301423b8050bcba8c40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:50:45 +0100 Subject: [PATCH 074/133] build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.12.1 to 8.13.0 (#12887) * build(deps): bump github.com/elastic/go-elasticsearch/v8 Bumps [github.com/elastic/go-elasticsearch/v8](https://github.com/elastic/go-elasticsearch) from 8.12.1 to 8.13.0. - [Release notes](https://github.com/elastic/go-elasticsearch/releases) - [Changelog](https://github.com/elastic/go-elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/go-elasticsearch/compare/v8.12.1...v8.13.0) --- updated-dependencies: - dependency-name: github.com/elastic/go-elasticsearch/v8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 73cb39201ae..e22aea5b00c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1673,11 +1673,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@ -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.12.1 +Version: v8.13.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.12.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.13.0/LICENSE: Apache License Version 2.0, January 2004 @@ -9261,11 +9261,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-transport-go/v8 -Version: v8.4.0 +Version: v8.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.4.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.5.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index bfe26b05492..11746aad222 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v1.1.0 - github.com/elastic/go-elasticsearch/v8 v8.12.1 + github.com/elastic/go-elasticsearch/v8 v8.13.0 github.com/elastic/go-sysinfo v1.13.1 github.com/elastic/go-ucfg v0.8.8 github.com/go-sourcemap/sourcemap v2.1.4+incompatible @@ -88,7 +88,7 @@ require ( github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 // indirect - github.com/elastic/elastic-transport-go/v8 v8.4.0 // indirect + github.com/elastic/elastic-transport-go/v8 v8.5.0 // indirect github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect github.com/elastic/go-structform v0.0.10 // indirect github.com/elastic/go-windows v1.0.1 // indirect diff --git a/go.sum b/go.sum index 1a8e3419439..83fbf8dfbc7 100644 --- a/go.sum +++ b/go.sum @@ -157,14 +157,14 @@ github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b6 github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= github.com/elastic/elastic-agent-system-metrics v0.9.2/go.mod h1:VfJnKw4Jqrd9ddljXCwaGKJgN+7ADyyGk089NaXVsf0= -github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM89+hdgcymI+KzJCGE= -github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= +github.com/elastic/elastic-transport-go/v8 v8.5.0 h1:v5membAl7lvQgBTexPRDBO/RdnlQX+FM9fUVDyXxvH0= +github.com/elastic/elastic-transport-go/v8 v8.5.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= github.com/elastic/gmux v0.3.1/go.mod h1:IBFLojLnACU9tsUnoSavOaMdhq63/HOH/Aeiiha36jA= github.com/elastic/go-docappender v1.1.0 h1:wuA3Im+Y0PuQQ/FzLZUb0+6eT64oLhGCqQV49OvR9EU= github.com/elastic/go-docappender v1.1.0/go.mod h1:u0hkrzDr9w81uNFWUxeOyM0IX9aZUag/gHlOnHyCrzA= -github.com/elastic/go-elasticsearch/v8 v8.12.1 h1:QcuFK5LaZS0pSIj/eAEsxmJWmMo7tUs1aVBbzdIgtnE= -github.com/elastic/go-elasticsearch/v8 v8.12.1/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= +github.com/elastic/go-elasticsearch/v8 v8.13.0 h1:YXPAWpvbYX0mWSNG9tnEpvs4h1stgMy5JUeKZECYYB8= +github.com/elastic/go-elasticsearch/v8 v8.13.0/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= From 868da2f09336f7e32a08a007019f612eabc71b40 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 28 Mar 2024 12:13:28 -0400 Subject: [PATCH 075/133] [updatecli] Bump elastic stack version to 8.14.0-3267fa9f (#12890) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f3c63c20bef..3503151d35d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-7d0b3a7e-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-3267fa9f-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-7d0b3a7e-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-3267fa9f-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-7d0b3a7e-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-3267fa9f-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 0e6e73d737e..958245da8a0 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-7d0b3a7e-SNAPSHOT + version: 8.14.0-3267fa9f-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index af62cade442..e6349e1b0a0 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-7d0b3a7e-SNAPSHOT + version: 8.14.0-3267fa9f-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 348657c5e8c..50c553db150 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-7d0b3a7e-SNAPSHOT + version: 8.14.0-3267fa9f-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From a6ff5ef05c2061bc42fec707a5598945ce85f754 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 28 Mar 2024 12:32:39 -0400 Subject: [PATCH 076/133] [updatecli] Update to elastic/beats@7648a2afc1f5 (#12882) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@23ec4e9a4368 Made with ❤️️ by updatecli * chore: Update to elastic/beats@7648a2afc1f5 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e22aea5b00c..96b8becadfa 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240326143228-a1c292dc6514 +Version: v7.0.0-alpha2.0.20240328133149-7648a2afc1f5 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240326143228-a1c292dc6514/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240328133149-7648a2afc1f5/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 11746aad222..12586fe23d0 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240326143228-a1c292dc6514 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240328133149-7648a2afc1f5 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 83fbf8dfbc7..a7b1fdab223 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240326143228-a1c292dc6514 h1:mZAsPZTxbB2N0MiR99BIpJ/8t9XR0Y+f4gilBC5LRjs= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240326143228-a1c292dc6514/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240328133149-7648a2afc1f5 h1:D3oc8i/OI28Fr1lWY5eqm+oQ2lxDa6btEhTP1H39AT8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240328133149-7648a2afc1f5/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 2dcfaa947b9de42c28d16ae4164623e0ea53c3c9 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 28 Mar 2024 12:29:48 -0700 Subject: [PATCH 077/133] [DOCS] Add openAPI specification for APM server information API (#12862) * [DOCS] Add openAPI specification for APM server information API * [DOCS] Fix responses * [DOCS] Add text/plain response and examples * Remove invalid text/plain example --- docs/spec/openapi/apm-openapi.yaml | 77 ++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 docs/spec/openapi/apm-openapi.yaml diff --git a/docs/spec/openapi/apm-openapi.yaml b/docs/spec/openapi/apm-openapi.yaml new file mode 100644 index 00000000000..e50de7a5176 --- /dev/null +++ b/docs/spec/openapi/apm-openapi.yaml @@ -0,0 +1,77 @@ +openapi: 3.1.0 +info: + title: APM Server + description: OpenAPI schema for APM Server APIs + version: 8.13.0 + license: + name: Elastic License 2.0 + url: https://www.elastic.co/licensing/elastic-license + contact: + name: APM Team +servers: + - url: / +tags: + - name: server info + description: APIs that query general server information. + x-displayName: APM server information +paths: + /: + get: + summary: Retrieve general server information. + description: | + This lightweight endpoint is useful as a server up/down health check. + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + post: + summary: Retrieve general server information. + operationId: postServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' +components: + securitySchemes: + apiKeyAuth: + type: apiKey + in: header + name: Authorization + description: 'e.g. Authorization: ApiKey base64AccessApiKey' + secretToken: + type: http + scheme: bearer + bearerFormat: Secret token + responses: + 200_server_info: + description: A successful response indicates that the server is up. + content: + application/json: + schema: + description: If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server. + type: object + properties: + build_date: + type: string + format: time-date + build_sha: + type: string + publish_ready: + type: boolean + version: + type: string + examples: + getServerHealthAuthResponse: + summary: Example APM Server information request with a secret token + value: + build_date: '2021-12-18T19:59:06Z' + build_sha: 24fe620eeff5a19e2133c940c7e5ce1ceddb1445 + publish_ready: true + version: 8.12.2 +security: + - apiKeyAuth: [ ] + - secretToken: [ ] \ No newline at end of file From f37cb6f56019511d98dd0ac60235f065cb479a83 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:35:02 -0400 Subject: [PATCH 078/133] chore: Update to elastic/beats@f871b5c5f76b (#12892) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 +- docs/spec/openapi/apm-openapi.yaml | 77 ------------------------------ go.mod | 2 +- go.sum | 4 +- 4 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 docs/spec/openapi/apm-openapi.yaml diff --git a/NOTICE.txt b/NOTICE.txt index 96b8becadfa..31fbce6d612 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240328133149-7648a2afc1f5 +Version: v7.0.0-alpha2.0.20240329010145-f871b5c5f76b Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240328133149-7648a2afc1f5/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240329010145-f871b5c5f76b/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/docs/spec/openapi/apm-openapi.yaml b/docs/spec/openapi/apm-openapi.yaml deleted file mode 100644 index e50de7a5176..00000000000 --- a/docs/spec/openapi/apm-openapi.yaml +++ /dev/null @@ -1,77 +0,0 @@ -openapi: 3.1.0 -info: - title: APM Server - description: OpenAPI schema for APM Server APIs - version: 8.13.0 - license: - name: Elastic License 2.0 - url: https://www.elastic.co/licensing/elastic-license - contact: - name: APM Team -servers: - - url: / -tags: - - name: server info - description: APIs that query general server information. - x-displayName: APM server information -paths: - /: - get: - summary: Retrieve general server information. - description: | - This lightweight endpoint is useful as a server up/down health check. - To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. - operationId: getServerHealth - tags: - - server info - responses: - '200': - $ref: '#/components/responses/200_server_info' - post: - summary: Retrieve general server information. - operationId: postServerHealth - tags: - - server info - responses: - '200': - $ref: '#/components/responses/200_server_info' -components: - securitySchemes: - apiKeyAuth: - type: apiKey - in: header - name: Authorization - description: 'e.g. Authorization: ApiKey base64AccessApiKey' - secretToken: - type: http - scheme: bearer - bearerFormat: Secret token - responses: - 200_server_info: - description: A successful response indicates that the server is up. - content: - application/json: - schema: - description: If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server. - type: object - properties: - build_date: - type: string - format: time-date - build_sha: - type: string - publish_ready: - type: boolean - version: - type: string - examples: - getServerHealthAuthResponse: - summary: Example APM Server information request with a secret token - value: - build_date: '2021-12-18T19:59:06Z' - build_sha: 24fe620eeff5a19e2133c940c7e5ce1ceddb1445 - publish_ready: true - version: 8.12.2 -security: - - apiKeyAuth: [ ] - - secretToken: [ ] \ No newline at end of file diff --git a/go.mod b/go.mod index 12586fe23d0..8b5430a36cd 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240328133149-7648a2afc1f5 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240329010145-f871b5c5f76b github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index a7b1fdab223..3acb57277b5 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240328133149-7648a2afc1f5 h1:D3oc8i/OI28Fr1lWY5eqm+oQ2lxDa6btEhTP1H39AT8= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240328133149-7648a2afc1f5/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240329010145-f871b5c5f76b h1:8SudrdtWlhB/OZLXXcH5//ktS9c5b/HhU48Q6gF/p/Q= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240329010145-f871b5c5f76b/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 10bb46ff0255c1ce836fe0f78a4244feb3444e8b Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 29 Mar 2024 15:11:23 -0400 Subject: [PATCH 079/133] [updatecli] Bump elastic stack version to 8.14.0-cca51f6c (#12893) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3503151d35d..21ff0a1c1ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-3267fa9f-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-cca51f6c-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-3267fa9f-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-cca51f6c-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-3267fa9f-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-cca51f6c-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 958245da8a0..5fea0934633 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-3267fa9f-SNAPSHOT + version: 8.14.0-cca51f6c-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index e6349e1b0a0..ac5915a6923 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-3267fa9f-SNAPSHOT + version: 8.14.0-cca51f6c-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 50c553db150..70031170cde 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-3267fa9f-SNAPSHOT + version: 8.14.0-cca51f6c-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From b4d8eb57e4ba8d6199edc7c219d6ef5172a9b97b Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 2 Apr 2024 07:16:53 -0400 Subject: [PATCH 080/133] [updatecli] Bump elastic stack version to 8.14.0-20c1806a (#12896) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 21ff0a1c1ae..cd27b8ef759 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-cca51f6c-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-20c1806a-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-cca51f6c-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-20c1806a-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-cca51f6c-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-20c1806a-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 5fea0934633..263b380f022 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-cca51f6c-SNAPSHOT + version: 8.14.0-20c1806a-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index ac5915a6923..01bb5f86788 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-cca51f6c-SNAPSHOT + version: 8.14.0-20c1806a-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 70031170cde..b5c23e7b1ef 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-cca51f6c-SNAPSHOT + version: 8.14.0-20c1806a-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From a904827090496f3d991e8b12a3a193844b29778e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 12:56:53 +0000 Subject: [PATCH 081/133] build(deps): bump the github-actions group with 1 update (#12895) Bumps the github-actions group with 1 update: [actions/add-to-project](https://github.com/actions/add-to-project). Updates `actions/add-to-project` from 0.6.1 to 1.0.0 - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](https://github.com/actions/add-to-project/compare/v0.6.1...v1.0.0) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- .github/workflows/add-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 8dee10cb225..5aedeba108e 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -14,7 +14,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.6.1 + - uses: actions/add-to-project@v1.0.0 with: project-url: https://github.com/orgs/elastic/projects/1286 github-token: ${{ secrets.APM_TECH_USER_TOKEN }} \ No newline at end of file From eb2c2404b51900f545e47725e46c898f36cbc222 Mon Sep 17 00:00:00 2001 From: Vishal Raj Date: Tue, 2 Apr 2024 16:05:24 +0100 Subject: [PATCH 082/133] Add empty release notes for 8.13.1 (#12900) --- changelogs/8.13.asciidoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index d5142661c3d..046066dd684 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -1,8 +1,17 @@ [[apm-release-notes-8.13]] == APM version 8.13 +* <> * <> +[float] +[[apm-release-notes-8.13.1]] +=== APM version 8.13.1 + +https://github.com/elastic/apm-server/compare/v8.13.0\...v8.13.1[View commits] + +No significant changes. + [float] [[apm-release-notes-8.13.0]] === APM version 8.13.0 From ed67ba871f863b69aa760daeb61b08d7775b740c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:03:20 +0000 Subject: [PATCH 083/133] build(deps): bump github.com/goreleaser/nfpm/v2 from 2.35.3 to 2.36.1 in /tools (#12898) * build(deps): bump github.com/goreleaser/nfpm/v2 in /tools Bumps [github.com/goreleaser/nfpm/v2](https://github.com/goreleaser/nfpm) from 2.35.3 to 2.36.1. - [Release notes](https://github.com/goreleaser/nfpm/releases) - [Changelog](https://github.com/goreleaser/nfpm/blob/main/.goreleaser.yml) - [Commits](https://github.com/goreleaser/nfpm/compare/v2.35.3...v2.36.1) --- updated-dependencies: - dependency-name: github.com/goreleaser/nfpm/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- tools/go.mod | 6 +++--- tools/go.sum | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 0cf35489cad..9db730bdcd2 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -8,7 +8,7 @@ require ( github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b github.com/elastic/go-licenser v0.4.1 github.com/elastic/gobench v0.0.0-20220608141032-f30bc57e329c - github.com/goreleaser/nfpm/v2 v2.35.3 + github.com/goreleaser/nfpm/v2 v2.36.1 github.com/josephspurrier/goversioninfo v1.4.0 github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c github.com/terraform-docs/terraform-docs v0.17.0 @@ -61,7 +61,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/licenseclassifier v0.0.0-20220907210658-23923d047d0e // indirect - github.com/google/rpmpack v0.5.0 // indirect + github.com/google/rpmpack v0.6.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/goreleaser/chglog v0.5.0 // indirect @@ -80,7 +80,7 @@ require ( github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/klauspost/compress v1.17.5 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/klauspost/pgzip v1.2.6 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/magiconair/properties v1.8.7 // indirect diff --git a/tools/go.sum b/tools/go.sum index 95e1d033e18..10d5e2ef948 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1468,8 +1468,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/rpmpack v0.5.0 h1:L16KZ3QvkFGpYhmp23iQip+mx1X39foEsqszjMNBm8A= -github.com/google/rpmpack v0.5.0/go.mod h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI= +github.com/google/rpmpack v0.6.0 h1:LoQuqlw6kHRwg25n3M0xtYrW+z2pTkR0ae1xx11hRw8= +github.com/google/rpmpack v0.6.0/go.mod h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= @@ -1515,8 +1515,8 @@ github.com/goreleaser/chglog v0.5.0 h1:Sk6BMIpx8+vpAf8KyPit34OgWui8c7nKTMHhYx88j github.com/goreleaser/chglog v0.5.0/go.mod h1:Ri46M3lrMuv76FHszs3vtABR8J8k1w9JHYAzxeeOl28= github.com/goreleaser/fileglob v1.3.0 h1:/X6J7U8lbDpQtBvGcwwPS6OpzkNVlVEsFUVRx9+k+7I= github.com/goreleaser/fileglob v1.3.0/go.mod h1:Jx6BoXv3mbYkEzwm9THo7xbr5egkAraxkGorbJb4RxU= -github.com/goreleaser/nfpm/v2 v2.35.3 h1:YGEygriY8hbsNdCBUif6RLb5xPISDHc+d22rRGXV4Zk= -github.com/goreleaser/nfpm/v2 v2.35.3/go.mod h1:eyKRLSdXPCV1GgJ0tDNe4SqcZD0Fr5cezRwcuLjpxyM= +github.com/goreleaser/nfpm/v2 v2.36.1 h1:6JmvvEJzSHddJJfNXEu+JrkLsCb9yMOvDTC6ZDhlanY= +github.com/goreleaser/nfpm/v2 v2.36.1/go.mod h1:GHvX+qQk3eRn0OeDjQS2DDBibL1TleOcu1/RB/NlxOE= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= @@ -1617,8 +1617,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= -github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -1837,8 +1837,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= From 29a3f12e5e47ea562e16e87eceee198ccd282c4f Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:23:55 -0400 Subject: [PATCH 084/133] [updatecli] Bump elastic stack version to 8.14.0-f2b0327c (#12905) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cd27b8ef759..58a686717cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-20c1806a-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-f2b0327c-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-20c1806a-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-f2b0327c-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-20c1806a-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-f2b0327c-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 263b380f022..fac72cfa333 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-20c1806a-SNAPSHOT + version: 8.14.0-f2b0327c-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 01bb5f86788..fafe4087a7b 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-20c1806a-SNAPSHOT + version: 8.14.0-f2b0327c-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index b5c23e7b1ef..e5165660c48 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-20c1806a-SNAPSHOT + version: 8.14.0-f2b0327c-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 78e3423215b4256248e850a8010d964d94806d63 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:44:30 -0400 Subject: [PATCH 085/133] chore: Update to elastic/beats@0959d568d633 (#12908) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 31fbce6d612..39dfc254f6b 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240329010145-f871b5c5f76b +Version: v7.0.0-alpha2.0.20240403142053-0959d568d633 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240329010145-f871b5c5f76b/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240403142053-0959d568d633/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 8b5430a36cd..6bfd1062f33 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240329010145-f871b5c5f76b + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240403142053-0959d568d633 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 3acb57277b5..1d2231311ec 100644 --- a/go.sum +++ b/go.sum @@ -145,10 +145,10 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240329010145-f871b5c5f76b h1:8SudrdtWlhB/OZLXXcH5//ktS9c5b/HhU48Q6gF/p/Q= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240329010145-f871b5c5f76b/go.mod h1:dRAtGY5CtNWxO5299Us2eLePBHZALhDSI5pbGjzjUwU= -github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= -github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240403142053-0959d568d633 h1:pombmti0aTViMr9ryB3uRqgv8bD7rJiy8NrFJGRqjLU= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240403142053-0959d568d633/go.mod h1:33F+tmAyd5/z8DEP27s62yoCc1YBItw9oqYAruQxT0Q= +github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= +github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY= github.com/elastic/elastic-agent-libs v0.8.0 h1:q8N6zXWbVTRWXD0mqyLrYzh3MNpHpE2iURoDX9XCU2o= From 579ae2ce2f90e5401cf3f145582f0da9de608abb Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:52:11 -0400 Subject: [PATCH 086/133] chore: Update to elastic/beats@0ce396cba611 (#12913) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 39dfc254f6b..37645d675eb 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240403142053-0959d568d633 +Version: v7.0.0-alpha2.0.20240404124503-0ce396cba611 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240403142053-0959d568d633/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240404124503-0ce396cba611/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 6bfd1062f33..702a5eff283 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240403142053-0959d568d633 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.8.0 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 1d2231311ec..d9346a2ffd6 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240403142053-0959d568d633 h1:pombmti0aTViMr9ryB3uRqgv8bD7rJiy8NrFJGRqjLU= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240403142053-0959d568d633/go.mod h1:33F+tmAyd5/z8DEP27s62yoCc1YBItw9oqYAruQxT0Q= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611 h1:14dOm4i3ZBFHymje5v1zvBgpF1LwCtM9qOLppRMcva4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611/go.mod h1:33F+tmAyd5/z8DEP27s62yoCc1YBItw9oqYAruQxT0Q= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 81600de8d0bec278664908781b865aafd68d0405 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 4 Apr 2024 13:09:45 -0400 Subject: [PATCH 087/133] [updatecli] Bump elastic stack version to 8.14.0-b2525d1c (#12910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 58a686717cd..cf115f42ddc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-f2b0327c-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-b2525d1c-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-f2b0327c-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-b2525d1c-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-f2b0327c-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-b2525d1c-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index fac72cfa333..5deef0919a2 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-f2b0327c-SNAPSHOT + version: 8.14.0-b2525d1c-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index fafe4087a7b..2cffe598e2a 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-f2b0327c-SNAPSHOT + version: 8.14.0-b2525d1c-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index e5165660c48..a5e42f33f2e 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-f2b0327c-SNAPSHOT + version: 8.14.0-b2525d1c-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 2170c518da79eea15a937c37201583108d5a121b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 21:37:03 +0000 Subject: [PATCH 088/133] build(deps): bump the golang-org-x group with 3 updates (#12915) * build(deps): bump the golang-org-x group with 3 updates Bumps the golang-org-x group with 3 updates: [golang.org/x/net](https://github.com/golang/net), [golang.org/x/sync](https://github.com/golang/sync) and [golang.org/x/term](https://github.com/golang/term). Updates `golang.org/x/net` from 0.22.0 to 0.23.0 - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) Updates `golang.org/x/sync` from 0.6.0 to 0.7.0 - [Commits](https://github.com/golang/sync/compare/v0.6.0...v0.7.0) Updates `golang.org/x/term` from 0.18.0 to 0.19.0 - [Commits](https://github.com/golang/term/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x - dependency-name: golang.org/x/term dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 16 ++++++++-------- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 37645d675eb..197f464e093 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6611,11 +6611,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.22.0 +Version: v0.23.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.22.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.23.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -6648,11 +6648,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sync -Version: v0.6.0 +Version: v0.7.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.7.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -6685,11 +6685,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/term -Version: v0.18.0 +Version: v0.19.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.18.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.19.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17435,11 +17435,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sys -Version: v0.18.0 +Version: v0.19.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.18.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.19.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index 702a5eff283..0fd065ffec6 100644 --- a/go.mod +++ b/go.mod @@ -51,9 +51,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.24.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 - golang.org/x/net v0.22.0 - golang.org/x/sync v0.6.0 - golang.org/x/term v0.18.0 + golang.org/x/net v0.23.0 + golang.org/x/sync v0.7.0 + golang.org/x/term v0.19.0 golang.org/x/time v0.5.0 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 @@ -154,7 +154,7 @@ require ( golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.16.0 // indirect - golang.org/x/sys v0.18.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect diff --git a/go.sum b/go.sum index d9346a2ffd6..1427de10a6e 100644 --- a/go.sum +++ b/go.sum @@ -635,8 +635,8 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= @@ -648,8 +648,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -681,13 +681,13 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From ec2c8f28f7737e810efe68abd5b4727b9b396f2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 08:30:53 +0000 Subject: [PATCH 089/133] build(deps): bump github.com/elastic/elastic-agent-libs from 0.8.0 to 0.9.1 (#12916) * build(deps): bump github.com/elastic/elastic-agent-libs Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.8.0 to 0.9.1. - [Release notes](https://github.com/elastic/elastic-agent-libs/releases) - [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.8.0...v0.9.1) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-libs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 197f464e093..ab64c616c77 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.8.0 +Version: v0.9.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.8.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.1/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 0fd065ffec6..93043949f3a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/elastic/apm-data v1.0.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611 github.com/elastic/elastic-agent-client/v7 v7.8.1 - github.com/elastic/elastic-agent-libs v0.8.0 + github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v1.1.0 diff --git a/go.sum b/go.sum index 1427de10a6e..403ce5ba17d 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14 github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY= -github.com/elastic/elastic-agent-libs v0.8.0 h1:q8N6zXWbVTRWXD0mqyLrYzh3MNpHpE2iURoDX9XCU2o= -github.com/elastic/elastic-agent-libs v0.8.0/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= +github.com/elastic/elastic-agent-libs v0.9.1 h1:vuvWNER0CS9zvHC9fT6zqEGWLPk9j/wbFbiC9GCMfps= +github.com/elastic/elastic-agent-libs v0.9.1/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= From 207e66880d5528fc77b4273efd40674c7dd45d62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 10:43:07 +0000 Subject: [PATCH 090/133] build(deps): bump github.com/jaegertracing/jaeger from 1.55.0 to 1.56.0 in the jaeger group (#12914) * build(deps): bump github.com/jaegertracing/jaeger in the jaeger group Bumps the jaeger group with 1 update: [github.com/jaegertracing/jaeger](https://github.com/jaegertracing/jaeger). Updates `github.com/jaegertracing/jaeger` from 1.55.0 to 1.56.0 - [Release notes](https://github.com/jaegertracing/jaeger/releases) - [Changelog](https://github.com/jaegertracing/jaeger/blob/main/CHANGELOG.md) - [Commits](https://github.com/jaegertracing/jaeger/compare/v1.55.0...v1.56.0) --- updated-dependencies: - dependency-name: github.com/jaegertracing/jaeger dependency-type: direct:production update-type: version-update:semver-minor dependency-group: jaeger ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 28 ++++++++++++++-------------- go.mod | 20 ++++++++++---------- go.sum | 46 ++++++++++++++++++++++------------------------ 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ab64c616c77..464ce16086e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3228,11 +3228,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------------------- Dependency : github.com/jaegertracing/jaeger -Version: v1.55.0 +Version: v1.56.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/jaegertracing/jaeger@v1.55.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/jaegertracing/jaeger@v1.56.0/LICENSE: Apache License Version 2.0, January 2004 @@ -7173,11 +7173,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/apache/thrift -Version: v0.19.0 +Version: v0.20.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/apache/thrift@v0.19.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/apache/thrift@v0.20.0/LICENSE: Apache License @@ -9065,11 +9065,11 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -------------------------------------------------------------------------------- Dependency : github.com/eapache/go-resiliency -Version: v1.5.0 +Version: v1.6.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/eapache/go-resiliency@v1.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/eapache/go-resiliency@v1.6.0/LICENSE: The MIT License (MIT) @@ -11022,11 +11022,11 @@ No licence file provided. -------------------------------------------------------------------------------- Dependency : github.com/golang/protobuf -Version: v1.5.3 +Version: v1.5.4 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/golang/protobuf@v1.5.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/golang/protobuf@v1.5.4/LICENSE: Copyright 2010 The Go Authors. All rights reserved. @@ -14584,11 +14584,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model -------------------------------------------------------------------------------- Dependency : github.com/prometheus/common -Version: v0.49.0 +Version: v0.51.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.49.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.51.1/LICENSE: Apache License Version 2.0, January 2004 @@ -17398,11 +17398,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/exp -Version: v0.0.0-20240103183307-be819d1f06fc +Version: v0.0.0-20240119083558-1b970713d09a Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/exp@v0.0.0-20240103183307-be819d1f06fc/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/exp@v0.0.0-20240119083558-1b970713d09a/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17509,11 +17509,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/genproto/googleapis/rpc -Version: v0.0.0-20240123012728-ef4313101c80 +Version: v0.0.0-20240125205218-1f4bbc51befe Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240123012728-ef4313101c80/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240125205218-1f4bbc51befe/LICENSE: Apache License diff --git a/go.mod b/go.mod index 93043949f3a..3ad22ae37be 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 - github.com/jaegertracing/jaeger v1.55.0 + github.com/jaegertracing/jaeger v1.56.0 github.com/libp2p/go-reuseport v0.4.0 github.com/modern-go/reflect2 v1.0.2 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0 @@ -65,7 +65,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/OneOfOne/xxhash v1.2.8 // indirect github.com/Shopify/sarama v1.38.1 // indirect - github.com/apache/thrift v0.19.0 // indirect + github.com/apache/thrift v0.20.0 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -84,7 +84,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/dop251/goja v0.0.0-20230427124612-428fc442ff5f // indirect github.com/dop251/goja_nodejs v0.0.0-20230322100729-2550c7b6c124 // indirect - github.com/eapache/go-resiliency v1.5.0 // indirect + github.com/eapache/go-resiliency v1.6.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 // indirect @@ -101,7 +101,7 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/golang/glog v1.2.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.9 // indirect github.com/h2non/filetype v1.1.3 // indirect @@ -119,7 +119,7 @@ require ( github.com/klauspost/compress v1.17.7 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect @@ -128,10 +128,10 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.49.0 // indirect + github.com/prometheus/common v0.51.1 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect @@ -152,12 +152,12 @@ require ( go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.21.0 // indirect - golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect + golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/mod v0.16.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + golang.org/x/tools v0.17.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect diff --git a/go.sum b/go.sum index 403ce5ba17d..12241edcb94 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 h1:7rj9qZ63knnVo2ZeepYHvHuRdG76f3tRUTdIQDzRBeI= github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod h1:cI59GRkC2FRaFYtgbYEqMlgnnfvAwXzjojyZKXwklNg= -github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk= -github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I= +github.com/apache/thrift v0.20.0 h1:631+KvYbsBZxmuJjYwhezVsrfc/TbqtZV4QcxOX1fOI= +github.com/apache/thrift v0.20.0/go.mod h1:hOk1BQqcp2OLzGsyVXdfMk7YFlMxK3aoEVhjD06QhB8= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -133,8 +133,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.5.0 h1:dRsaR00whmQD+SgVKlq/vCRFNgtEb5yppyeVos3Yce0= -github.com/eapache/go-resiliency v1.5.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-resiliency v1.6.0 h1:CqGDTLtpwuWKn6Nj3uNUdflaq+/kIPsg0gfNzHton30= +github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= @@ -248,9 +248,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -264,7 +263,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -311,8 +309,8 @@ github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbk github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= -github.com/jaegertracing/jaeger v1.55.0 h1:IJHzKb2B9EYQyKlE7VSoKzNP3emHeqZWnWrKj+kYzzs= -github.com/jaegertracing/jaeger v1.55.0/go.mod h1:S884Mz8H+iGI8Ealq6sM9QzSOeU6P+nbFkYw7uww8CI= +github.com/jaegertracing/jaeger v1.56.0 h1:FT7l1sOjkaNbcJ93O9pqBFUCGegYMLlA14EWWfNh5FM= +github.com/jaegertracing/jaeger v1.56.0/go.mod h1:kyckIZXALyDTXWoC3jSsKRuY8XqyWRNJ3RS04upO4UE= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -371,8 +369,9 @@ github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvf github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s= github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY= +github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -439,8 +438,9 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI= +github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= @@ -448,8 +448,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.49.0 h1:ToNTdK4zSnPVJmh698mGFkDor9wBI/iGaJy5dbH1EgI= -github.com/prometheus/common v0.49.0/go.mod h1:Kxm+EULxRbUkjGU6WFsQqo3ORzB4tyKvlWFOE9mB2sE= +github.com/prometheus/common v0.51.1 h1:eIjN50Bwglz6a/c3hAgSMcofL3nD+nFQkV6Dd4DsQCw= +github.com/prometheus/common v0.51.1/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -602,8 +602,8 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= -golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= +golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -638,8 +638,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= -golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -712,8 +712,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= -golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -725,8 +725,8 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -742,8 +742,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From ec391b44593b7ab0171a6bea38c30b27be6d2701 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 5 Apr 2024 12:20:13 -0400 Subject: [PATCH 091/133] chore: Update to elastic/beats@65ca2de7efaf (#12921) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 464ce16086e..ede42983591 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240404124503-0ce396cba611 +Version: v7.0.0-alpha2.0.20240405140018-65ca2de7efaf Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240404124503-0ce396cba611/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240405140018-65ca2de7efaf/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 3ad22ae37be..571ef46a8c8 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240405140018-65ca2de7efaf github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 12241edcb94..68cc50c8e71 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611 h1:14dOm4i3ZBFHymje5v1zvBgpF1LwCtM9qOLppRMcva4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240404124503-0ce396cba611/go.mod h1:33F+tmAyd5/z8DEP27s62yoCc1YBItw9oqYAruQxT0Q= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240405140018-65ca2de7efaf h1:wn3zIAFpXd9PTfhPP8XATFdGyzmOMzqWPiwQWHTAEKk= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240405140018-65ca2de7efaf/go.mod h1:oUZkXmbxU/NZOS2kN12tU6wmIEjFlditJFOPIA/60Jk= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 255c9826468fd8b7df1970d27a9995b61188ea9f Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 5 Apr 2024 12:42:02 -0400 Subject: [PATCH 092/133] [updatecli] Bump elastic stack version to 8.14.0-e399a313 (#12920) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cf115f42ddc..008f0b217c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-b2525d1c-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-e399a313-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-b2525d1c-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-e399a313-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-b2525d1c-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-e399a313-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 5deef0919a2..3a3057ee961 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-b2525d1c-SNAPSHOT + version: 8.14.0-e399a313-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 2cffe598e2a..1b3e55dc5b3 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-b2525d1c-SNAPSHOT + version: 8.14.0-e399a313-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index a5e42f33f2e..b56193e0780 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-b2525d1c-SNAPSHOT + version: 8.14.0-e399a313-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From ed83705f0798926ecddf4cfa441110b1ad30ebd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 19:20:28 +0000 Subject: [PATCH 093/133] build(deps): bump github.com/cespare/xxhash/v2 from 2.2.0 to 2.3.0 (#12926) * build(deps): bump github.com/cespare/xxhash/v2 from 2.2.0 to 2.3.0 Bumps [github.com/cespare/xxhash/v2](https://github.com/cespare/xxhash) from 2.2.0 to 2.3.0. - [Commits](https://github.com/cespare/xxhash/compare/v2.2.0...v2.3.0) --- updated-dependencies: - dependency-name: github.com/cespare/xxhash/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ede42983591..941d71ad092 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -11,11 +11,11 @@ Third party libraries used by the Elastic APM Server project: -------------------------------------------------------------------------------- Dependency : github.com/cespare/xxhash/v2 -Version: v2.2.0 +Version: v2.3.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/cespare/xxhash/v2@v2.2.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/cespare/xxhash/v2@v2.3.0/LICENSE.txt: Copyright (c) 2016 Caleb Spare diff --git a/go.mod b/go.mod index 571ef46a8c8..f5f9390c35d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 toolchain go1.22.1 require ( - github.com/cespare/xxhash/v2 v2.2.0 + github.com/cespare/xxhash/v2 v2.3.0 github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 diff --git a/go.sum b/go.sum index 68cc50c8e71..d2496ceb8c6 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= From 4b1b3841b01855b68b02bf22c1d9fbd711eb359d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:31:00 +0000 Subject: [PATCH 094/133] build(deps): bump golang.org/x/net from 0.23.0 to 0.24.0 in the golang-org-x group (#12925) * build(deps): bump golang.org/x/net in the golang-org-x group Bumps the golang-org-x group with 1 update: [golang.org/x/net](https://github.com/golang/net). Updates `golang.org/x/net` from 0.23.0 to 0.24.0 - [Commits](https://github.com/golang/net/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-org-x ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 941d71ad092..429c09ab806 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6611,11 +6611,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.23.0 +Version: v0.24.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.23.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.24.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17361,11 +17361,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/crypto -Version: v0.21.0 +Version: v0.22.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.21.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.22.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/go.mod b/go.mod index f5f9390c35d..d87246f39d8 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.24.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 - golang.org/x/net v0.23.0 + golang.org/x/net v0.24.0 golang.org/x/sync v0.7.0 golang.org/x/term v0.19.0 golang.org/x/time v0.5.0 @@ -151,7 +151,7 @@ require ( go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.21.0 // indirect + golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/mod v0.16.0 // indirect golang.org/x/sys v0.19.0 // indirect diff --git a/go.sum b/go.sum index d2496ceb8c6..ecfaba5e8bf 100644 --- a/go.sum +++ b/go.sum @@ -599,8 +599,8 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= @@ -635,8 +635,8 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= From 098d1b5719b64c4bb593b4f5c5be2c08279d9358 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 8 Apr 2024 06:32:39 -0400 Subject: [PATCH 095/133] [updatecli] Bump Golang version to 1.22.2 (#12927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Dockerfile with Golang version 1.22.2 Made with ❤️️ by updatecli * chore: Update .go-version with Golang version 1.22.2 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- .go-version | 2 +- packaging/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index 6245beecd39..6fee2fedb0a 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.1 +1.22.2 diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index d17c5f07da8..81a3d3bd4d4 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04 # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. -FROM golang:1.22.1 as builder +FROM golang:1.22.2 as builder WORKDIR /src COPY go.mod go.sum /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod From 8f5eccd97393628840e142aeeb9533c802285c32 Mon Sep 17 00:00:00 2001 From: Vishal Raj Date: Mon, 8 Apr 2024 12:22:45 +0100 Subject: [PATCH 096/133] Add empty release notes for v8.13.2 (#12929) --- changelogs/8.13.asciidoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index 046066dd684..9f38423f001 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -1,9 +1,18 @@ [[apm-release-notes-8.13]] == APM version 8.13 +* <> * <> * <> +[float] +[[apm-release-notes-8.13.2]] +=== APM version 8.13.2 + +https://github.com/elastic/apm-server/compare/v8.13.1\...v8.13.2[View commits] + +No significant changes. + [float] [[apm-release-notes-8.13.1]] === APM version 8.13.1 From 03a6676e82c02124f0343f9cf0a368e94195e65c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:29:56 +0200 Subject: [PATCH 097/133] build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.0 (#12917) * build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.0 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.62.1 to 1.63.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.62.1...v1.63.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * lint: update deprecated methods * Update NOTICE.txt * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- internal/beater/jaeger/grpc_test.go | 2 +- internal/beater/otlp/grpc_test.go | 2 +- internal/beater/server_test.go | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 429c09ab806..b570ff60720 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6759,11 +6759,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/grpc -Version: v1.62.1 +Version: v1.63.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.62.1/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.63.0/LICENSE: Apache License @@ -17509,11 +17509,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/genproto/googleapis/rpc -Version: v0.0.0-20240125205218-1f4bbc51befe +Version: v0.0.0-20240227224415-6ceb2ff114de Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240125205218-1f4bbc51befe/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240227224415-6ceb2ff114de/LICENSE: Apache License diff --git a/go.mod b/go.mod index d87246f39d8..0a461f27ae8 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( golang.org/x/sync v0.7.0 golang.org/x/term v0.19.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.62.1 + google.golang.org/grpc v1.63.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -157,7 +157,7 @@ require ( golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect diff --git a/go.sum b/go.sum index ecfaba5e8bf..7f8763c9525 100644 --- a/go.sum +++ b/go.sum @@ -725,15 +725,15 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= +google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27 h1:EB/3dtnYKOItaNPpOI/HmOCGbVZUiXcstRfiuxN+cFg= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27/go.mod h1:Crtq1t+mykyL5d6PR3z8zCxKx/Qjq/mlPWDPoWJANYA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/internal/beater/jaeger/grpc_test.go b/internal/beater/jaeger/grpc_test.go index dfa1d438a98..d17f8796c8d 100644 --- a/internal/beater/jaeger/grpc_test.go +++ b/internal/beater/jaeger/grpc_test.go @@ -215,7 +215,7 @@ func newServer(t *testing.T, batchProcessor modelpb.BatchProcessor, agentcfgFetc go srv.Serve(lis) t.Cleanup(srv.GracefulStop) - conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) require.NoError(t, err) t.Cleanup(func() { conn.Close() }) return conn, observedLogs diff --git a/internal/beater/otlp/grpc_test.go b/internal/beater/otlp/grpc_test.go index 7f3bfb7877b..5d4e70ad871 100644 --- a/internal/beater/otlp/grpc_test.go +++ b/internal/beater/otlp/grpc_test.go @@ -196,7 +196,7 @@ func newGRPCServer(t *testing.T, batchProcessor modelpb.BatchProcessor) *grpc.Cl go srv.Serve(lis) t.Cleanup(srv.GracefulStop) - conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) require.NoError(t, err) t.Cleanup(func() { conn.Close() }) return conn diff --git a/internal/beater/server_test.go b/internal/beater/server_test.go index d5289612281..5f3cd4abe6a 100644 --- a/internal/beater/server_test.go +++ b/internal/beater/server_test.go @@ -287,7 +287,7 @@ func TestServerJaegerGRPC(t *testing.T) { srv := beatertest.NewServer(t) baseURL, err := url.Parse(srv.URL) require.NoError(t, err) - conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials())) require.NoError(t, err) defer conn.Close() @@ -315,7 +315,7 @@ func TestServerOTLPGRPC(t *testing.T) { return conn.Invoke(ctx, "/opentelemetry.proto.collector.trace.v1.TraceService/Export", request, response) } - conn, err := grpc.Dial(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(baseURL.Host, grpc.WithTransportCredentials(insecure.NewCredentials())) require.NoError(t, err) defer conn.Close() From 0f19a3dab351262d5008e72cc5e83f37b0db6bfc Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:23:13 -0400 Subject: [PATCH 098/133] chore: Update to elastic/beats@5947565307e3 (#12937) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index b570ff60720..5151786da1d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240405140018-65ca2de7efaf +Version: v7.0.0-alpha2.0.20240408102757-5947565307e3 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240405140018-65ca2de7efaf/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240408102757-5947565307e3/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 0a461f27ae8..dd506179029 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.0.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240405140018-65ca2de7efaf + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 7f8763c9525..b38f29675dc 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240405140018-65ca2de7efaf h1:wn3zIAFpXd9PTfhPP8XATFdGyzmOMzqWPiwQWHTAEKk= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240405140018-65ca2de7efaf/go.mod h1:oUZkXmbxU/NZOS2kN12tU6wmIEjFlditJFOPIA/60Jk= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3 h1:KpUmR0zYMgdvXsABz53IQa+DaqwdxuHIhv7PzYTtzOw= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3/go.mod h1:5nRXA9x9Ea66liXPusyJb73jvQ1g4Q2Y1TKvjlrfjmM= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= @@ -235,6 +235,7 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= From 625a9f0bf98e72502cdab833930021dbcc220b87 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:42:53 -0400 Subject: [PATCH 099/133] [updatecli] Bump elastic stack version to 8.14.0-34b4df0a (#12935) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 008f0b217c6..4048de23ec8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-e399a313-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-34b4df0a-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-e399a313-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-34b4df0a-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-e399a313-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-34b4df0a-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 3a3057ee961..fac54ddf409 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-e399a313-SNAPSHOT + version: 8.14.0-34b4df0a-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 1b3e55dc5b3..b6787bcc76f 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-e399a313-SNAPSHOT + version: 8.14.0-34b4df0a-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index b56193e0780..3205f9844d6 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-e399a313-SNAPSHOT + version: 8.14.0-34b4df0a-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From f55a20e21116c22f14d10bff9aa2117fe628edc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 18:09:52 +0000 Subject: [PATCH 100/133] build(deps): bump github.com/elastic/apm-data from 1.0.0 to 1.1.0 (#12940) * build(deps): bump github.com/elastic/apm-data from 1.0.0 to 1.1.0 Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/elastic/apm-data/releases) - [Commits](https://github.com/elastic/apm-data/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: github.com/elastic/apm-data dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 5151786da1d..d7f847e03aa 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -362,11 +362,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v1.0.0 +Version: v1.1.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.0.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index dd506179029..e1290fcce6a 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 - github.com/elastic/apm-data v1.0.0 + github.com/elastic/apm-data v1.1.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 @@ -156,7 +156,7 @@ require ( golang.org/x/mod v0.16.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.19.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect diff --git a/go.sum b/go.sum index b38f29675dc..77bef5b470b 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HEE0a5BDFmhEmJV/Uo4uzj/paHjd7yl6+KYguw= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= -github.com/elastic/apm-data v1.0.0 h1:23JEBSOq9bIKcocghV38so2mFZzdlFgst0Re+ApxuFo= -github.com/elastic/apm-data v1.0.0/go.mod h1:QUZMN5IFWhqbNfSUQxvd7Tuj7tx/6NoVJpFLAXd8ScY= +github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= +github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3 h1:KpUmR0zYMgdvXsABz53IQa+DaqwdxuHIhv7PzYTtzOw= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3/go.mod h1:5nRXA9x9Ea66liXPusyJb73jvQ1g4Q2Y1TKvjlrfjmM= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= @@ -713,8 +713,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 6a9b2281ca906b4cdfa8c6abef5e1f9ebb940874 Mon Sep 17 00:00:00 2001 From: Kaan Yalti Date: Mon, 8 Apr 2024 13:06:09 -0700 Subject: [PATCH 101/133] upgrade go-sysinfo package (#12943) * updated go-sysinfo package * ran make fmt update * updated version.go --- NOTICE.txt | 12 ++++++------ docs/spec/v2/metadata.json | 8 ++++++++ go.mod | 6 +++--- go.sum | 12 ++++++------ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d7f847e03aa..e91d8a7a6cc 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1884,11 +1884,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearc -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-sysinfo -Version: v1.13.1 +Version: v1.14.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.13.1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.14.0/LICENSE.txt: Apache License @@ -14795,11 +14795,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.51 -------------------------------------------------------------------------------- Dependency : github.com/prometheus/procfs -Version: v0.12.0 +Version: v0.13.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.12.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.13.0/LICENSE: Apache License Version 2.0, January 2004 @@ -18987,11 +18987,11 @@ Contents of probable licence file $GOMODCACHE/gopkg.in/yaml.v2@v2.4.0/LICENSE: -------------------------------------------------------------------------------- Dependency : howett.net/plist -Version: v1.0.0 +Version: v1.0.1 Licence type (autodetected): BSD-2-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/howett.net/plist@v1.0.0/LICENSE: +Contents of probable licence file $GOMODCACHE/howett.net/plist@v1.0.1/LICENSE: Copyright (c) 2013, Dustin L. Howett. All rights reserved. diff --git a/docs/spec/v2/metadata.json b/docs/spec/v2/metadata.json index 7103bbeb5a4..1122ed68c2e 100644 --- a/docs/spec/v2/metadata.json +++ b/docs/spec/v2/metadata.json @@ -441,6 +441,14 @@ ], "maxLength": 1024 }, + "host_id": { + "description": "The OpenTelemetry semantic conventions compliant \"host.id\" attribute, if available.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, "hostname": { "description": "Deprecated: Use ConfiguredHostname and DetectedHostname instead. DeprecatedHostname is the host name of the system the service is running on. It does not distinguish between configured and detected hostname and therefore is deprecated and only used if no other hostname information is available.", "type": [ diff --git a/go.mod b/go.mod index e1290fcce6a..0801e5df925 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v1.1.0 github.com/elastic/go-elasticsearch/v8 v8.13.0 - github.com/elastic/go-sysinfo v1.13.1 + github.com/elastic/go-sysinfo v1.14.0 github.com/elastic/go-ucfg v0.8.8 github.com/go-sourcemap/sourcemap v2.1.4+incompatible github.com/gofrs/flock v0.8.1 @@ -132,7 +132,7 @@ require ( github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.51.1 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect @@ -164,7 +164,7 @@ require ( gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - howett.net/plist v1.0.0 // indirect + howett.net/plist v1.0.1 // indirect k8s.io/client-go v0.26.2 // indirect k8s.io/klog/v2 v2.90.1 // indirect k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect diff --git a/go.sum b/go.sum index 77bef5b470b..c498f262c03 100644 --- a/go.sum +++ b/go.sum @@ -169,8 +169,8 @@ github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= -github.com/elastic/go-sysinfo v1.13.1 h1:U5Jlx6c/rLkR72O8wXXXo1abnGlWGJU/wbzNJ2AfQa4= -github.com/elastic/go-sysinfo v1.13.1/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ= +github.com/elastic/go-sysinfo v1.14.0 h1:dQRtiqLycoOOla7IflZg3aN213vqJmP0lpVpKQ9lUEY= +github.com/elastic/go-sysinfo v1.14.0/go.mod h1:FKUXnZWhnYI0ueO7jhsGV3uQJ5hiz8OqM5b3oGyaRr8= github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk= github.com/elastic/go-ucfg v0.8.8/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= @@ -451,8 +451,8 @@ github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZ github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= github.com/prometheus/common v0.51.1 h1:eIjN50Bwglz6a/c3hAgSMcofL3nD+nFQkV6Dd4DsQCw= github.com/prometheus/common v0.51.1/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= @@ -784,8 +784,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= -howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= +howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= +howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ= k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ= From c8c4a3a5a8033bd32f506a46f08b24ee0f0fd9ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:28:14 +0000 Subject: [PATCH 102/133] build(deps): bump github.com/elastic/gmux from 0.3.1 to 0.3.2 (#12942) * build(deps): bump github.com/elastic/gmux from 0.3.1 to 0.3.2 Bumps [github.com/elastic/gmux](https://github.com/elastic/gmux) from 0.3.1 to 0.3.2. - [Release notes](https://github.com/elastic/gmux/releases) - [Commits](https://github.com/elastic/gmux/compare/v0.3.1...v0.3.2) --- updated-dependencies: - dependency-name: github.com/elastic/gmux dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e91d8a7a6cc..a4b26bdb7a6 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1251,11 +1251,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/gmux -Version: v0.3.1 +Version: v0.3.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.2/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 0801e5df925..1a4008917b9 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 - github.com/elastic/gmux v0.3.1 + github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender v1.1.0 github.com/elastic/go-elasticsearch/v8 v8.13.0 github.com/elastic/go-sysinfo v1.14.0 diff --git a/go.sum b/go.sum index c498f262c03..12099816366 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhB github.com/elastic/elastic-agent-system-metrics v0.9.2/go.mod h1:VfJnKw4Jqrd9ddljXCwaGKJgN+7ADyyGk089NaXVsf0= github.com/elastic/elastic-transport-go/v8 v8.5.0 h1:v5membAl7lvQgBTexPRDBO/RdnlQX+FM9fUVDyXxvH0= github.com/elastic/elastic-transport-go/v8 v8.5.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= -github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= -github.com/elastic/gmux v0.3.1/go.mod h1:IBFLojLnACU9tsUnoSavOaMdhq63/HOH/Aeiiha36jA= +github.com/elastic/gmux v0.3.2 h1:cb721R+fe/rt/jVNyBP5HDQsEwLD2wSKfPD2Sk6adDk= +github.com/elastic/gmux v0.3.2/go.mod h1:OD6oYrno+SV3pyl1ArdWCjlExZ+FJOfoSaFqnFeldBQ= github.com/elastic/go-docappender v1.1.0 h1:wuA3Im+Y0PuQQ/FzLZUb0+6eT64oLhGCqQV49OvR9EU= github.com/elastic/go-docappender v1.1.0/go.mod h1:u0hkrzDr9w81uNFWUxeOyM0IX9aZUag/gHlOnHyCrzA= github.com/elastic/go-elasticsearch/v8 v8.13.0 h1:YXPAWpvbYX0mWSNG9tnEpvs4h1stgMy5JUeKZECYYB8= From f7587659904ae1c503f4479c0d9757e980d3d45b Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Tue, 9 Apr 2024 10:55:28 +0200 Subject: [PATCH 103/133] Added changelog for apm-data upgrade to 1.1 (#12944) * Added changelog * Added accidentally removed float back --- changelogs/head.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index d54a7013e6f..2960ca0b5b5 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -14,3 +14,5 @@ https://github.com/elastic/apm-server/compare/8.13\...main[View commits] [float] ==== Added +- OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940] +- Add support for setting the `host.id` via IntakeV2 {pull}12940[12940] \ No newline at end of file From 5d2d331c6d7665c8f6992dba831d4e6ab2c10f74 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 9 Apr 2024 11:24:55 -0400 Subject: [PATCH 104/133] chore: Update to elastic/beats@8efb36685ea9 (#12945) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index a4b26bdb7a6..24da332b9ba 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240408102757-5947565307e3 +Version: v7.0.0-alpha2.0.20240409055404-8efb36685ea9 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240408102757-5947565307e3/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240409055404-8efb36685ea9/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 1a4008917b9..613a75ac5dc 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240409055404-8efb36685ea9 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 12099816366..b68455ffaad 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3 h1:KpUmR0zYMgdvXsABz53IQa+DaqwdxuHIhv7PzYTtzOw= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240408102757-5947565307e3/go.mod h1:5nRXA9x9Ea66liXPusyJb73jvQ1g4Q2Y1TKvjlrfjmM= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240409055404-8efb36685ea9 h1:GoshEyjcoQReQZOeYJYbxlmCC+1hmzf6GMyDkSwozgQ= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240409055404-8efb36685ea9/go.mod h1:o3xzqUgwb2kDoXgcyB3ftw1UQPPZIZqiCFB5MVcqe8Q= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From d798ad0d38836460917b19c7aba9606bd31ce779 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 20:56:08 +0200 Subject: [PATCH 105/133] build(deps): bump google.golang.org/grpc from 1.63.0 to 1.63.2 (#12947) * build(deps): bump google.golang.org/grpc from 1.63.0 to 1.63.2 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.63.0 to 1.63.2. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.63.0...v1.63.2) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 24da332b9ba..2cdbf40d975 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6759,11 +6759,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/grpc -Version: v1.63.0 +Version: v1.63.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.63.0/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.63.2/LICENSE: Apache License diff --git a/go.mod b/go.mod index 613a75ac5dc..e62c702ece1 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( golang.org/x/sync v0.7.0 golang.org/x/term v0.19.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.63.0 + google.golang.org/grpc v1.63.2 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index b68455ffaad..fc66a814979 100644 --- a/go.sum +++ b/go.sum @@ -733,8 +733,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= -google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27 h1:EB/3dtnYKOItaNPpOI/HmOCGbVZUiXcstRfiuxN+cFg= google.golang.org/grpc/examples v0.0.0-20231016154744-cb430bed4d27/go.mod h1:Crtq1t+mykyL5d6PR3z8zCxKx/Qjq/mlPWDPoWJANYA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From a3697b9debc2b35c6ead8089b869b489901798f4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:39:26 -0400 Subject: [PATCH 106/133] chore: Update to elastic/beats@a3f7baece42f (#12951) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 2cdbf40d975..c88b5de8fbd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240409055404-8efb36685ea9 +Version: v7.0.0-alpha2.0.20240410143541-a3f7baece42f Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240409055404-8efb36685ea9/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240410143541-a3f7baece42f/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index e62c702ece1..b1231b27b34 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240409055404-8efb36685ea9 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240410143541-a3f7baece42f github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index fc66a814979..42461f8b06a 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240409055404-8efb36685ea9 h1:GoshEyjcoQReQZOeYJYbxlmCC+1hmzf6GMyDkSwozgQ= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240409055404-8efb36685ea9/go.mod h1:o3xzqUgwb2kDoXgcyB3ftw1UQPPZIZqiCFB5MVcqe8Q= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240410143541-a3f7baece42f h1:Yub/H1yIsLQO+B6xlvcXow1a9/HZrnStwJXfJ5j1Sr0= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240410143541-a3f7baece42f/go.mod h1:rEvo7H08cfSOzZqeumqS1sZdJUIS/l3YSqiJWrF/q8Y= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 8e8debef0466ad88d17bb5a6f47e370ec7e2ee8a Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:58:38 -0400 Subject: [PATCH 107/133] [updatecli] Bump elastic stack version to 8.14.0-12492c7b (#12950) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4048de23ec8..24ca402fb49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-34b4df0a-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-12492c7b-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-34b4df0a-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-12492c7b-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-34b4df0a-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-12492c7b-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index fac54ddf409..734f155a6d8 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-34b4df0a-SNAPSHOT + version: 8.14.0-12492c7b-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index b6787bcc76f..3b3dba6d505 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-34b4df0a-SNAPSHOT + version: 8.14.0-12492c7b-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 3205f9844d6..48258267bbc 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-34b4df0a-SNAPSHOT + version: 8.14.0-12492c7b-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 46dff23f297b260aebf055ef1e383e6fec2295eb Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:38:20 -0400 Subject: [PATCH 108/133] [updatecli] Bump elastic stack version to 8.14.0-540ac545 (#12955) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 24ca402fb49..df7e849430d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-12492c7b-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-540ac545-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-12492c7b-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-540ac545-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-12492c7b-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-540ac545-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 734f155a6d8..2e5fe2b51a6 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-12492c7b-SNAPSHOT + version: 8.14.0-540ac545-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 3b3dba6d505..4dae6d3e371 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-12492c7b-SNAPSHOT + version: 8.14.0-540ac545-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 48258267bbc..1f0ecf2badf 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-12492c7b-SNAPSHOT + version: 8.14.0-540ac545-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From c5ccaa88dce0e5633fdc1e6ebc8cbcf28193fcfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 20:40:04 +0200 Subject: [PATCH 109/133] build(deps): bump the go-agent group with 6 updates (#12960) * build(deps): bump the go-agent group with 6 updates Bumps the go-agent group with 6 updates: | Package | From | To | | --- | --- | --- | | [go.elastic.co/apm/module/apmelasticsearch/v2](https://github.com/elastic/apm-agent-go) | `2.5.0` | `2.6.0` | | [go.elastic.co/apm/module/apmgorilla/v2](https://github.com/elastic/apm-agent-go) | `2.5.0` | `2.6.0` | | [go.elastic.co/apm/module/apmgrpc/v2](https://github.com/elastic/apm-agent-go) | `2.5.0` | `2.6.0` | | [go.elastic.co/apm/module/apmhttp/v2](https://github.com/elastic/apm-agent-go) | `2.5.0` | `2.6.0` | | [go.elastic.co/apm/module/apmotel/v2](https://github.com/elastic/apm-agent-go) | `2.5.0` | `2.6.0` | | [go.elastic.co/apm/v2](https://github.com/elastic/apm-agent-go) | `2.5.0` | `2.6.0` | Updates `go.elastic.co/apm/module/apmelasticsearch/v2` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.5.0...v2.6.0) Updates `go.elastic.co/apm/module/apmgorilla/v2` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.5.0...v2.6.0) Updates `go.elastic.co/apm/module/apmgrpc/v2` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.5.0...v2.6.0) Updates `go.elastic.co/apm/module/apmhttp/v2` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.5.0...v2.6.0) Updates `go.elastic.co/apm/module/apmotel/v2` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.5.0...v2.6.0) Updates `go.elastic.co/apm/v2` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/elastic/apm-agent-go/releases) - [Changelog](https://github.com/elastic/apm-agent-go/blob/main/CHANGELOG.asciidoc) - [Commits](https://github.com/elastic/apm-agent-go/compare/v2.5.0...v2.6.0) --- updated-dependencies: - dependency-name: go.elastic.co/apm/module/apmelasticsearch/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmgorilla/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmgrpc/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmhttp/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/module/apmotel/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent - dependency-name: go.elastic.co/apm/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-agent ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 44 ++++++++++++++++++++++---------------------- go.mod | 22 +++++++++++----------- go.sum | 44 ++++++++++++++++++++++---------------------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index c88b5de8fbd..99a7d3594d4 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -4198,11 +4198,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmelasticsearch/v2 -Version: v2.5.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -4409,11 +4409,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmgorilla/v2 -Version: v2.5.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorilla/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -4620,11 +4620,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgorill -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmgrpc/v2 -Version: v2.5.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -4831,11 +4831,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmgrpc/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmhttp/v2 -Version: v2.5.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5042,11 +5042,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmotel/v2 -Version: v2.5.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5253,11 +5253,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmotel/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/v2 -Version: v2.5.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -5921,11 +5921,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel -Version: v1.24.0 +Version: v1.25.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.25.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6132,11 +6132,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.24.0/L -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/metric -Version: v1.24.0 +Version: v1.25.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.25.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6343,11 +6343,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1 -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/sdk/metric -Version: v1.24.0 +Version: v1.25.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.25.0/LICENSE: Apache License Version 2.0, January 2004 @@ -16910,11 +16910,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semc -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/sdk -Version: v1.24.0 +Version: v1.25.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.25.0/LICENSE: Apache License Version 2.0, January 2004 @@ -17121,11 +17121,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.24 -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/trace -Version: v1.24.0 +Version: v1.25.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.25.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index b1231b27b34..f42233173e3 100644 --- a/go.mod +++ b/go.mod @@ -37,18 +37,18 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 - go.elastic.co/apm/module/apmgorilla/v2 v2.5.0 - go.elastic.co/apm/module/apmgrpc/v2 v2.5.0 - go.elastic.co/apm/module/apmhttp/v2 v2.5.0 - go.elastic.co/apm/module/apmotel/v2 v2.5.0 - go.elastic.co/apm/v2 v2.5.0 + go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 + go.elastic.co/apm/module/apmgorilla/v2 v2.6.0 + go.elastic.co/apm/module/apmgrpc/v2 v2.6.0 + go.elastic.co/apm/module/apmhttp/v2 v2.6.0 + go.elastic.co/apm/module/apmotel/v2 v2.6.0 + go.elastic.co/apm/v2 v2.6.0 go.elastic.co/fastjson v1.3.0 go.opentelemetry.io/collector/consumer v0.97.0 go.opentelemetry.io/collector/pdata v1.4.0 - go.opentelemetry.io/otel v1.24.0 - go.opentelemetry.io/otel/metric v1.24.0 - go.opentelemetry.io/otel/sdk/metric v1.24.0 + go.opentelemetry.io/otel v1.25.0 + go.opentelemetry.io/otel/metric v1.25.0 + go.opentelemetry.io/otel/sdk/metric v1.25.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 golang.org/x/net v0.24.0 @@ -148,8 +148,8 @@ require ( go.elastic.co/apm/module/apmzap/v2 v2.5.0 // indirect go.elastic.co/ecszap v1.0.2 // indirect go.opentelemetry.io/collector/semconv v0.97.0 // indirect - go.opentelemetry.io/otel/sdk v1.24.0 // indirect - go.opentelemetry.io/otel/trace v1.24.0 // indirect + go.opentelemetry.io/otel/sdk v1.25.0 // indirect + go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect diff --git a/go.sum b/go.sum index 42461f8b06a..c8183a49700 100644 --- a/go.sum +++ b/go.sum @@ -544,20 +544,20 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4= -go.elastic.co/apm/module/apmgorilla/v2 v2.5.0 h1:XeKkwqXWBEoU68AYPvFaOJYcs+c56S9sLV2wtRdwf3g= -go.elastic.co/apm/module/apmgorilla/v2 v2.5.0/go.mod h1:EORWcVUh8p3Z2d2GdoHMQs07fhkXRqV3lInehgMMnao= -go.elastic.co/apm/module/apmgrpc/v2 v2.5.0 h1:4wpg5I4KztfSFWw4pSU+EhpSeTdoZD3CPwfRmy62JKY= -go.elastic.co/apm/module/apmgrpc/v2 v2.5.0/go.mod h1:urZQQAB9p6J0uXmtK6YZE6nfmiY7JsxFbJXck495/Ls= -go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe4eySAnURo= -go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk= -go.elastic.co/apm/module/apmotel/v2 v2.5.0 h1:/U83qrMC7dEtByhrCNXqjLkwJ+krsp6bkLQEURJwYsI= -go.elastic.co/apm/module/apmotel/v2 v2.5.0/go.mod h1:v0m8Jq9VX5s9zasL35MGTVLMreT8BFOzEq+mTtHuF1I= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 h1:ukMcwyMaDXsS1dRK2qRYXT2AsfwaUy74TOOYCqkWJow= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0/go.mod h1:YpfiTTrqX5LB/CKBwX89oDCBAxuLJTFv40gcfxJyehM= +go.elastic.co/apm/module/apmgorilla/v2 v2.6.0 h1:vXMZPNFss4a9146sIuT4zxQemVpQjNUDIIS9RMOr9PE= +go.elastic.co/apm/module/apmgorilla/v2 v2.6.0/go.mod h1:w3/W4oDZPWBye0McuIpM7d5xSQ1WoFnMmgmEIzCsxIk= +go.elastic.co/apm/module/apmgrpc/v2 v2.6.0 h1:0HPYGtjjS6wUE/f7Pw7L4R7IvgptGlXY8qMKFifFZj0= +go.elastic.co/apm/module/apmgrpc/v2 v2.6.0/go.mod h1:96P3OJkfJe3ZzkCHmFofu5VOWa4CAPRWyUiCt4NgWkk= +go.elastic.co/apm/module/apmhttp/v2 v2.6.0 h1:s8UeNFQmVBCNd4eoz7KDD9rEFhQC0HeUFXz3z9gpAmQ= +go.elastic.co/apm/module/apmhttp/v2 v2.6.0/go.mod h1:D0GLppLuI0Ddwvtl595GUxRgn6Z8L5KaDFVMv2H3GK0= +go.elastic.co/apm/module/apmotel/v2 v2.6.0 h1:5z1/kH2FD/K8Yacl04plBy2YVW6cDPTCMNmM6zG4FJk= +go.elastic.co/apm/module/apmotel/v2 v2.6.0/go.mod h1:jU0+sy3GUHvM70Pf99BXbxgSZyHBFMaBiMWxiNwaxng= go.elastic.co/apm/module/apmzap/v2 v2.5.0 h1:COXqVte4i75XQmV+H4m4g+2JubK3Y1WRIzY/ppKa3bQ= go.elastic.co/apm/module/apmzap/v2 v2.5.0/go.mod h1:PHKFbSROQPFZ2+X3oZyaF8lie5DhK0gtcRMpz//S54g= -go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ= -go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= +go.elastic.co/apm/v2 v2.6.0 h1:VieBMLQFtXua2YxpYxaSdYGnmmxhLT46gosI5yErJgY= +go.elastic.co/apm/v2 v2.6.0/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo= go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= @@ -568,16 +568,16 @@ go.opentelemetry.io/collector/pdata v1.4.0 h1:cA6Pr7Z2V7mE+i7FmYpavX7nefzd6H4CIC go.opentelemetry.io/collector/pdata v1.4.0/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= go.opentelemetry.io/collector/semconv v0.97.0 h1:iF3nTfThbiOwz7o5Pocn0dDnDoffd18ijDuf6Mwzi1s= go.opentelemetry.io/collector/semconv v0.97.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= -go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= -go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= -go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= -go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= -go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= -go.opentelemetry.io/otel/sdk/metric v1.24.0 h1:yyMQrPzF+k88/DbH7o4FMAs80puqd+9osbiBrJrz/w8= -go.opentelemetry.io/otel/sdk/metric v1.24.0/go.mod h1:I6Y5FjH6rvEnTTAYQz3Mmv2kl6Ek5IIrmwTLqMrrOE0= -go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= -go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= +go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg= +go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA= +go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s= +go.opentelemetry.io/otel/sdk v1.25.0 h1:PDryEJPC8YJZQSyLY5eqLeafHtG+X7FWnf3aXMtxbqo= +go.opentelemetry.io/otel/sdk v1.25.0/go.mod h1:oFgzCM2zdsxKzz6zwpTZYLLQsFwc+K0daArPdIhuxkw= +go.opentelemetry.io/otel/sdk/metric v1.25.0 h1:7CiHOy08LbrxMAp4vWpbiPcklunUshVpAvGBrdDRlGw= +go.opentelemetry.io/otel/sdk/metric v1.25.0/go.mod h1:LzwoKptdbBBdYfvtGCzGwk6GWMA3aUzBOwtQpR6Nz7o= +go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM= +go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= From e9cc9013a7fc470228dd01901ec5fa3bc01ab414 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:01:33 +0000 Subject: [PATCH 110/133] build(deps): bump the otel group with 2 updates (#12962) * build(deps): bump the otel group with 2 updates Bumps the otel group with 2 updates: [go.opentelemetry.io/collector/consumer](https://github.com/open-telemetry/opentelemetry-collector) and [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector). Updates `go.opentelemetry.io/collector/consumer` from 0.97.0 to 0.98.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.97.0...v0.98.0) Updates `go.opentelemetry.io/collector/pdata` from 1.4.0 to 1.5.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.4.0...pdata/v1.5.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/consumer dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/collector/pdata dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 99a7d3594d4..7e370c96012 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5497,11 +5497,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/consumer -Version: v0.97.0 +Version: v0.98.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.97.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.98.0/LICENSE: Apache License @@ -5709,11 +5709,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/pdata -Version: v1.4.0 +Version: v1.5.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.4.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.5.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index f42233173e3..035feb1493b 100644 --- a/go.mod +++ b/go.mod @@ -44,8 +44,8 @@ require ( go.elastic.co/apm/module/apmotel/v2 v2.6.0 go.elastic.co/apm/v2 v2.6.0 go.elastic.co/fastjson v1.3.0 - go.opentelemetry.io/collector/consumer v0.97.0 - go.opentelemetry.io/collector/pdata v1.4.0 + go.opentelemetry.io/collector/consumer v0.98.0 + go.opentelemetry.io/collector/pdata v1.5.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/sdk/metric v1.25.0 diff --git a/go.sum b/go.sum index c8183a49700..8ba2413241d 100644 --- a/go.sum +++ b/go.sum @@ -562,10 +562,10 @@ go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= -go.opentelemetry.io/collector/consumer v0.97.0 h1:S0BZQtJQxSHT156S8a5rLt3TeWYP8Rq+jn8QEyWQUYk= -go.opentelemetry.io/collector/consumer v0.97.0/go.mod h1:1D06LURiZ/1KA2OnuKNeSn9bvFmJ5ZWe6L8kLu0osSY= -go.opentelemetry.io/collector/pdata v1.4.0 h1:cA6Pr7Z2V7mE+i7FmYpavX7nefzd6H4CICgW0T9aJX0= -go.opentelemetry.io/collector/pdata v1.4.0/go.mod h1:0Ttp4wQinhV5oJTd9MjyvUegmZBO9O0nrlh/+EDLw+Q= +go.opentelemetry.io/collector/consumer v0.98.0 h1:47zJ5HFKXVA0RciuwkZnPU5W8j0TYUxToB1/zzzgEhs= +go.opentelemetry.io/collector/consumer v0.98.0/go.mod h1:c2edTq38uVJET/NE6VV7/Qpyznnlz8b6VE7J6TXD57c= +go.opentelemetry.io/collector/pdata v1.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8XFyA07j8LE= +go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw= go.opentelemetry.io/collector/semconv v0.97.0 h1:iF3nTfThbiOwz7o5Pocn0dDnDoffd18ijDuf6Mwzi1s= go.opentelemetry.io/collector/semconv v0.97.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= From 75af96dac98432b22a59d536a1f412c8d755f1bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:23:39 +0000 Subject: [PATCH 111/133] build(deps): bump github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger from 0.97.0 to 0.98.0 in the jaeger group (#12959) * build(deps): bump github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger Bumps the jaeger group with 1 update: [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib). Updates `github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger` from 0.97.0 to 0.98.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.97.0...v0.98.0) --- updated-dependencies: - dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger dependency-type: direct:production update-type: version-update:semver-minor dependency-group: jaeger ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 20 ++++++++++---------- go.mod | 10 +++++----- go.sum | 22 +++++++++++----------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 7e370c96012..acc4f0440f1 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3672,11 +3672,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/reflect2@v1.0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger -Version: v0.97.0 +Version: v0.98.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.97.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.98.0/LICENSE: Apache License Version 2.0, January 2004 @@ -13875,11 +13875,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/concurrent@v0 -------------------------------------------------------------------------------- Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal -Version: v0.97.0 +Version: v0.98.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.97.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.98.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14373,11 +14373,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golan -------------------------------------------------------------------------------- Dependency : github.com/prometheus/client_model -Version: v0.6.0 +Version: v0.6.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model@v0.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model@v0.6.1/LICENSE: Apache License Version 2.0, January 2004 @@ -15152,11 +15152,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/shirou/gopsutil/v3 -Version: v3.24.2 +Version: v3.24.3 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.24.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.24.3/LICENSE: gopsutil is distributed under BSD license reproduced below. @@ -16698,11 +16698,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.2/LICENS -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/semconv -Version: v0.97.0 +Version: v0.98.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.97.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.98.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index 035feb1493b..dce183688ca 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/jaegertracing/jaeger v1.56.0 github.com/libp2p/go-reuseport v0.4.0 github.com/modern-go/reflect2 v1.0.2 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.98.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/ryanuber/go-glob v1.0.0 @@ -124,19 +124,19 @@ require ( github.com/mattn/go-isatty v0.0.19 // indirect github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.98.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.19.0 // indirect - github.com/prometheus/client_model v0.6.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.51.1 // indirect github.com/prometheus/procfs v0.13.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect - github.com/shirou/gopsutil/v3 v3.24.2 // indirect + github.com/shirou/gopsutil/v3 v3.24.3 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect @@ -147,7 +147,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.elastic.co/apm/module/apmzap/v2 v2.5.0 // indirect go.elastic.co/ecszap v1.0.2 // indirect - go.opentelemetry.io/collector/semconv v0.97.0 // indirect + go.opentelemetry.io/collector/semconv v0.98.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/go.sum b/go.sum index 8ba2413241d..3c16945a022 100644 --- a/go.sum +++ b/go.sum @@ -412,10 +412,10 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 h1:vX/BkTfd7/cvydXJ7FmUy5iSviQeNGAgTCoXcLu7/Ww= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0/go.mod h1:yrlbvRlLeny1kFmj4Ac9BSqv/pOr2h7sOIvDE6OMCKk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0 h1:5/19bkuB0GDo+vScgEnNy/TcXAkmyTu7BenfpaD2a/M= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.97.0/go.mod h1:CuGIeYSpb4Kmyq4Ez83gHbTjNQGxptjYcC4T5dWkPnM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.98.0 h1:FaldDCQ6hpPAauYZ1kbNWkTFU2vRgL/nr5UY8d2jrT4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.98.0/go.mod h1:0arlQ0mj/VhcFFSKHDmIc+iieHweXKENSBcqNnAY8OA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.98.0 h1:lSP0bTkEMMFa5DeA0QLwgxA7zAIbq2NeLRioAS4qKVE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.98.0/go.mod h1:ErAJvPIFFMeb9nL1ePsYbIK18BaVyitIaz3zAlA+msY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -447,8 +447,8 @@ github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= -github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.51.1 h1:eIjN50Bwglz6a/c3hAgSMcofL3nD+nFQkV6Dd4DsQCw= github.com/prometheus/common v0.51.1/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= @@ -468,8 +468,8 @@ github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= -github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= +github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE= +github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -566,8 +566,8 @@ go.opentelemetry.io/collector/consumer v0.98.0 h1:47zJ5HFKXVA0RciuwkZnPU5W8j0TYU go.opentelemetry.io/collector/consumer v0.98.0/go.mod h1:c2edTq38uVJET/NE6VV7/Qpyznnlz8b6VE7J6TXD57c= go.opentelemetry.io/collector/pdata v1.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8XFyA07j8LE= go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw= -go.opentelemetry.io/collector/semconv v0.97.0 h1:iF3nTfThbiOwz7o5Pocn0dDnDoffd18ijDuf6Mwzi1s= -go.opentelemetry.io/collector/semconv v0.97.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.98.0 h1:zO4L4TmlxXoYu8UgPeYElGY19BW7wPjM+quL5CzoOoY= +go.opentelemetry.io/collector/semconv v0.98.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg= go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA= @@ -681,7 +681,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 7b0a5459e9761138ebab9e839d2458b985034f03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:46:28 +0200 Subject: [PATCH 112/133] build(deps): bump github.com/elastic/go-elasticsearch/v8 from 8.13.0 to 8.13.1 (#12961) * build(deps): bump github.com/elastic/go-elasticsearch/v8 Bumps [github.com/elastic/go-elasticsearch/v8](https://github.com/elastic/go-elasticsearch) from 8.13.0 to 8.13.1. - [Release notes](https://github.com/elastic/go-elasticsearch/releases) - [Changelog](https://github.com/elastic/go-elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/go-elasticsearch/compare/v8.13.0...v8.13.1) --- updated-dependencies: - dependency-name: github.com/elastic/go-elasticsearch/v8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index acc4f0440f1..f90700d454e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1673,11 +1673,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@ -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.13.0 +Version: v8.13.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.13.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.13.1/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index dce183688ca..b977951cb84 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender v1.1.0 - github.com/elastic/go-elasticsearch/v8 v8.13.0 + github.com/elastic/go-elasticsearch/v8 v8.13.1 github.com/elastic/go-sysinfo v1.14.0 github.com/elastic/go-ucfg v0.8.8 github.com/go-sourcemap/sourcemap v2.1.4+incompatible diff --git a/go.sum b/go.sum index 3c16945a022..16859ac96c7 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/elastic/gmux v0.3.2 h1:cb721R+fe/rt/jVNyBP5HDQsEwLD2wSKfPD2Sk6adDk= github.com/elastic/gmux v0.3.2/go.mod h1:OD6oYrno+SV3pyl1ArdWCjlExZ+FJOfoSaFqnFeldBQ= github.com/elastic/go-docappender v1.1.0 h1:wuA3Im+Y0PuQQ/FzLZUb0+6eT64oLhGCqQV49OvR9EU= github.com/elastic/go-docappender v1.1.0/go.mod h1:u0hkrzDr9w81uNFWUxeOyM0IX9aZUag/gHlOnHyCrzA= -github.com/elastic/go-elasticsearch/v8 v8.13.0 h1:YXPAWpvbYX0mWSNG9tnEpvs4h1stgMy5JUeKZECYYB8= -github.com/elastic/go-elasticsearch/v8 v8.13.0/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI= +github.com/elastic/go-elasticsearch/v8 v8.13.1 h1:du5F8IzUUyCkzxyHdrO9AtopcG95I/qwi2WK8Kf1xlg= +github.com/elastic/go-elasticsearch/v8 v8.13.1/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= From 95a29b639819e908b6c722619ff9676cb8a66050 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 12 Apr 2024 01:15:18 -0700 Subject: [PATCH 113/133] [DOCS] Add openAPI specification for APM agent configuration endpoints (#12948) Relates to #12903 This PR updates the OpenAPI specification to include details from https://www.elastic.co/guide/en/observability/current/apm-api-config.html Related to the outstanding issue #12904, this PR re-adds the original file from #12862 --- docs/spec/openapi/apm-openapi.yaml | 178 +++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 docs/spec/openapi/apm-openapi.yaml diff --git a/docs/spec/openapi/apm-openapi.yaml b/docs/spec/openapi/apm-openapi.yaml new file mode 100644 index 00000000000..ea53edb2c09 --- /dev/null +++ b/docs/spec/openapi/apm-openapi.yaml @@ -0,0 +1,178 @@ +openapi: 3.1.0 +info: + title: APM Server + description: OpenAPI schema for APM Server APIs + version: "0.1" + license: + name: Elastic License 2.0 + url: https://www.elastic.co/licensing/elastic-license + contact: + name: APM Team +servers: + - url: / +tags: + - name: agent config + description: APIs that query the APM Server for configuration changes. + x-displayName: APM agent configuration + - name: server info + description: APIs that query general APM Server information. + x-displayName: APM server information +paths: + /: + get: + summary: Get general server information + description: | + This lightweight endpoint is useful as a server up/down health check. + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + post: + summary: Get general server information + operationId: postServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + /config/v1/agents: + get: + summary: Get agent configuration changes + description: > + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getAgentConfig + tags: + - agent config + parameters: + - in: query + name: service.name + required: true + schema: + type: string + - in: query + name: service.environment + schema: + type: string + responses: + '200': + description: A successful response. + content: + application/json: + schema: + type: object + post: + summary: Get agent configuration changes + description: > + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: postAgentConfig + tags: + - agent config + requestBody: + content: + application/json: + schema: + type: object + required: + - service + properties: + CAPTURE_BODY: + type: string + example: off + service: + type: object + required: + - name + properties: + environment: + type: string + example: all + name: + type: string + example: test-service + additionalProperties: true + responses: + '200': + description: Successful response + content: + application/json: + schema: + type: object + properties: + capture_body: + type: string + enum: [ off, errors, transactions, all ] + description: > + For transactions that are HTTP requests, the agent can optionally capture the request body (for example, POST variables). + For transactions that are initiated by receiving a message from a message broker, the agent can capture the textual message body. + example: off + transaction_max_spans: + type: integer + minimum: 0 + description: The maximum number of spans that are recorded per transaction. + example: 500 + transaction_sample_rate: + type: number + format: float + minimum: 0.0 + maximum: 1.0 + description: The agent samples transactions at this rate. + example: 0.3 + additionaProperties: true + '403': + description: APM Server is configured to fetch agent configuration from Elasticsearch but the configuration is invalid. + '503': + description: APM Server is starting up or Elasticsearch is unreachable. + /config/v1/rum/agents: + get: + summary: Get RUM agent configuration changes + description: > + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getRumAgentConfig + tags: + - agent config + responses: + '200': + description: Successful response. +components: + securitySchemes: + apiKeyAuth: + type: apiKey + in: header + name: Authorization + description: 'e.g. Authorization: ApiKey base64AccessApiKey' + secretToken: + type: http + scheme: bearer + bearerFormat: Secret token + responses: + 200_server_info: + description: A successful response indicates that the server is up. + content: + application/json: + schema: + description: If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server. + type: object + properties: + build_date: + type: string + format: time-date + build_sha: + type: string + publish_ready: + type: boolean + version: + type: string + examples: + getServerHealthAuthResponse: + summary: Example APM Server information request with a secret token + value: + build_date: '2021-12-18T19:59:06Z' + build_sha: 24fe620eeff5a19e2133c940c7e5ce1ceddb1445 + publish_ready: true + version: 8.12.2 +security: + - apiKeyAuth: [ ] + - secretToken: [ ] \ No newline at end of file From e6f6aa88453c9873de788ab96897d7ae19979e56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 10:12:06 +0200 Subject: [PATCH 114/133] build(deps): bump actions/add-to-project in the github-actions group (#12967) Bumps the github-actions group with 1 update: [actions/add-to-project](https://github.com/actions/add-to-project). Updates `actions/add-to-project` from 1.0.0 to 1.0.1 - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](https://github.com/actions/add-to-project/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 5aedeba108e..226eb16a03c 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -14,7 +14,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v1.0.0 + - uses: actions/add-to-project@v1.0.1 with: project-url: https://github.com/orgs/elastic/projects/1286 github-token: ${{ secrets.APM_TECH_USER_TOKEN }} \ No newline at end of file From 63dba0f9384b826a63cd9d509e04000a20bea45e Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 15 Apr 2024 04:32:26 -0400 Subject: [PATCH 115/133] [updatecli] Update to elastic/beats@84d0eec2bdc5 (#12953) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@aff4f8d8364f Made with ❤️️ by updatecli * fix: update nulloutput method for beats breaking change * chore: Update to elastic/beats@84d0eec2bdc5 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: kruskal <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 8 ++++++-- internal/beater/beatertest/output.go | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index f90700d454e..417213f6762 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240410143541-a3f7baece42f +Version: v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240410143541-a3f7baece42f/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index b977951cb84..d1b095a42ec 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240410143541-a3f7baece42f + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.1 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 16859ac96c7..35718488d00 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240410143541-a3f7baece42f h1:Yub/H1yIsLQO+B6xlvcXow1a9/HZrnStwJXfJ5j1Sr0= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240410143541-a3f7baece42f/go.mod h1:rEvo7H08cfSOzZqeumqS1sZdJUIS/l3YSqiJWrF/q8Y= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 h1:tcyyQGAupgd8/4d9DAzy5iWZoHHB4UDbYWHprq70TF4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5/go.mod h1:kdguBWXulzsJpqFYPAyH9DxfuOMkhlqLCzxCJzkbWXo= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= @@ -798,6 +798,10 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +kernel.org/pub/linux/libs/security/libcap/cap v1.2.57 h1:2nmqI+aw7EQZuelYktkQHBE4jESD2tOR+lOJEnv/Apo= +kernel.org/pub/linux/libs/security/libcap/cap v1.2.57/go.mod h1:uI99C3r4SXvJeuqoEtx/eWt7UbmfqqZ80H8q+9t/A7I= +kernel.org/pub/linux/libs/security/libcap/psx v1.2.57 h1:NOFATXSf5z/cMR3HIwQ3Xrd3nwnWl5xThmNr5U/F0pI= +kernel.org/pub/linux/libs/security/libcap/psx v1.2.57/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/internal/beater/beatertest/output.go b/internal/beater/beatertest/output.go index a72dcf249a9..728c9ad6814 100644 --- a/internal/beater/beatertest/output.go +++ b/internal/beater/beatertest/output.go @@ -90,7 +90,7 @@ func makeNullOutput( _ *agentconfig.C, ) (outputs.Group, error) { client := nullOutput{observer: observer} - return outputs.Success(agentconfig.Namespace{}, 1, 0, client) + return outputs.Success(agentconfig.Namespace{}, 1, 0, nil, client) } func (nullOutput) String() string { From 45e4c3f6b531798bd40dbb1b7432baf41a0b0974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 08:55:46 +0000 Subject: [PATCH 116/133] build(deps): bump github.com/elastic/elastic-agent-libs from 0.9.1 to 0.9.3 (#12966) * build(deps): bump github.com/elastic/elastic-agent-libs Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.9.1 to 0.9.3. - [Release notes](https://github.com/elastic/elastic-agent-libs/releases) - [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.9.1...v0.9.3) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-libs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 417213f6762..e976187b0df 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.9.1 +Version: v0.9.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.3/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index d1b095a42ec..fb52955a236 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/elastic/apm-data v1.1.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 github.com/elastic/elastic-agent-client/v7 v7.8.1 - github.com/elastic/elastic-agent-libs v0.9.1 + github.com/elastic/elastic-agent-libs v0.9.3 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender v1.1.0 diff --git a/go.sum b/go.sum index 35718488d00..03043e32120 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14 github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY= -github.com/elastic/elastic-agent-libs v0.9.1 h1:vuvWNER0CS9zvHC9fT6zqEGWLPk9j/wbFbiC9GCMfps= -github.com/elastic/elastic-agent-libs v0.9.1/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= +github.com/elastic/elastic-agent-libs v0.9.3 h1:w1Ykn8aUFxDorUAEGt/7A/NzZtFf74n4OAe1ik8mS80= +github.com/elastic/elastic-agent-libs v0.9.3/go.mod h1:SkMnpLm+tXybBrIWK6f3rcOhrDIztLbYCV46m8gwc8g= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= From 0eeb9e9f65807724d4f4ab9968d2beb1ef650f4d Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 15 Apr 2024 05:37:44 -0400 Subject: [PATCH 117/133] [updatecli] Bump elastic stack version to 8.14.0-ab589c40 (#12963) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index df7e849430d..a40badd7d46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-540ac545-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-ab589c40-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-540ac545-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-ab589c40-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-540ac545-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-ab589c40-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 2e5fe2b51a6..33d03029abf 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-540ac545-SNAPSHOT + version: 8.14.0-ab589c40-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 4dae6d3e371..b23fdd89df6 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-540ac545-SNAPSHOT + version: 8.14.0-ab589c40-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 1f0ecf2badf..6d4212cb837 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-540ac545-SNAPSHOT + version: 8.14.0-ab589c40-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From a7922d35a181f970a678167833c2f0fef88186e7 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 15 Apr 2024 15:43:42 +0200 Subject: [PATCH 118/133] package: honour `.go-version` content when creating docker images (#12970) --- .ci/bump-golang.yml | 9 --------- .github/workflows/ci.yml | 10 ++++++++++ go.mk | 1 + packaging.mk | 2 +- packaging/docker/Dockerfile | 3 ++- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml index f37632e4f9d..d0a96dee91d 100644 --- a/.ci/bump-golang.yml +++ b/.ci/bump-golang.yml @@ -96,15 +96,6 @@ targets: content: '{{ source "latestGoVersion" }}' file: .go-version matchpattern: '\d+.\d+.\d+' - update-dockerfile: - name: 'Update Dockerfile with Golang version {{ source "latestGoVersion" }}' - sourceid: latestGoVersion - scmid: default - kind: file - spec: - file: packaging/docker/Dockerfile - matchpattern: '(FROM golang):\d+.\d+.\d+' - replacepattern: '$1:{{ source "latestGoVersion" }}' update-gomod: name: 'Update go.mod files with {{ source "gomod" }}' sourceid: gomod diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70543ceffca..6dcf4965a2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,3 +77,13 @@ jobs: with: name: test-results path: 'build/*.xml' + + test-package: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + cache: false + - run: make package-snapshot diff --git a/go.mk b/go.mk index eac352a8295..51072b2909e 100644 --- a/go.mk +++ b/go.mk @@ -7,6 +7,7 @@ GITROOT ?= $(shell git rev-parse --show-toplevel) # Ensure the Go version in .go-version is installed and used. GOROOT?=$(shell $(GITROOT)/script/run_with_go_ver go env GOROOT) +GOLANG_VERSION=$(shell cat $(GITROOT)/.go-version) GO:=$(GOROOT)/bin/go GOARCH:=$(shell $(GO) env GOARCH) export PATH:=$(GOROOT)/bin:$(PATH) diff --git a/packaging.mk b/packaging.mk index 5a72f414f27..0492993d131 100644 --- a/packaging.mk +++ b/packaging.mk @@ -39,7 +39,7 @@ build/docker/apm-server-ubi-%.txt: DOCKER_BUILD_ARGS+=--build-arg BASE_IMAGE=doc .PHONY: $(DOCKER_IMAGES) $(DOCKER_IMAGES): @mkdir -p $(@D) - docker build --iidfile="$(@)" --build-arg VERSION=$(VERSION) $(DOCKER_BUILD_ARGS) -f packaging/docker/Dockerfile . + docker build --iidfile="$(@)" --build-arg GOLANG_VERSION=$(GOLANG_VERSION) --build-arg VERSION=$(VERSION) $(DOCKER_BUILD_ARGS) -f packaging/docker/Dockerfile . # Docker image tarballs. We distribute UBI8 Docker images only for AMD64. DOCKER_IMAGE_SUFFIX := docker-image$(if $(findstring arm64,$(GOARCH)),-arm64).tar.gz diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 81a3d3bd4d4..f66bf8ef006 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,8 +1,9 @@ ARG BASE_IMAGE=ubuntu:22.04 +ARG GOLANG_VERSION # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. -FROM golang:1.22.2 as builder +FROM golang:${GOLANG_VERSION} as builder WORKDIR /src COPY go.mod go.sum /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod From 5e459b4e6808a28aeb4d0c47bde5e0d2ec981b4a Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:53:30 -0400 Subject: [PATCH 119/133] [updatecli] Bump elastic stack version to 8.14.0-cf1b0234 (#12974) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a40badd7d46..27d5f88fcae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-ab589c40-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-cf1b0234-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-ab589c40-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-cf1b0234-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-ab589c40-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-cf1b0234-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 33d03029abf..8719dd5fff9 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-ab589c40-SNAPSHOT + version: 8.14.0-cf1b0234-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index b23fdd89df6..baeea9d825e 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-ab589c40-SNAPSHOT + version: 8.14.0-cf1b0234-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 6d4212cb837..8431f63d464 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-ab589c40-SNAPSHOT + version: 8.14.0-cf1b0234-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From daae81f8cbe08d82491a98559d945ff867d4d3e5 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:43:27 -0400 Subject: [PATCH 120/133] [updatecli] Update to elastic/beats@3f1d32b372a4 (#12976) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@7387eb36b596 Made with ❤️️ by updatecli * chore: Update to elastic/beats@3f1d32b372a4 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 +- docs/spec/openapi/apm-openapi.yaml | 178 ----------------------------- go.mod | 2 +- go.sum | 4 +- 4 files changed, 5 insertions(+), 183 deletions(-) delete mode 100644 docs/spec/openapi/apm-openapi.yaml diff --git a/NOTICE.txt b/NOTICE.txt index e976187b0df..450a501a487 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 +Version: v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240416130620-3f1d32b372a4/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/docs/spec/openapi/apm-openapi.yaml b/docs/spec/openapi/apm-openapi.yaml deleted file mode 100644 index ea53edb2c09..00000000000 --- a/docs/spec/openapi/apm-openapi.yaml +++ /dev/null @@ -1,178 +0,0 @@ -openapi: 3.1.0 -info: - title: APM Server - description: OpenAPI schema for APM Server APIs - version: "0.1" - license: - name: Elastic License 2.0 - url: https://www.elastic.co/licensing/elastic-license - contact: - name: APM Team -servers: - - url: / -tags: - - name: agent config - description: APIs that query the APM Server for configuration changes. - x-displayName: APM agent configuration - - name: server info - description: APIs that query general APM Server information. - x-displayName: APM server information -paths: - /: - get: - summary: Get general server information - description: | - This lightweight endpoint is useful as a server up/down health check. - To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. - operationId: getServerHealth - tags: - - server info - responses: - '200': - $ref: '#/components/responses/200_server_info' - post: - summary: Get general server information - operationId: postServerHealth - tags: - - server info - responses: - '200': - $ref: '#/components/responses/200_server_info' - /config/v1/agents: - get: - summary: Get agent configuration changes - description: > - To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. - operationId: getAgentConfig - tags: - - agent config - parameters: - - in: query - name: service.name - required: true - schema: - type: string - - in: query - name: service.environment - schema: - type: string - responses: - '200': - description: A successful response. - content: - application/json: - schema: - type: object - post: - summary: Get agent configuration changes - description: > - To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. - operationId: postAgentConfig - tags: - - agent config - requestBody: - content: - application/json: - schema: - type: object - required: - - service - properties: - CAPTURE_BODY: - type: string - example: off - service: - type: object - required: - - name - properties: - environment: - type: string - example: all - name: - type: string - example: test-service - additionalProperties: true - responses: - '200': - description: Successful response - content: - application/json: - schema: - type: object - properties: - capture_body: - type: string - enum: [ off, errors, transactions, all ] - description: > - For transactions that are HTTP requests, the agent can optionally capture the request body (for example, POST variables). - For transactions that are initiated by receiving a message from a message broker, the agent can capture the textual message body. - example: off - transaction_max_spans: - type: integer - minimum: 0 - description: The maximum number of spans that are recorded per transaction. - example: 500 - transaction_sample_rate: - type: number - format: float - minimum: 0.0 - maximum: 1.0 - description: The agent samples transactions at this rate. - example: 0.3 - additionaProperties: true - '403': - description: APM Server is configured to fetch agent configuration from Elasticsearch but the configuration is invalid. - '503': - description: APM Server is starting up or Elasticsearch is unreachable. - /config/v1/rum/agents: - get: - summary: Get RUM agent configuration changes - description: > - To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. - operationId: getRumAgentConfig - tags: - - agent config - responses: - '200': - description: Successful response. -components: - securitySchemes: - apiKeyAuth: - type: apiKey - in: header - name: Authorization - description: 'e.g. Authorization: ApiKey base64AccessApiKey' - secretToken: - type: http - scheme: bearer - bearerFormat: Secret token - responses: - 200_server_info: - description: A successful response indicates that the server is up. - content: - application/json: - schema: - description: If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server. - type: object - properties: - build_date: - type: string - format: time-date - build_sha: - type: string - publish_ready: - type: boolean - version: - type: string - examples: - getServerHealthAuthResponse: - summary: Example APM Server information request with a secret token - value: - build_date: '2021-12-18T19:59:06Z' - build_sha: 24fe620eeff5a19e2133c940c7e5ce1ceddb1445 - publish_ready: true - version: 8.12.2 -security: - - apiKeyAuth: [ ] - - secretToken: [ ] \ No newline at end of file diff --git a/go.mod b/go.mod index fb52955a236..dfe5e919a85 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.3 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 03043e32120..10b32419079 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5 h1:tcyyQGAupgd8/4d9DAzy5iWZoHHB4UDbYWHprq70TF4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240412145836-84d0eec2bdc5/go.mod h1:kdguBWXulzsJpqFYPAyH9DxfuOMkhlqLCzxCJzkbWXo= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 h1:azZwBRDNDh7jtzfmwHeXulGJcz22MrYOdg5TTtBOad4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4/go.mod h1:soTo0BeTumTga3+hWq1gt0zw9AR0WaSUL1573Dzor30= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From c6879269f63f3cd8637c9de4ebdbd0360ba1469d Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:01:12 -0400 Subject: [PATCH 121/133] [updatecli] Bump elastic stack version to 8.14.0-918a815f (#12980) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 27d5f88fcae..6f82dded40f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-cf1b0234-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-918a815f-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-cf1b0234-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-918a815f-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-cf1b0234-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-918a815f-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 8719dd5fff9..8ad8a10e79c 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-cf1b0234-SNAPSHOT + version: 8.14.0-918a815f-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index baeea9d825e..22fa4138197 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-cf1b0234-SNAPSHOT + version: 8.14.0-918a815f-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 8431f63d464..b8522622ce0 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-cf1b0234-SNAPSHOT + version: 8.14.0-918a815f-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 7484b71a4be1959d296978c01c08c91842d40bf7 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 17 Apr 2024 03:25:32 -0700 Subject: [PATCH 122/133] [DOCS] Add openAPI specification for APM events intake API (#12982) * [DOCS] Add APM events intake to OpenAPI document * [DOCS] Add object descriptions --- docs/spec/openapi/apm-openapi.yaml | 710 +++ docs/spec/openapi/bundled.json | 7276 ++++++++++++++++++++++++++++ docs/spec/openapi/bundled.yaml | 5103 +++++++++++++++++++ 3 files changed, 13089 insertions(+) create mode 100644 docs/spec/openapi/apm-openapi.yaml create mode 100644 docs/spec/openapi/bundled.json create mode 100644 docs/spec/openapi/bundled.yaml diff --git a/docs/spec/openapi/apm-openapi.yaml b/docs/spec/openapi/apm-openapi.yaml new file mode 100644 index 00000000000..8cf97789c54 --- /dev/null +++ b/docs/spec/openapi/apm-openapi.yaml @@ -0,0 +1,710 @@ +openapi: 3.1.0 +info: + title: APM Server + description: OpenAPI schema for APM Server APIs + version: '0.1' + license: + name: Elastic License 2.0 + url: https://www.elastic.co/licensing/elastic-license + contact: + name: APM Team +servers: + - url: / +security: + - apiKeyAuth: [] + - secretToken: [] +tags: + - name: agent config + description: APIs that query the APM Server for configuration changes. + x-displayName: APM agent configuration + - name: event intake + description: The events intake API is the internal protocol that APM agents use to talk to the APM Server. + x-displayName: APM event intake + - name: server info + description: APIs that query general APM Server information. + x-displayName: APM server information +paths: + /: + get: + summary: Get general server information + description: | + This lightweight endpoint is useful as a server up/down health check. + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + post: + summary: Get general server information + operationId: postServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + /config/v1/agents: + get: + summary: Get agent configuration changes + description: | + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getAgentConfig + tags: + - agent config + parameters: + - in: query + name: service.name + required: true + schema: + type: string + - in: query + name: service.environment + schema: + type: string + responses: + '200': + description: A successful response. + content: + application/json: + schema: + type: object + post: + summary: Get agent configuration changes + description: | + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: postAgentConfig + tags: + - agent config + requestBody: + content: + application/json: + schema: + type: object + required: + - service + properties: + CAPTURE_BODY: + type: string + example: 'off' + service: + type: object + required: + - name + properties: + environment: + type: string + example: all + name: + type: string + example: test-service + additionalProperties: true + responses: + '200': + description: Successful response + content: + application/json: + schema: + type: object + properties: + capture_body: + type: string + enum: + - 'off' + - errors + - transactions + - all + description: | + For transactions that are HTTP requests, the agent can optionally capture the request body (for example, POST variables). For transactions that are initiated by receiving a message from a message broker, the agent can capture the textual message body. + example: 'off' + transaction_max_spans: + type: integer + minimum: 0 + description: The maximum number of spans that are recorded per transaction. + example: 500 + transaction_sample_rate: + type: number + format: float + minimum: 0 + maximum: 1 + description: The agent samples transactions at this rate. + example: 0.3 + additionalProperties: true + '403': + description: APM Server is configured to fetch agent configuration from Elasticsearch but the configuration is invalid. + '503': + description: APM Server is starting up or Elasticsearch is unreachable. + /config/v1/rum/agents: + get: + summary: Get RUM agent configuration changes + description: | + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getRumAgentConfig + tags: + - agent config + responses: + '200': + description: Successful response. + /intake/v2/events: + post: + summary: Send APM agent events + description: | + NOTE: Most users do not need to interact directly with the events intake API. Agents communicate with the APM Server by sending events--captured pieces of information--in an HTTP request. Events can be transactions, spans, errors, or metrics. Each event is sent as its own line in the HTTP request body, which is known as newline delimited JSON (NDJSON). With NDJSON, agents can open an HTTP POST request and use chunked encoding to stream events to the APM Server as soon as they are recorded in the agent. This makes it simple for agents to serialize each event to a stream of newline delimited JSON. The APM Server also treats the HTTP body as a compressed stream and thus reads and handles each event independently. See the [APM data model](https://www.elastic.co/guide/en/observability/current/apm-data-model.html) to learn more about the different types of events. + operationId: postEventIntake + tags: + - event intake + parameters: + - in: query + name: async + description: | + Indicates whether to use asynchronous processing, which is supported by APM Server in 8.5.0 and later. NOTE: Since asynchronous processing defers some of the event processing to the background and takes place after the client has closed the request, some errors can't be communicated back to the client and are logged by the APM Server. Furthermore, asynchronous processing requests will only be scheduled if the APM Server can service the incoming request; requests that cannot be serviced will receive an internal error 503 "queue is full" error. + schema: + type: boolean + requestBody: + content: + application/ndjson: + schema: + anyOf: + - $ref: '#/components/schemas/ErrorEvent' + - $ref: '#/components/schemas/MetadataEvent' + - $ref: '#/components/schemas/MetricSetEvent' + - $ref: '#/components/schemas/SpanEvent' + - $ref: '#/components/schemas/TransactionEvent' + examples: + # postErrorEventIntakeExample: + # $ref: '#/components/examples/errorEventIntakeRequestExample' + postMetadataEventIntakeExample: + $ref: '#/components/examples/metadataEventIntakeRequestExample' + postMetricSetEventIntakeExample: + $ref: '#/components/examples/metricSetEventIntakeRequestExample' + # postSpanEventIntakeExample: + # $ref: '#/components/examples/spanEventIntakeRequestExample' + # postTransactionEventIntakeExample: + # $ref: '#/components/examples/transactionEventIntakeRequestExample' + responses: + '202': + description: Successful response; all events succeeded. + /intake/v2/rum/events: + post: + summary: Send RUM events + description: | + NOTE: Most users do not need to interact directly with the events intake API. + operationId: postRumEventIntakeV2 + tags: + - event intake + requestBody: + content: + application/ndjson: + schema: + anyOf: + - $ref: '#/components/schemas/ErrorEvent' + - $ref: '#/components/schemas/MetadataEvent' + - $ref: '#/components/schemas/MetricSetEvent' + - $ref: '#/components/schemas/SpanEvent' + - $ref: '#/components/schemas/TransactionEvent' + responses: + '202': + description: Successful response; all events succeeded. + /intake/v3/rum/events: + post: + summary: Send RUM events + description: | + NOTE: Most users do not need to interact directly with the events intake API. + operationId: postRumEventIntakeV3 + tags: + - event intake + requestBody: + content: + application/ndjson: + schema: + anyOf: + - $ref: '#/components/schemas/ErrorEventv3' + - $ref: '#/components/schemas/MetadataEventv3' + - $ref: '#/components/schemas/SpanEventv3' + - $ref: '#/components/schemas/TransactionEventv3' + responses: + '202': + description: Successful response; all events succeeded. +components: + securitySchemes: + apiKeyAuth: + type: apiKey + in: header + name: Authorization + description: 'e.g. Authorization: ApiKey base64AccessApiKey' + secretToken: + type: http + scheme: bearer + bearerFormat: Secret token + schemas: + ErrorEvent: + type: object + description: > + Errors are events that occur in a monitored service and correspond to an error or a logged message captured by an agent. + required: + - error + properties: + error: + $ref: '../v2/error.json' + ErrorEventv3: + type: object + required: + - error + properties: + error: + $ref: '../rumv3/error.json' + MetadataEvent: + type: object + description: > + Every new connection to the APM Server starts with a metadata stanza. + This provides general metadata concerning the other objects in the stream. + Rather than send this metadata information from the agent multiple times, the APM Server hangs on to this information and applies it to other objects in the stream as necessary. + TIP: Metadata is stored under context when viewing documents in Elasticsearch. + APM agents automatically read Kubernetes data and send it to the APM Server. + In most instances, agents are able to read this data from inside the container. + If this is not the case, or if you wish to override this data, you can set environment variables for the agents to read. + These environment variable are set via the Kubernetes Downward API. + required: + - metadata + properties: + metadata: + $ref: '../v2/metadata.json' + MetadataEventv3: + type: object + required: + - metadata + properties: + metadata: + $ref: '../rumv3/metadata.json' + MetricSetEvent: + type: object + description: > + Metric sets are events that contain application metric data captured by an APM agent. + required: + - metricset + properties: + metricset: + $ref: '../v2/metricset.json' + SpanEvent: + type: object + description: > + Spans are events captured by an agent occurring in a monitored service. + required: + - span + properties: + span: + $ref: '../v2/span.json' + SpanEventv3: + type: object + required: + - span + properties: + span: + $ref: '../rumv3/span.json' + TransactionEvent: + type: object + description: > + Transactions are events corresponding to an incoming request or similar task occurring in a monitored service. + required: + - transaction + properties: + transaction: + $ref: '../v2/transaction.json' + TransactionEventv3: + type: object + required: + - transaction + properties: + transaction: + $ref: '../rumv3/transaction.json' + responses: + 200_server_info: + description: A successful response indicates that the server is up. + content: + application/json: + schema: + description: If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server. + type: object + properties: + build_date: + type: string + format: time-date + build_sha: + type: string + publish_ready: + type: boolean + version: + type: string + examples: + getServerHealthAuthResponse: + summary: Example APM Server information request with a secret token + value: + build_date: '2021-12-18T19:59:06Z' + build_sha: 24fe620eeff5a19e2133c940c7e5ce1ceddb1445 + publish_ready: true + version: 8.12.2 + examples: + # errorEventIntakeRequestExample: + # summary: A request body example for the error event type. + # value: + # error: + # id: '9876543210abcdeffedcba0123456789' + # timestamp: 1571657444929001 + # trace_id: 0123456789abcdeffedcba0123456789 + # parent_id: 9632587410abcdef + # transaction_id: '1234567890987654' + # transaction: + # sampled: true + # type: request + # culprit: opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73) + # log: + # message: Request method 'POST' not supported + # param_message: Request method 'POST' /events/:event not supported + # logger_name: http404 + # level: error + # stacktrace: + # - abs_path: /tmp/Socket.java + # filename: Socket.java + # classname: Request::Socket + # function: connect + # vars: + # key: value + # pre_context: + # - line1 + # - line2 + # context_line: line3 + # library_frame: true + # lineno: 3 + # module: java.net + # colno: 4 + # post_context: + # - line4 + # - line5 + # - filename: SimpleBufferingClientHttpRequest.java + # lineno: 102 + # function: executeInternal + # abs_path: /tmp/SimpleBufferingClientHttpRequest.java + # vars: + # key: value + # exception: + # message: Theusernamerootisunknown + # type: java.net.UnknownHostException + # handled: true + # module: org.springframework.http.client + # code: 42 + # attributes: + # foo: bar + # cause: + # - type: InternalDbError + # message: something wrong writing a file + # cause: + # - type: VeryInternalDbError + # message: disk spinning way too fast + # - type: ConnectionError + # message: on top of it,internet doesn't work + # stacktrace: + # - abs_path: /tmp/AbstractPlainSocketImpl.java + # filename: AbstractPlainSocketImpl.java + # function: connect + # vars: + # key: value + # pre_context: + # - line1 + # - line2 + # context_line: '3' + # library_frame: true + # lineno: 3 + # module: java.net + # colno: 4 + # post_context: + # - line4 + # - line5 + # - filename: AbstractClientHttpRequest.java + # lineno: 102 + # function: execute + # vars: + # key: value + # context: + # request: + # socket: + # remote_address: 12.53.12.1 + # encrypted: true + # http_version: '1.1' + # method: POST + # url: + # protocol: 'https:' + # full: https://www.example.com/p/a/t/h?query=string#hash + # hostname: www.example.com + # port: 8080 + # pathname: /p/a/t/h + # search: '?query=string' + # hash: '#hash' + # raw: /p/a/t/h?query=string#hash + # headers: + # Forwarded: for=192.168.0.1 + # host: opbeans-java:3000 + # content-length: '0' + # cookie: + # - c1=v1 + # - c2=v2 + # Elastic-Apm-Traceparent: 00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01 + # cookies: + # c1: v1 + # c2: v2 + # env: + # SERVER_SOFTWARE: nginx + # GATEWAY_INTERFACE: CGI/1.1 + # body: HelloWorld + # response: + # status_code: 200 + # headers: + # content-type: application/json + # headers_sent: true + # finished: true + # user: + # id: 99 + # username: foo + # email: user@foo.mail + # tags: + # organization_uuid: 9f0e9d64-c185-4d21-a6f4-4673ed561ec8 + # custom: + # my_key: 1 + # some_other_value: foobar + # and_objects: + # foo: + # - bar + # - baz + # service: + # name: service1 + # node: + # configured_name: node-xyz + # language: + # version: '1.2' + # framework: + # version: '1' + # name: Node + metadataEventIntakeRequestExample: + summary: A request body example for the metadata event type. + value: + metadata: + process: + pid: 1234 + title: /usr/lib/jvm/java-10-openjdk-amd64/bin/java + ppid: 1 + argv: + - '-v' + system: + architecture: amd64 + detected_hostname: 8ec7ceb99074 + configured_hostname: host1 + platform: Linux + container: + id: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 + kubernetes: + namespace: default + pod: + uid: b17f231da0ad128dc6c6c0b2e82f6f303d3893e3 + name: instrumented-java-service + node: + name: node-name + service: + name: 1234_service-12a3 + version: 4.3.0 + node: + configured_name: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 + environment: production + language: + name: Java + version: 10.0.2 + agent: + version: 1.10.0 + name: java + ephemeral_id: e71be9ac-93b0-44b9-a997-5638f6ccfc36 + framework: + name: spring + version: 5.0.0 + runtime: + name: Java + version: 10.0.2 + labels: + group: experimental + ab_testing: true + segment: 5 + metricSetEventIntakeRequestExample: + summary: A request body example for the metricset event type. + value: + metricset: + samples: + transaction.breakdown.count: + value: 12 + transaction.duration.sum.us: + value: 12 + transaction.duration.count: + value: 2 + transaction.self_time.sum.us: + value: 10 + transaction.self_time.count: + value: 2 + span.self_time.count: + value: 1 + span.self_time.sum.us: + value: 633.288 + byte_counter: + value: 1 + short_counter: + value: 227 + integer_gauge: + value: 42767 + long_gauge: + value: 3147483648 + float_gauge: + value: 9.16 + double_gauge: + value: 3.141592653589793 + dotted.float.gauge: + value: 6.12 + negative.d.o.t.t.e.d: + value: -1022 + tags: + code: 200 + success: true + transaction: + type: request + name: GET/ + span: + type: db + subtype: mysql + timestamp: 1571657444929001 + # spanEventIntakeRequestExample: + # summary: A request body example for the span event type. + # value: + # span: + # timestamp: 1571657444929001 + # type: external + # subtype: http + # id: 1234567890aaaade + # transaction_id: '1234567890987654' + # trace_id: abcdef0123456789abcdef9876543210 + # parent_id: abcdef0123456789 + # action: connect + # sync: true + # name: GET users-authenticated + # duration: 3.781912 + # stacktrace: + # - filename: DispatcherServlet.java + # lineno: 547 + # - function: render + # abs_path: /tmp/AbstractView.java + # filename: AbstractView.java + # lineno: 547 + # library_frame: true + # vars: + # key: value + # module: org.springframework.web.servlet.view + # colno: 4 + # context_line: line3 + # context: + # db: + # instance: customers + # statement: SELECT * FROM product_types WHERE user_id = ? + # type: sql + # user: postgres + # link: other.db.com + # http: + # url: http://localhost:8000 + # status_code: 302 + # method: GET + # response: + # status_code: 200 + # transfer_size: 300.12 + # encoded_body_size: 356 + # decoded_body_size: 401 + # headers: + # content-type: application/json + # service: + # name: opbeans-java-1 + # agent: + # version: 1.10.0-SNAPSHOT + # name: java + # ephemeral_id: e71be9ac-93b0-44b9-a997-5638f6ccfc36 + # transactionEventIntakeRequestExample: + # summary: A request body example for the transaction event type. + # value: + # transaction: + # timestamp: 1571657444929001 + # name: ResourceHttpRequestHandler + # type: http + # id: 4340a8e0df1906ecbfa9 + # trace_id: 0acd456789abcdef0123456789abcdef + # parent_id: abcdefabcdef01234567 + # span_count: + # started: 17 + # dropped: 0 + # duration: 32.592981 + # result: HTTP2xx + # sampled: true + # context: + # service: + # name: experimental-java + # agent: + # version: 1.10.0-SNAPSHOT + # ephemeral_id: e71be9ac-93b0-44b9-a997-5638f6ccfc36 + # request: + # socket: + # remote_address: 12.53.12.1:8080 + # encrypted: true + # http_version: '1.1' + # method: POST + # url: + # protocol: 'https:' + # full: https://www.example.com/p/a/t/h?query=string#hash + # hostname: www.example.com + # port: '8080' + # pathname: /p/a/t/h + # search: '?query=string' + # hash: '#hash' + # raw: /p/a/t/h?query=string#hash + # headers: + # user-agent: + # - Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36 + # - MozillaChromeEdge + # content-type: text/html + # cookie: c1=v1,c2=v2 + # Elastic-Apm-Traceparent: + # - 00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01 + # cookies: + # c1: v1 + # c2: v2 + # env: + # SERVER_SOFTWARE: nginx + # GATEWAY_INTERFACE: CGI/1.1 + # body: + # string: helloworld + # additional: + # foo: {} + # bar: 123 + # req: additionalinformation + # response: + # status_code: 200 + # transfer_size: 300 + # encoded_body_size: 356.9 + # decoded_body_size: 401.9 + # headers: + # content-type: application/json + # headers_sent: true + # finished: true + # user: + # id: '99' + # username: foo + # email: foo@mail.com + # tags: + # organization_uuid: 9f0e9d64-c185-4d21-a6f4-4673ed561ec8 + # tag5: null + # custom: + # my_key: 1 + # some_other_value: foobar + # and_objects: + # foo: + # - bar + # - baz + # (: notavalidregexandthatisfine diff --git a/docs/spec/openapi/bundled.json b/docs/spec/openapi/bundled.json new file mode 100644 index 00000000000..75764ed9282 --- /dev/null +++ b/docs/spec/openapi/bundled.json @@ -0,0 +1,7276 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "APM Server", + "description": "OpenAPI schema for APM Server APIs", + "version": "0.1", + "license": { + "name": "Elastic License 2.0", + "url": "https://www.elastic.co/licensing/elastic-license" + }, + "contact": { + "name": "APM Team" + } + }, + "servers": [ + { + "url": "/" + } + ], + "security": [ + { + "apiKeyAuth": [] + }, + { + "secretToken": [] + } + ], + "tags": [ + { + "name": "agent config", + "description": "APIs that query the APM Server for configuration changes.", + "x-displayName": "APM agent configuration" + }, + { + "name": "event intake", + "description": "The events intake API is the internal protocol that APM agents use to talk to the APM Server.", + "x-displayName": "APM event intake" + }, + { + "name": "server info", + "description": "APIs that query general APM Server information.", + "x-displayName": "APM server information" + } + ], + "paths": { + "/": { + "get": { + "summary": "Get general server information", + "description": "This lightweight endpoint is useful as a server up/down health check.\nTo configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access.\n", + "operationId": "getServerHealth", + "tags": [ + "server info" + ], + "responses": { + "200": { + "$ref": "#/components/responses/200_server_info" + } + } + }, + "post": { + "summary": "Get general server information", + "operationId": "postServerHealth", + "tags": [ + "server info" + ], + "responses": { + "200": { + "$ref": "#/components/responses/200_server_info" + } + } + } + }, + "/config/v1/agents": { + "get": { + "summary": "Get agent configuration changes", + "description": "To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access.\n", + "operationId": "getAgentConfig", + "tags": [ + "agent config" + ], + "parameters": [ + { + "in": "query", + "name": "service.name", + "required": true, + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "service.environment", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "A successful response.", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + }, + "post": { + "summary": "Get agent configuration changes", + "description": "To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access.\n", + "operationId": "postAgentConfig", + "tags": [ + "agent config" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "service" + ], + "properties": { + "CAPTURE_BODY": { + "type": "string", + "example": "off" + }, + "service": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "environment": { + "type": "string", + "example": "all" + }, + "name": { + "type": "string", + "example": "test-service" + } + } + } + }, + "additionalProperties": true + } + } + } + }, + "responses": { + "200": { + "description": "Successful response", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "capture_body": { + "type": "string", + "enum": [ + "off", + "errors", + "transactions", + "all" + ], + "description": "For transactions that are HTTP requests, the agent can optionally capture the request body (for example, POST variables). For transactions that are initiated by receiving a message from a message broker, the agent can capture the textual message body.\n", + "example": "off" + }, + "transaction_max_spans": { + "type": "integer", + "minimum": 0, + "description": "The maximum number of spans that are recorded per transaction.", + "example": 500 + }, + "transaction_sample_rate": { + "type": "number", + "format": "float", + "minimum": 0, + "maximum": 1, + "description": "The agent samples transactions at this rate.", + "example": 0.3 + } + }, + "additionalProperties": true + } + } + } + }, + "403": { + "description": "APM Server is configured to fetch agent configuration from Elasticsearch but the configuration is invalid." + }, + "503": { + "description": "APM Server is starting up or Elasticsearch is unreachable." + } + } + } + }, + "/config/v1/rum/agents": { + "get": { + "summary": "Get RUM agent configuration changes", + "description": "To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access.\n", + "operationId": "getRumAgentConfig", + "tags": [ + "agent config" + ], + "responses": { + "200": { + "description": "Successful response." + } + } + } + }, + "/intake/v2/events": { + "post": { + "summary": "Send APM agent events", + "description": "NOTE: Most users do not need to interact directly with the events intake API. Agents communicate with the APM Server by sending events--captured pieces of information--in an HTTP request. Events can be transactions, spans, errors, or metrics. Each event is sent as its own line in the HTTP request body, which is known as newline delimited JSON (NDJSON). With NDJSON, agents can open an HTTP POST request and use chunked encoding to stream events to the APM Server as soon as they are recorded in the agent. This makes it simple for agents to serialize each event to a stream of newline delimited JSON. The APM Server also treats the HTTP body as a compressed stream and thus reads and handles each event independently. See the [APM data model](https://www.elastic.co/guide/en/observability/current/apm-data-model.html) to learn more about the different types of events.\n", + "operationId": "postEventIntake", + "tags": [ + "event intake" + ], + "parameters": [ + { + "in": "query", + "name": "async", + "description": "Indicates whether to use asynchronous processing, which is supported by APM Server in 8.5.0 and later. NOTE: Since asynchronous processing defers some of the event processing to the background and takes place after the client has closed the request, some errors can't be communicated back to the client and are logged by the APM Server. Furthermore, asynchronous processing requests will only be scheduled if the APM Server can service the incoming request; requests that cannot be serviced will receive an internal error 503 \"queue is full\" error.\n", + "schema": { + "type": "boolean" + } + } + ], + "requestBody": { + "content": { + "application/ndjson": { + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/ErrorEvent" + }, + { + "$ref": "#/components/schemas/MetadataEvent" + }, + { + "$ref": "#/components/schemas/MetricSetEvent" + }, + { + "$ref": "#/components/schemas/SpanEvent" + }, + { + "$ref": "#/components/schemas/TransactionEvent" + } + ] + }, + "examples": { + "postMetadataEventIntakeExample": { + "$ref": "#/components/examples/metadataEventIntakeRequestExample" + }, + "postMetricSetEventIntakeExample": { + "$ref": "#/components/examples/metricSetEventIntakeRequestExample" + } + } + } + } + }, + "responses": { + "202": { + "description": "Successful response; all events succeeded." + } + } + } + }, + "/intake/v2/rum/events": { + "post": { + "summary": "Send RUM events", + "description": "NOTE: Most users do not need to interact directly with the events intake API.\n", + "operationId": "postRumEventIntakeV2", + "tags": [ + "event intake" + ], + "requestBody": { + "content": { + "application/ndjson": { + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/ErrorEvent" + }, + { + "$ref": "#/components/schemas/MetadataEvent" + }, + { + "$ref": "#/components/schemas/MetricSetEvent" + }, + { + "$ref": "#/components/schemas/SpanEvent" + }, + { + "$ref": "#/components/schemas/TransactionEvent" + } + ] + } + } + } + }, + "responses": { + "202": { + "description": "Successful response; all events succeeded." + } + } + } + }, + "/intake/v3/rum/events": { + "post": { + "summary": "Send RUM events", + "description": "NOTE: Most users do not need to interact directly with the events intake API.\n", + "operationId": "postRumEventIntakeV3", + "tags": [ + "event intake" + ], + "requestBody": { + "content": { + "application/ndjson": { + "schema": { + "anyOf": [ + { + "$ref": "#/components/schemas/ErrorEventv3" + }, + { + "$ref": "#/components/schemas/MetadataEventv3" + }, + { + "$ref": "#/components/schemas/SpanEventv3" + }, + { + "$ref": "#/components/schemas/TransactionEventv3" + } + ] + } + } + } + }, + "responses": { + "202": { + "description": "Successful response; all events succeeded." + } + } + } + } + }, + "components": { + "securitySchemes": { + "apiKeyAuth": { + "type": "apiKey", + "in": "header", + "name": "Authorization", + "description": "e.g. Authorization: ApiKey base64AccessApiKey" + }, + "secretToken": { + "type": "http", + "scheme": "bearer", + "bearerFormat": "Secret token" + } + }, + "schemas": { + "ErrorEvent": { + "type": "object", + "description": "Errors are events that occur in a monitored service and correspond to an error or a logged message captured by an agent.\n", + "required": [ + "error" + ], + "properties": { + "error": { + "$ref": "#/components/schemas/error" + } + } + }, + "ErrorEventv3": { + "type": "object", + "required": [ + "error" + ], + "properties": { + "error": { + "$ref": "#/components/schemas/error-2" + } + } + }, + "MetadataEvent": { + "type": "object", + "description": "Every new connection to the APM Server starts with a metadata stanza. This provides general metadata concerning the other objects in the stream. Rather than send this metadata information from the agent multiple times, the APM Server hangs on to this information and applies it to other objects in the stream as necessary. TIP: Metadata is stored under context when viewing documents in Elasticsearch. APM agents automatically read Kubernetes data and send it to the APM Server. In most instances, agents are able to read this data from inside the container. If this is not the case, or if you wish to override this data, you can set environment variables for the agents to read. These environment variable are set via the Kubernetes Downward API. \n", + "required": [ + "metadata" + ], + "properties": { + "metadata": { + "$ref": "#/components/schemas/metadata" + } + } + }, + "MetadataEventv3": { + "type": "object", + "required": [ + "metadata" + ], + "properties": { + "metadata": { + "$ref": "#/components/schemas/metadata-2" + } + } + }, + "MetricSetEvent": { + "type": "object", + "description": "Metric sets are events that contain application metric data captured by an APM agent. \n", + "required": [ + "metricset" + ], + "properties": { + "metricset": { + "$ref": "#/components/schemas/metricset" + } + } + }, + "SpanEvent": { + "type": "object", + "description": "Spans are events captured by an agent occurring in a monitored service.\n", + "required": [ + "span" + ], + "properties": { + "span": { + "$ref": "#/components/schemas/span" + } + } + }, + "SpanEventv3": { + "type": "object", + "required": [ + "span" + ], + "properties": { + "span": { + "$ref": "#/components/schemas/span-2" + } + } + }, + "TransactionEvent": { + "type": "object", + "description": "Transactions are events corresponding to an incoming request or similar task occurring in a monitored service.\n", + "required": [ + "transaction" + ], + "properties": { + "transaction": { + "$ref": "#/components/schemas/transaction" + } + } + }, + "TransactionEventv3": { + "type": "object", + "required": [ + "transaction" + ], + "properties": { + "transaction": { + "$ref": "#/components/schemas/transaction-2" + } + } + }, + "error": { + "$id": "docs/spec/v2/error", + "description": "errorEvent represents an error or a logged error message, captured by an APM agent in a monitored service.", + "type": "object", + "properties": { + "context": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "cloud": { + "description": "Cloud holds fields related to the cloud or infrastructure the events are coming from.", + "type": [ + "null", + "object" + ], + "properties": { + "origin": { + "description": "Origin contains the self-nested field groups for cloud.", + "type": [ + "null", + "object" + ], + "properties": { + "account": { + "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment.", + "type": [ + "null", + "string" + ] + } + } + }, + "provider": { + "description": "Name of the cloud provider.", + "type": [ + "null", + "string" + ] + }, + "region": { + "description": "Region in which this host, resource, or service is located.", + "type": [ + "null", + "string" + ] + }, + "service": { + "description": "The cloud service name is intended to distinguish services running on different platforms within a provider.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "The cloud service name is intended to distinguish services running on different platforms within a provider.", + "type": [ + "null", + "string" + ] + } + } + } + } + } + } + }, + "custom": { + "description": "Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch.", + "type": [ + "null", + "object" + ] + }, + "message": { + "description": "Message holds details related to message receiving and publishing if the captured event integrates with a messaging system", + "type": [ + "null", + "object" + ], + "properties": { + "age": { + "description": "Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field.", + "type": [ + "null", + "object" + ], + "properties": { + "ms": { + "description": "Age of the message in milliseconds.", + "type": [ + "null", + "integer" + ] + } + } + }, + "body": { + "description": "Body of the received message, similar to an HTTP request body", + "type": [ + "null", + "string" + ] + }, + "headers": { + "description": "Headers received with the message, similar to HTTP request headers.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "queue": { + "description": "Queue holds information about the message queue where the message is received.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name holds the name of the message queue where the message is received.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "routing_key": { + "description": "RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ.", + "type": [ + "null", + "string" + ] + } + } + }, + "page": { + "description": "Page holds information related to the current page and page referers. It is only sent from RUM agents.", + "type": [ + "null", + "object" + ], + "properties": { + "referer": { + "description": "Referer holds the URL of the page that 'linked' to the current page.", + "type": [ + "null", + "string" + ] + }, + "url": { + "description": "URL of the current page", + "type": [ + "null", + "string" + ] + } + } + }, + "request": { + "description": "Request describes the HTTP request information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "body": { + "description": "Body only contais the request bod, not the query string information. It can either be a dictionary (for standard HTTP requests) or a raw request body.", + "type": [ + "null", + "string", + "object" + ] + }, + "cookies": { + "description": "Cookies used by the request, parsed as key-value objects.", + "type": [ + "null", + "object" + ] + }, + "env": { + "description": "Env holds environment variable information passed to the monitored service.", + "type": [ + "null", + "object" + ] + }, + "headers": { + "description": "Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "http_version": { + "description": "HTTPVersion holds information about the used HTTP version.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "method": { + "description": "Method holds information about the method of the HTTP request.", + "type": "string", + "maxLength": 1024 + }, + "socket": { + "description": "Socket holds information related to the recorded request, such as whether or not data were encrypted and the remote address.", + "type": [ + "null", + "object" + ], + "properties": { + "encrypted": { + "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.", + "type": [ + "null", + "boolean" + ] + }, + "remote_address": { + "description": "RemoteAddress holds the network address sending the request. It should be obtained through standard APIs and not be parsed from any headers like 'Forwarded'.", + "type": [ + "null", + "string" + ] + } + } + }, + "url": { + "description": "URL holds information sucha as the raw URL, scheme, host and path.", + "type": [ + "null", + "object" + ], + "properties": { + "full": { + "description": "Full, possibly agent-assembled URL of the request, e.g. https://example.com:443/search?q=elasticsearch#top.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "hash": { + "description": "Hash of the request URL, e.g. 'top'", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "hostname": { + "description": "Hostname information of the request, e.g. 'example.com'.\"", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "pathname": { + "description": "Path of the request, e.g. '/search'", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "port": { + "description": "Port of the request, e.g. '443'. Can be sent as string or int.", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "protocol": { + "description": "Protocol information for the recorded request, e.g. 'https:'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "raw": { + "description": "Raw unparsed URL of the HTTP request line, e.g https://example.com:443/search?q=elasticsearch. This URL may be absolute or relative. For more details, see https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "search": { + "description": "Search contains the query string information of the request. It is expected to have values delimited by ampersands.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "method" + ] + }, + "response": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "decoded_body_size": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "encoded_body_size": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "finished": { + "description": "Finished indicates whether the response was finished or not.", + "type": [ + "null", + "boolean" + ] + }, + "headers": { + "description": "Headers holds the http headers sent in the http response.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "headers_sent": { + "description": "HeadersSent indicates whether http headers were sent.", + "type": [ + "null", + "boolean" + ] + }, + "status_code": { + "description": "StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "transfer_size": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "service": { + "description": "Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "agent": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "ephemeral_id": { + "description": "EphemeralID is a free format ID used for metrics correlation by agents", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "environment": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "framework": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "id": { + "description": "ID holds a unique identifier for the service.", + "type": [ + "null", + "string" + ] + }, + "language": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "name": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "node": { + "description": "Node must be a unique meaningful name of the service node.", + "type": [ + "null", + "object" + ], + "properties": { + "configured_name": { + "description": "Name of the service node", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "origin": { + "description": "Origin contains the self-nested field groups for service.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "Immutable id of the service emitting this event.", + "type": [ + "null", + "string" + ] + }, + "name": { + "description": "Immutable name of the service emitting this event.", + "type": [ + "null", + "string" + ] + }, + "version": { + "description": "The version of the service the data was collected from.", + "type": [ + "null", + "string" + ] + } + } + }, + "runtime": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "target": { + "description": "Target holds information about the outgoing service in case of an outgoing event", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Immutable name of the target service for the event", + "type": [ + "null", + "string" + ] + }, + "type": { + "description": "Immutable type of the target service for the event", + "type": [ + "null", + "string" + ] + } + }, + "anyOf": [ + { + "properties": { + "type": { + "type": "string" + } + }, + "required": [ + "type" + ] + }, + { + "properties": { + "name": { + "type": "string" + } + }, + "required": [ + "name" + ] + } + ] + }, + "version": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "tags": { + "description": "Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "user": { + "description": "User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event.", + "type": [ + "null", + "object" + ], + "properties": { + "domain": { + "description": "Domain of the logged in user", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "email": { + "description": "Email of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "id": { + "description": "ID identifies the logged in user, e.g. can be the primary key of the user", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "username": { + "description": "Name of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "culprit": { + "description": "Culprit identifies the function call which was the primary perpetrator of this event.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "exception": { + "description": "Exception holds information about the original error. The information is language specific.", + "type": [ + "null", + "object" + ], + "properties": { + "attributes": { + "description": "Attributes of the exception.", + "type": [ + "null", + "object" + ] + }, + "cause": { + "description": "Cause can hold a collection of error exceptions representing chained exceptions. The chain starts with the outermost exception, followed by its cause, and so on.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object" + }, + "minItems": 0 + }, + "code": { + "description": "Code that is set when the error happened, e.g. database error code.", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "handled": { + "description": "Handled indicates whether the error was caught in the code or not.", + "type": [ + "null", + "boolean" + ] + }, + "message": { + "description": "Message contains the originally captured error message.", + "type": [ + "null", + "string" + ] + }, + "module": { + "description": "Module describes the exception type's module namespace.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "stacktrace": { + "description": "Stacktrace information of the captured exception.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "abs_path": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "classname": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "colno": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "context_line": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "filename": { + "description": "Filename is the relative name of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "function": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "library_frame": { + "description": "LibraryFrame indicates whether the frame is from a third party library.", + "type": [ + "null", + "boolean" + ] + }, + "lineno": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "module": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "post_context": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "pre_context": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "vars": { + "description": "Vars is a flat mapping of local variables of the frame.", + "type": [ + "null", + "object" + ] + } + }, + "anyOf": [ + { + "properties": { + "classname": { + "type": "string" + } + }, + "required": [ + "classname" + ] + }, + { + "properties": { + "filename": { + "type": "string" + } + }, + "required": [ + "filename" + ] + } + ] + }, + "minItems": 0 + }, + "type": { + "description": "Type of the exception.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "anyOf": [ + { + "properties": { + "message": { + "type": "string" + } + }, + "required": [ + "message" + ] + }, + { + "properties": { + "type": { + "type": "string" + } + }, + "required": [ + "type" + ] + } + ] + }, + "id": { + "description": "ID holds the hex encoded 128 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "log": { + "description": "Log holds additional information added when the error is logged.", + "type": [ + "null", + "object" + ], + "properties": { + "level": { + "description": "Level represents the severity of the recorded log.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "logger_name": { + "description": "LoggerName holds the name of the used logger instance.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "message": { + "description": "Message of the logged error. In case a parameterized message is captured, Message should contain the same information, but with any placeholders being replaced.", + "type": "string" + }, + "param_message": { + "description": "ParamMessage should contain the same information as Message, but with placeholders where parameters were logged, e.g. 'error connecting to %s'. The string is not interpreted, allowing differnt placeholders per client languange. The information might be used to group errors together.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "stacktrace": { + "description": "Stacktrace information of the captured error.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "abs_path": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "classname": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "colno": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "context_line": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "filename": { + "description": "Filename is the relative name of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "function": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "library_frame": { + "description": "LibraryFrame indicates whether the frame is from a third party library.", + "type": [ + "null", + "boolean" + ] + }, + "lineno": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "module": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "post_context": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "pre_context": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "vars": { + "description": "Vars is a flat mapping of local variables of the frame.", + "type": [ + "null", + "object" + ] + } + }, + "anyOf": [ + { + "properties": { + "classname": { + "type": "string" + } + }, + "required": [ + "classname" + ] + }, + { + "properties": { + "filename": { + "type": "string" + } + }, + "required": [ + "filename" + ] + } + ] + }, + "minItems": 0 + } + }, + "required": [ + "message" + ] + }, + "parent_id": { + "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "timestamp": { + "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch.", + "type": [ + "null", + "integer" + ] + }, + "trace_id": { + "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "transaction": { + "description": "Transaction holds information about the correlated transaction.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "sampled": { + "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.", + "type": [ + "null", + "boolean" + ] + }, + "type": { + "description": "Type expresses the correlated transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "transaction_id": { + "description": "TransactionID holds the hex encoded 64 random bits ID of the correlated transaction.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "id" + ], + "allOf": [ + { + "if": { + "properties": { + "transaction_id": { + "type": "string" + } + }, + "required": [ + "transaction_id" + ] + }, + "then": { + "properties": { + "parent_id": { + "type": "string" + } + }, + "required": [ + "parent_id" + ] + } + }, + { + "if": { + "properties": { + "trace_id": { + "type": "string" + } + }, + "required": [ + "trace_id" + ] + }, + "then": { + "properties": { + "parent_id": { + "type": "string" + } + }, + "required": [ + "parent_id" + ] + } + }, + { + "if": { + "properties": { + "transaction_id": { + "type": "string" + } + }, + "required": [ + "transaction_id" + ] + }, + "then": { + "properties": { + "trace_id": { + "type": "string" + } + }, + "required": [ + "trace_id" + ] + } + }, + { + "if": { + "properties": { + "parent_id": { + "type": "string" + } + }, + "required": [ + "parent_id" + ] + }, + "then": { + "properties": { + "trace_id": { + "type": "string" + } + }, + "required": [ + "trace_id" + ] + } + } + ], + "anyOf": [ + { + "properties": { + "exception": { + "type": "object" + } + }, + "required": [ + "exception" + ] + }, + { + "properties": { + "log": { + "type": "object" + } + }, + "required": [ + "log" + ] + } + ] + }, + "metadata": { + "$id": "docs/spec/v2/metadata", + "type": "object", + "properties": { + "cloud": { + "description": "Cloud metadata about where the monitored service is running.", + "type": [ + "null", + "object" + ], + "properties": { + "account": { + "description": "Account where the monitored service is running.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID of the cloud account.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the cloud account.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "availability_zone": { + "description": "AvailabilityZone where the monitored service is running, e.g. us-east-1a", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "instance": { + "description": "Instance on which the monitored service is running.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID of the cloud instance.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the cloud instance.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "machine": { + "description": "Machine on which the monitored service is running.", + "type": [ + "null", + "object" + ], + "properties": { + "type": { + "description": "ID of the cloud machine.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "project": { + "description": "Project in which the monitored service is running.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID of the cloud project.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the cloud project.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "provider": { + "description": "Provider that is used, e.g. aws, azure, gcp, digitalocean.", + "type": "string", + "maxLength": 1024 + }, + "region": { + "description": "Region where the monitored service is running, e.g. us-east-1", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "service": { + "description": "Service that is monitored on cloud", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the cloud service, intended to distinguish services running on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs App Engine, Azure VM vs App Server.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "provider" + ] + }, + "labels": { + "description": "Labels are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Labels are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "network": { + "description": "Network holds information about the network over which the monitored service is communicating.", + "type": [ + "null", + "object" + ], + "properties": { + "connection": { + "type": [ + "null", + "object" + ], + "properties": { + "type": { + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "process": { + "description": "Process metadata about the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "argv": { + "description": "Argv holds the command line arguments used to start this process.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "pid": { + "description": "PID holds the process ID of the service.", + "type": "integer" + }, + "ppid": { + "description": "Ppid holds the parent process ID of the service.", + "type": [ + "null", + "integer" + ] + }, + "title": { + "description": "Title is the process title. It can be the same as process name.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "pid" + ] + }, + "service": { + "description": "Service metadata about the monitored service.", + "type": "object", + "properties": { + "agent": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": "object", + "properties": { + "activation_method": { + "description": "ActivationMethod of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ephemeral_id": { + "description": "EphemeralID is a free format ID used for metrics correlation by agents", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the APM agent capturing information.", + "type": "string", + "maxLength": 1024, + "minLength": 1 + }, + "version": { + "description": "Version of the APM agent capturing information.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "name", + "version" + ] + }, + "environment": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "framework": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "id": { + "description": "ID holds a unique identifier for the running service.", + "type": [ + "null", + "string" + ] + }, + "language": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used programming language", + "type": "string", + "maxLength": 1024 + }, + "version": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "name" + ] + }, + "name": { + "description": "Name of the monitored service.", + "type": "string", + "maxLength": 1024, + "minLength": 1, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "node": { + "description": "Node must be a unique meaningful name of the service node.", + "type": [ + "null", + "object" + ], + "properties": { + "configured_name": { + "description": "Name of the service node", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "runtime": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the language runtime", + "type": "string", + "maxLength": 1024 + }, + "version": { + "description": "Name of the language runtime", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "name", + "version" + ] + }, + "version": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "agent", + "name" + ] + }, + "system": { + "description": "System metadata", + "type": [ + "null", + "object" + ], + "properties": { + "architecture": { + "description": "Architecture of the system the monitored service is running on.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "configured_hostname": { + "description": "ConfiguredHostname is the configured name of the host the monitored service is running on. It should only be sent when configured by the user. If given, it is used as the event's hostname.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "container": { + "description": "Container holds the system's container ID if available.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID of the container the monitored service is running in.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "detected_hostname": { + "description": "DetectedHostname is the hostname detected by the APM agent. It usually contains what the hostname command returns on the host machine. It will be used as the event's hostname if ConfiguredHostname is not present.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "host_id": { + "description": "The OpenTelemetry semantic conventions compliant \"host.id\" attribute, if available.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "hostname": { + "description": "Deprecated: Use ConfiguredHostname and DetectedHostname instead. DeprecatedHostname is the host name of the system the service is running on. It does not distinguish between configured and detected hostname and therefore is deprecated and only used if no other hostname information is available.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "kubernetes": { + "description": "Kubernetes system information if the monitored service runs on Kubernetes.", + "type": [ + "null", + "object" + ], + "properties": { + "namespace": { + "description": "Namespace of the Kubernetes resource the monitored service is run on.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "node": { + "description": "Node related information", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the Kubernetes Node", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "pod": { + "description": "Pod related information", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the Kubernetes Pod", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "uid": { + "description": "UID is the system-generated string uniquely identifying the Pod.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "platform": { + "description": "Platform name of the system platform the monitored service is running on.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "user": { + "description": "User metadata, which can be overwritten on a per event basis.", + "type": [ + "null", + "object" + ], + "properties": { + "domain": { + "description": "Domain of the logged in user", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "email": { + "description": "Email of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "id": { + "description": "ID identifies the logged in user, e.g. can be the primary key of the user", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "username": { + "description": "Name of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "service" + ] + }, + "metricset": { + "$id": "docs/spec/v2/metricset", + "type": "object", + "properties": { + "faas": { + "description": "FAAS holds fields related to Function as a Service events.", + "type": [ + "null", + "object" + ], + "properties": { + "coldstart": { + "description": "Indicates whether a function invocation was a cold start or not.", + "type": [ + "null", + "boolean" + ] + }, + "execution": { + "description": "The request id of the function invocation.", + "type": [ + "null", + "string" + ] + }, + "id": { + "description": "A unique identifier of the invoked serverless function.", + "type": [ + "null", + "string" + ] + }, + "name": { + "description": "The lambda function name.", + "type": [ + "null", + "string" + ] + }, + "trigger": { + "description": "Trigger attributes.", + "type": [ + "null", + "object" + ], + "properties": { + "request_id": { + "description": "The id of the origin trigger request.", + "type": [ + "null", + "string" + ] + }, + "type": { + "description": "The trigger type.", + "type": [ + "null", + "string" + ] + } + } + }, + "version": { + "description": "The lambda function version.", + "type": [ + "null", + "string" + ] + } + } + }, + "samples": { + "description": "Samples hold application metrics collected from the agent.", + "type": "object", + "additionalProperties": false, + "patternProperties": { + "^[^*\"]*$": { + "type": [ + "null", + "object" + ], + "properties": { + "counts": { + "description": "Counts holds the bucket counts for histogram metrics. These numbers must be positive or zero. If Counts is specified, then Values is expected to be specified with the same number of elements, and with the same order.", + "type": [ + "null", + "array" + ], + "items": { + "type": "integer", + "minimum": 0 + }, + "minItems": 0 + }, + "type": { + "description": "Type holds an optional metric type: gauge, counter, or histogram. If Type is unknown, it will be ignored.", + "type": [ + "null", + "string" + ] + }, + "unit": { + "description": "Unit holds an optional unit for the metric. - \"percent\" (value is in the range [0,1]) - \"byte\" - a time unit: \"nanos\", \"micros\", \"ms\", \"s\", \"m\", \"h\", \"d\" If Unit is unknown, it will be ignored.", + "type": [ + "null", + "string" + ] + }, + "value": { + "description": "Value holds the value of a single metric sample.", + "type": [ + "null", + "number" + ] + }, + "values": { + "description": "Values holds the bucket values for histogram metrics. Values must be provided in ascending order; failure to do so will result in the metric being discarded.", + "type": [ + "null", + "array" + ], + "items": { + "type": "number" + }, + "minItems": 0 + } + }, + "allOf": [ + { + "if": { + "properties": { + "counts": { + "type": "array" + } + }, + "required": [ + "counts" + ] + }, + "then": { + "properties": { + "values": { + "type": "array" + } + }, + "required": [ + "values" + ] + } + }, + { + "if": { + "properties": { + "values": { + "type": "array" + } + }, + "required": [ + "values" + ] + }, + "then": { + "properties": { + "counts": { + "type": "array" + } + }, + "required": [ + "counts" + ] + } + } + ], + "anyOf": [ + { + "properties": { + "value": { + "type": "number" + } + }, + "required": [ + "value" + ] + }, + { + "properties": { + "values": { + "type": "array" + } + }, + "required": [ + "values" + ] + } + ] + } + } + }, + "service": { + "description": "Service holds selected information about the correlated service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the correlated service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the correlated service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "span": { + "description": "Span holds selected information about the correlated transaction.", + "type": [ + "null", + "object" + ], + "properties": { + "subtype": { + "description": "Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "type": { + "description": "Type expresses the correlated span's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "tags": { + "description": "Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "timestamp": { + "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch", + "type": [ + "null", + "integer" + ] + }, + "transaction": { + "description": "Transaction holds selected information about the correlated transaction.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the correlated transaction.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "type": { + "description": "Type expresses the correlated transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "samples" + ] + }, + "span": { + "$id": "docs/spec/v2/span", + "type": "object", + "properties": { + "action": { + "description": "Action holds the specific kind of event within the sub-type represented by the span (e.g. query, connect)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "child_ids": { + "description": "ChildIDs holds a list of successor transactions and/or spans.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string", + "maxLength": 1024 + }, + "minItems": 0 + }, + "composite": { + "description": "Composite holds details on a group of spans represented by a single one.", + "type": [ + "null", + "object" + ], + "properties": { + "compression_strategy": { + "description": "A string value indicating which compression strategy was used. The valid values are `exact_match` and `same_kind`.", + "type": "string" + }, + "count": { + "description": "Count is the number of compressed spans the composite span represents. The minimum count is 2, as a composite span represents at least two spans.", + "type": "integer", + "minimum": 2 + }, + "sum": { + "description": "Sum is the durations of all compressed spans this composite span represents in milliseconds.", + "type": "number", + "minimum": 0 + } + }, + "required": [ + "compression_strategy", + "count", + "sum" + ] + }, + "context": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "db": { + "description": "Database contains contextual data for database spans", + "type": [ + "null", + "object" + ], + "properties": { + "instance": { + "description": "Instance name of the database.", + "type": [ + "null", + "string" + ] + }, + "link": { + "description": "Link to the database server.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "rows_affected": { + "description": "RowsAffected shows the number of rows affected by the statement.", + "type": [ + "null", + "integer" + ] + }, + "statement": { + "description": "Statement of the recorded database event, e.g. query.", + "type": [ + "null", + "string" + ] + }, + "type": { + "description": "Type of the recorded database event., e.g. sql, cassandra, hbase, redis.", + "type": [ + "null", + "string" + ] + }, + "user": { + "description": "User is the username with which the database is accessed.", + "type": [ + "null", + "string" + ] + } + } + }, + "destination": { + "description": "Destination contains contextual data about the destination of spans", + "type": [ + "null", + "object" + ], + "properties": { + "address": { + "description": "Address is the destination network address: hostname (e.g. 'localhost'), FQDN (e.g. 'elastic.co'), IPv4 (e.g. '127.0.0.1') IPv6 (e.g. '::1')", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "port": { + "description": "Port is the destination network port (e.g. 443)", + "type": [ + "null", + "integer" + ] + }, + "service": { + "description": "Service describes the destination service", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name is the identifier for the destination service, e.g. 'http://elastic.co', 'elasticsearch', 'rabbitmq' ( DEPRECATED: this field will be removed in a future release", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "resource": { + "description": "Resource identifies the destination service resource being operated on e.g. 'http://elastic.co:80', 'elasticsearch', 'rabbitmq/queue_name' DEPRECATED: this field will be removed in a future release", + "type": "string", + "maxLength": 1024 + }, + "type": { + "description": "Type of the destination service, e.g. db, elasticsearch. Should typically be the same as span.type. DEPRECATED: this field will be removed in a future release", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "resource" + ] + } + } + }, + "http": { + "description": "HTTP contains contextual information when the span concerns an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "method": { + "description": "Method holds information about the method of the HTTP request.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "request": { + "description": "Request describes the HTTP request information.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID holds the unique identifier for the http request.", + "type": [ + "null", + "string" + ] + } + } + }, + "response": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "decoded_body_size": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "encoded_body_size": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "headers": { + "description": "Headers holds the http headers sent in the http response.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "status_code": { + "description": "StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "transfer_size": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "status_code": { + "description": "Deprecated: Use Response.StatusCode instead. StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "url": { + "description": "URL is the raw url of the correlating HTTP request.", + "type": [ + "null", + "string" + ] + } + } + }, + "message": { + "description": "Message holds details related to message receiving and publishing if the captured event integrates with a messaging system", + "type": [ + "null", + "object" + ], + "properties": { + "age": { + "description": "Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field.", + "type": [ + "null", + "object" + ], + "properties": { + "ms": { + "description": "Age of the message in milliseconds.", + "type": [ + "null", + "integer" + ] + } + } + }, + "body": { + "description": "Body of the received message, similar to an HTTP request body", + "type": [ + "null", + "string" + ] + }, + "headers": { + "description": "Headers received with the message, similar to HTTP request headers.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "queue": { + "description": "Queue holds information about the message queue where the message is received.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name holds the name of the message queue where the message is received.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "routing_key": { + "description": "RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ.", + "type": [ + "null", + "string" + ] + } + } + }, + "service": { + "description": "Service related information can be sent per span. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "agent": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "ephemeral_id": { + "description": "EphemeralID is a free format ID used for metrics correlation by agents", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "environment": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "framework": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "id": { + "description": "ID holds a unique identifier for the service.", + "type": [ + "null", + "string" + ] + }, + "language": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "name": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "node": { + "description": "Node must be a unique meaningful name of the service node.", + "type": [ + "null", + "object" + ], + "properties": { + "configured_name": { + "description": "Name of the service node", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "origin": { + "description": "Origin contains the self-nested field groups for service.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "Immutable id of the service emitting this event.", + "type": [ + "null", + "string" + ] + }, + "name": { + "description": "Immutable name of the service emitting this event.", + "type": [ + "null", + "string" + ] + }, + "version": { + "description": "The version of the service the data was collected from.", + "type": [ + "null", + "string" + ] + } + } + }, + "runtime": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "target": { + "description": "Target holds information about the outgoing service in case of an outgoing event", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Immutable name of the target service for the event", + "type": [ + "null", + "string" + ] + }, + "type": { + "description": "Immutable type of the target service for the event", + "type": [ + "null", + "string" + ] + } + }, + "anyOf": [ + { + "properties": { + "type": { + "type": "string" + } + }, + "required": [ + "type" + ] + }, + { + "properties": { + "name": { + "type": "string" + } + }, + "required": [ + "name" + ] + } + ] + }, + "version": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "tags": { + "description": "Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + } + } + }, + "duration": { + "description": "Duration of the span in milliseconds. When the span is a composite one, duration is the gross duration, including \"whitespace\" in between spans.", + "type": "number", + "minimum": 0 + }, + "id": { + "description": "ID holds the hex encoded 64 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "links": { + "description": "Links holds links to other spans, potentially in other traces.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "span_id": { + "description": "SpanID holds the ID of the linked span.", + "type": "string", + "maxLength": 1024 + }, + "trace_id": { + "description": "TraceID holds the ID of the linked span's trace.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "span_id", + "trace_id" + ] + }, + "minItems": 0 + }, + "name": { + "description": "Name is the generic designation of a span in the scope of a transaction.", + "type": "string", + "maxLength": 1024 + }, + "otel": { + "description": "OTel contains unmapped OpenTelemetry attributes.", + "type": [ + "null", + "object" + ], + "properties": { + "attributes": { + "description": "Attributes hold the unmapped OpenTelemetry attributes.", + "type": [ + "null", + "object" + ] + }, + "span_kind": { + "description": "SpanKind holds the incoming OpenTelemetry span kind.", + "type": [ + "null", + "string" + ] + } + } + }, + "outcome": { + "description": "Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.", + "type": [ + "null", + "string" + ], + "enum": [ + "success", + "failure", + "unknown", + null + ] + }, + "parent_id": { + "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", + "type": "string", + "maxLength": 1024 + }, + "sample_rate": { + "description": "SampleRate applied to the monitored service at the time where this span was recorded.", + "type": [ + "null", + "number" + ] + }, + "stacktrace": { + "description": "Stacktrace connected to this span event.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "abs_path": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "classname": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "colno": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "context_line": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "filename": { + "description": "Filename is the relative name of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "function": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "library_frame": { + "description": "LibraryFrame indicates whether the frame is from a third party library.", + "type": [ + "null", + "boolean" + ] + }, + "lineno": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "module": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "post_context": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "pre_context": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "vars": { + "description": "Vars is a flat mapping of local variables of the frame.", + "type": [ + "null", + "object" + ] + } + }, + "anyOf": [ + { + "properties": { + "classname": { + "type": "string" + } + }, + "required": [ + "classname" + ] + }, + { + "properties": { + "filename": { + "type": "string" + } + }, + "required": [ + "filename" + ] + } + ] + }, + "minItems": 0 + }, + "start": { + "description": "Start is the offset relative to the transaction's timestamp identifying the start of the span, in milliseconds.", + "type": [ + "null", + "number" + ] + }, + "subtype": { + "description": "Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "sync": { + "description": "Sync indicates whether the span was executed synchronously or asynchronously.", + "type": [ + "null", + "boolean" + ] + }, + "timestamp": { + "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch", + "type": [ + "null", + "integer" + ] + }, + "trace_id": { + "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", + "type": "string", + "maxLength": 1024 + }, + "transaction_id": { + "description": "TransactionID holds the hex encoded 64 random bits ID of the correlated transaction.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "type": { + "description": "Type holds the span's type, and can have specific keywords within the service's domain (eg: 'request', 'backgroundjob', etc)", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "id", + "trace_id", + "name", + "parent_id", + "type", + "duration" + ], + "anyOf": [ + { + "properties": { + "start": { + "type": "number" + } + }, + "required": [ + "start" + ] + }, + { + "properties": { + "timestamp": { + "type": "integer" + } + }, + "required": [ + "timestamp" + ] + } + ] + }, + "transaction": { + "$id": "docs/spec/v2/transaction", + "type": "object", + "properties": { + "context": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "cloud": { + "description": "Cloud holds fields related to the cloud or infrastructure the events are coming from.", + "type": [ + "null", + "object" + ], + "properties": { + "origin": { + "description": "Origin contains the self-nested field groups for cloud.", + "type": [ + "null", + "object" + ], + "properties": { + "account": { + "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "The cloud account or organization id used to identify different entities in a multi-tenant environment.", + "type": [ + "null", + "string" + ] + } + } + }, + "provider": { + "description": "Name of the cloud provider.", + "type": [ + "null", + "string" + ] + }, + "region": { + "description": "Region in which this host, resource, or service is located.", + "type": [ + "null", + "string" + ] + }, + "service": { + "description": "The cloud service name is intended to distinguish services running on different platforms within a provider.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "The cloud service name is intended to distinguish services running on different platforms within a provider.", + "type": [ + "null", + "string" + ] + } + } + } + } + } + } + }, + "custom": { + "description": "Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch.", + "type": [ + "null", + "object" + ] + }, + "message": { + "description": "Message holds details related to message receiving and publishing if the captured event integrates with a messaging system", + "type": [ + "null", + "object" + ], + "properties": { + "age": { + "description": "Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field.", + "type": [ + "null", + "object" + ], + "properties": { + "ms": { + "description": "Age of the message in milliseconds.", + "type": [ + "null", + "integer" + ] + } + } + }, + "body": { + "description": "Body of the received message, similar to an HTTP request body", + "type": [ + "null", + "string" + ] + }, + "headers": { + "description": "Headers received with the message, similar to HTTP request headers.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "queue": { + "description": "Queue holds information about the message queue where the message is received.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name holds the name of the message queue where the message is received.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "routing_key": { + "description": "RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ.", + "type": [ + "null", + "string" + ] + } + } + }, + "page": { + "description": "Page holds information related to the current page and page referers. It is only sent from RUM agents.", + "type": [ + "null", + "object" + ], + "properties": { + "referer": { + "description": "Referer holds the URL of the page that 'linked' to the current page.", + "type": [ + "null", + "string" + ] + }, + "url": { + "description": "URL of the current page", + "type": [ + "null", + "string" + ] + } + } + }, + "request": { + "description": "Request describes the HTTP request information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "body": { + "description": "Body only contais the request bod, not the query string information. It can either be a dictionary (for standard HTTP requests) or a raw request body.", + "type": [ + "null", + "string", + "object" + ] + }, + "cookies": { + "description": "Cookies used by the request, parsed as key-value objects.", + "type": [ + "null", + "object" + ] + }, + "env": { + "description": "Env holds environment variable information passed to the monitored service.", + "type": [ + "null", + "object" + ] + }, + "headers": { + "description": "Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "http_version": { + "description": "HTTPVersion holds information about the used HTTP version.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "method": { + "description": "Method holds information about the method of the HTTP request.", + "type": "string", + "maxLength": 1024 + }, + "socket": { + "description": "Socket holds information related to the recorded request, such as whether or not data were encrypted and the remote address.", + "type": [ + "null", + "object" + ], + "properties": { + "encrypted": { + "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.", + "type": [ + "null", + "boolean" + ] + }, + "remote_address": { + "description": "RemoteAddress holds the network address sending the request. It should be obtained through standard APIs and not be parsed from any headers like 'Forwarded'.", + "type": [ + "null", + "string" + ] + } + } + }, + "url": { + "description": "URL holds information sucha as the raw URL, scheme, host and path.", + "type": [ + "null", + "object" + ], + "properties": { + "full": { + "description": "Full, possibly agent-assembled URL of the request, e.g. https://example.com:443/search?q=elasticsearch#top.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "hash": { + "description": "Hash of the request URL, e.g. 'top'", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "hostname": { + "description": "Hostname information of the request, e.g. 'example.com'.\"", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "pathname": { + "description": "Path of the request, e.g. '/search'", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "port": { + "description": "Port of the request, e.g. '443'. Can be sent as string or int.", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "protocol": { + "description": "Protocol information for the recorded request, e.g. 'https:'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "raw": { + "description": "Raw unparsed URL of the HTTP request line, e.g https://example.com:443/search?q=elasticsearch. This URL may be absolute or relative. For more details, see https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "search": { + "description": "Search contains the query string information of the request. It is expected to have values delimited by ampersands.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "method" + ] + }, + "response": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "decoded_body_size": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "encoded_body_size": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "finished": { + "description": "Finished indicates whether the response was finished or not.", + "type": [ + "null", + "boolean" + ] + }, + "headers": { + "description": "Headers holds the http headers sent in the http response.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "headers_sent": { + "description": "HeadersSent indicates whether http headers were sent.", + "type": [ + "null", + "boolean" + ] + }, + "status_code": { + "description": "StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "transfer_size": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "service": { + "description": "Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "agent": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "ephemeral_id": { + "description": "EphemeralID is a free format ID used for metrics correlation by agents", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "name": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "environment": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "framework": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "id": { + "description": "ID holds a unique identifier for the service.", + "type": [ + "null", + "string" + ] + }, + "language": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "name": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "node": { + "description": "Node must be a unique meaningful name of the service node.", + "type": [ + "null", + "object" + ], + "properties": { + "configured_name": { + "description": "Name of the service node", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "origin": { + "description": "Origin contains the self-nested field groups for service.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "Immutable id of the service emitting this event.", + "type": [ + "null", + "string" + ] + }, + "name": { + "description": "Immutable name of the service emitting this event.", + "type": [ + "null", + "string" + ] + }, + "version": { + "description": "The version of the service the data was collected from.", + "type": [ + "null", + "string" + ] + } + } + }, + "runtime": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Name of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "version": { + "description": "Version of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "target": { + "description": "Target holds information about the outgoing service in case of an outgoing event", + "type": [ + "null", + "object" + ], + "properties": { + "name": { + "description": "Immutable name of the target service for the event", + "type": [ + "null", + "string" + ] + }, + "type": { + "description": "Immutable type of the target service for the event", + "type": [ + "null", + "string" + ] + } + }, + "anyOf": [ + { + "properties": { + "type": { + "type": "string" + } + }, + "required": [ + "type" + ] + }, + { + "properties": { + "name": { + "type": "string" + } + }, + "required": [ + "name" + ] + } + ] + }, + "version": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "tags": { + "description": "Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "user": { + "description": "User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event.", + "type": [ + "null", + "object" + ], + "properties": { + "domain": { + "description": "Domain of the logged in user", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "email": { + "description": "Email of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "id": { + "description": "ID identifies the logged in user, e.g. can be the primary key of the user", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "username": { + "description": "Name of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "dropped_spans_stats": { + "description": "DroppedSpanStats holds information about spans that were dropped (for example due to transaction_max_spans or exit_span_min_duration).", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "destination_service_resource": { + "description": "DestinationServiceResource identifies the destination service resource being operated on. e.g. 'http://elastic.co:80', 'elasticsearch', 'rabbitmq/queue_name'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "duration": { + "description": "Duration holds duration aggregations about the dropped span.", + "type": [ + "null", + "object" + ], + "properties": { + "count": { + "description": "Count holds the number of times the dropped span happened.", + "type": [ + "null", + "integer" + ], + "minimum": 1 + }, + "sum": { + "description": "Sum holds dimensions about the dropped span's duration.", + "type": [ + "null", + "object" + ], + "properties": { + "us": { + "description": "Us represents the summation of the span duration.", + "type": [ + "null", + "integer" + ], + "minimum": 0 + } + } + } + } + }, + "outcome": { + "description": "Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.", + "type": [ + "null", + "string" + ], + "enum": [ + "success", + "failure", + "unknown", + null + ] + }, + "service_target_name": { + "description": "ServiceTargetName identifies the instance name of the target service being operated on", + "type": [ + "null", + "string" + ], + "maxLength": 512 + }, + "service_target_type": { + "description": "ServiceTargetType identifies the type of the target service being operated on e.g. 'oracle', 'rabbitmq'", + "type": [ + "null", + "string" + ], + "maxLength": 512 + } + } + }, + "minItems": 0 + }, + "duration": { + "description": "Duration how long the transaction took to complete, in milliseconds with 3 decimal points.", + "type": "number", + "minimum": 0 + }, + "experience": { + "description": "UserExperience holds metrics for measuring real user experience. This information is only sent by RUM agents.", + "type": [ + "null", + "object" + ], + "properties": { + "cls": { + "description": "CumulativeLayoutShift holds the Cumulative Layout Shift (CLS) metric value, or a negative value if CLS is unknown. See https://web.dev/cls/", + "type": [ + "null", + "number" + ], + "minimum": 0 + }, + "fid": { + "description": "FirstInputDelay holds the First Input Delay (FID) metric value, or a negative value if FID is unknown. See https://web.dev/fid/", + "type": [ + "null", + "number" + ], + "minimum": 0 + }, + "longtask": { + "description": "Longtask holds longtask duration/count metrics.", + "type": [ + "null", + "object" + ], + "properties": { + "count": { + "description": "Count is the total number of of longtasks.", + "type": "integer", + "minimum": 0 + }, + "max": { + "description": "Max longtask duration", + "type": "number", + "minimum": 0 + }, + "sum": { + "description": "Sum of longtask durations", + "type": "number", + "minimum": 0 + } + }, + "required": [ + "count", + "max", + "sum" + ] + }, + "tbt": { + "description": "TotalBlockingTime holds the Total Blocking Time (TBT) metric value, or a negative value if TBT is unknown. See https://web.dev/tbt/", + "type": [ + "null", + "number" + ], + "minimum": 0 + } + } + }, + "faas": { + "description": "FAAS holds fields related to Function as a Service events.", + "type": [ + "null", + "object" + ], + "properties": { + "coldstart": { + "description": "Indicates whether a function invocation was a cold start or not.", + "type": [ + "null", + "boolean" + ] + }, + "execution": { + "description": "The request id of the function invocation.", + "type": [ + "null", + "string" + ] + }, + "id": { + "description": "A unique identifier of the invoked serverless function.", + "type": [ + "null", + "string" + ] + }, + "name": { + "description": "The lambda function name.", + "type": [ + "null", + "string" + ] + }, + "trigger": { + "description": "Trigger attributes.", + "type": [ + "null", + "object" + ], + "properties": { + "request_id": { + "description": "The id of the origin trigger request.", + "type": [ + "null", + "string" + ] + }, + "type": { + "description": "The trigger type.", + "type": [ + "null", + "string" + ] + } + } + }, + "version": { + "description": "The lambda function version.", + "type": [ + "null", + "string" + ] + } + } + }, + "id": { + "description": "ID holds the hex encoded 64 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "links": { + "description": "Links holds links to other spans, potentially in other traces.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "span_id": { + "description": "SpanID holds the ID of the linked span.", + "type": "string", + "maxLength": 1024 + }, + "trace_id": { + "description": "TraceID holds the ID of the linked span's trace.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "span_id", + "trace_id" + ] + }, + "minItems": 0 + }, + "marks": { + "description": "Marks capture the timing of a significant event during the lifetime of a transaction. Marks are organized into groups and can be set by the user or the agent. Marks are only reported by RUM agents.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "number" + ] + } + } + }, + "name": { + "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "otel": { + "description": "OTel contains unmapped OpenTelemetry attributes.", + "type": [ + "null", + "object" + ], + "properties": { + "attributes": { + "description": "Attributes hold the unmapped OpenTelemetry attributes.", + "type": [ + "null", + "object" + ] + }, + "span_kind": { + "description": "SpanKind holds the incoming OpenTelemetry span kind.", + "type": [ + "null", + "string" + ] + } + } + }, + "outcome": { + "description": "Outcome of the transaction with a limited set of permitted values, describing the success or failure of the transaction from the service's perspective. It is used for calculating error rates for incoming requests. Permitted values: success, failure, unknown.", + "type": [ + "null", + "string" + ], + "enum": [ + "success", + "failure", + "unknown", + null + ] + }, + "parent_id": { + "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "result": { + "description": "Result of the transaction. For HTTP-related transactions, this should be the status code formatted like 'HTTP 2xx'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "sample_rate": { + "description": "SampleRate applied to the monitored service at the time where this transaction was recorded. Allowed values are [0..1]. A SampleRate <1 indicates that not all spans are recorded.", + "type": [ + "null", + "number" + ] + }, + "sampled": { + "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.", + "type": [ + "null", + "boolean" + ] + }, + "session": { + "description": "Session holds optional transaction session information for RUM.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID holds a session ID for grouping a set of related transactions.", + "type": "string", + "maxLength": 1024 + }, + "sequence": { + "description": "Sequence holds an optional sequence number for a transaction within a session. It is not meaningful to compare sequences across two different sessions.", + "type": [ + "null", + "integer" + ], + "minimum": 1 + } + }, + "required": [ + "id" + ] + }, + "span_count": { + "description": "SpanCount counts correlated spans.", + "type": "object", + "properties": { + "dropped": { + "description": "Dropped is the number of correlated spans that have been dropped by the APM agent recording the transaction.", + "type": [ + "null", + "integer" + ] + }, + "started": { + "description": "Started is the number of correlated spans that are recorded.", + "type": "integer" + } + }, + "required": [ + "started" + ] + }, + "timestamp": { + "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch", + "type": [ + "null", + "integer" + ] + }, + "trace_id": { + "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", + "type": "string", + "maxLength": 1024 + }, + "type": { + "description": "Type expresses the transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "trace_id", + "id", + "type", + "span_count", + "duration" + ] + }, + "error-2": { + "$id": "docs/spec/rumv3/error", + "type": "object", + "properties": { + "c": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "cu": { + "description": "Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch.", + "type": [ + "null", + "object" + ] + }, + "g": { + "description": "Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "p": { + "description": "Page holds information related to the current page and page referers. It is only sent from RUM agents.", + "type": [ + "null", + "object" + ], + "properties": { + "rf": { + "description": "Referer holds the URL of the page that 'linked' to the current page.", + "type": [ + "null", + "string" + ] + }, + "url": { + "description": "URL of the current page", + "type": [ + "null", + "string" + ] + } + } + }, + "q": { + "description": "Request describes the HTTP request information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "en": { + "description": "Env holds environment variable information passed to the monitored service.", + "type": [ + "null", + "object" + ] + }, + "he": { + "description": "Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "hve": { + "description": "HTTPVersion holds information about the used HTTP version.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "mt": { + "description": "Method holds information about the method of the HTTP request.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "mt" + ] + }, + "r": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "dbs": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "ebs": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "he": { + "description": "Headers holds the http headers sent in the http response.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "sc": { + "description": "StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "ts": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "se": { + "description": "Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "a": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "en": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "fw": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "la": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "n": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "ru": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "ve": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "u": { + "description": "User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event.", + "type": [ + "null", + "object" + ], + "properties": { + "em": { + "description": "Email of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "id": { + "description": "ID identifies the logged in user, e.g. can be the primary key of the user", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "ud": { + "description": "Domain of the user", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "un": { + "description": "Name of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "cl": { + "description": "Culprit identifies the function call which was the primary perpetrator of this event.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ex": { + "description": "Exception holds information about the original error. The information is language specific.", + "type": [ + "null", + "object" + ], + "properties": { + "at": { + "description": "Attributes of the exception.", + "type": [ + "null", + "object" + ] + }, + "ca": { + "description": "Cause can hold a collection of error exceptions representing chained exceptions. The chain starts with the outermost exception, followed by its cause, and so on.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object" + }, + "minItems": 0 + }, + "cd": { + "description": "Code that is set when the error happened, e.g. database error code.", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "hd": { + "description": "Handled indicates whether the error was caught in the code or not.", + "type": [ + "null", + "boolean" + ] + }, + "mg": { + "description": "Message contains the originally captured error message.", + "type": [ + "null", + "string" + ] + }, + "mo": { + "description": "Module describes the exception type's module namespace.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "st": { + "description": "Stacktrace information of the captured exception.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "ap": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cli": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cn": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "co": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "f": { + "description": "Filename is the relative name of the frame's file.", + "type": "string" + }, + "fn": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "li": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "mo": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "poc": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "prc": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + } + }, + "required": [ + "f" + ] + }, + "minItems": 0 + }, + "t": { + "description": "Type of the exception.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "anyOf": [ + { + "properties": { + "mg": { + "type": "string" + } + }, + "required": [ + "mg" + ] + }, + { + "properties": { + "t": { + "type": "string" + } + }, + "required": [ + "t" + ] + } + ] + }, + "id": { + "description": "ID holds the hex encoded 128 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "log": { + "description": "Log holds additional information added when the error is logged.", + "type": [ + "null", + "object" + ], + "properties": { + "ln": { + "description": "LoggerName holds the name of the used logger instance.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "lv": { + "description": "Level represents the severity of the recorded log.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "mg": { + "description": "Message of the logged error. In case a parameterized message is captured, Message should contain the same information, but with any placeholders being replaced.", + "type": "string" + }, + "pmg": { + "description": "ParamMessage should contain the same information as Message, but with placeholders where parameters were logged, e.g. 'error connecting to %s'. The string is not interpreted, allowing differnt placeholders per client languange. The information might be used to group errors together.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "st": { + "description": "Stacktrace information of the captured error.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "ap": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cli": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cn": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "co": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "f": { + "description": "Filename is the relative name of the frame's file.", + "type": "string" + }, + "fn": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "li": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "mo": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "poc": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "prc": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + } + }, + "required": [ + "f" + ] + }, + "minItems": 0 + } + }, + "required": [ + "mg" + ] + }, + "pid": { + "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "tid": { + "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "timestamp": { + "description": "Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch.", + "type": [ + "null", + "integer" + ] + }, + "x": { + "description": "Transaction holds information about the correlated transaction.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "sm": { + "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.", + "type": [ + "null", + "boolean" + ] + }, + "t": { + "description": "Type expresses the correlated transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "xid": { + "description": "TransactionID holds the hex encoded 64 random bits ID of the correlated transaction.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "id" + ], + "allOf": [ + { + "if": { + "properties": { + "xid": { + "type": "string" + } + }, + "required": [ + "xid" + ] + }, + "then": { + "properties": { + "pid": { + "type": "string" + } + }, + "required": [ + "pid" + ] + } + }, + { + "if": { + "properties": { + "tid": { + "type": "string" + } + }, + "required": [ + "tid" + ] + }, + "then": { + "properties": { + "pid": { + "type": "string" + } + }, + "required": [ + "pid" + ] + } + }, + { + "if": { + "properties": { + "xid": { + "type": "string" + } + }, + "required": [ + "xid" + ] + }, + "then": { + "properties": { + "tid": { + "type": "string" + } + }, + "required": [ + "tid" + ] + } + }, + { + "if": { + "properties": { + "pid": { + "type": "string" + } + }, + "required": [ + "pid" + ] + }, + "then": { + "properties": { + "tid": { + "type": "string" + } + }, + "required": [ + "tid" + ] + } + } + ], + "anyOf": [ + { + "properties": { + "ex": { + "type": "object" + } + }, + "required": [ + "ex" + ] + }, + { + "properties": { + "log": { + "type": "object" + } + }, + "required": [ + "log" + ] + } + ] + }, + "metadata-2": { + "$id": "docs/spec/rumv3/metadata", + "type": "object", + "properties": { + "l": { + "description": "Labels are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Labels are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "n": { + "description": "Network holds information about the network over which the monitored service is communicating.", + "type": [ + "null", + "object" + ], + "properties": { + "c": { + "type": [ + "null", + "object" + ], + "properties": { + "t": { + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "se": { + "description": "Service metadata about the monitored service.", + "type": "object", + "properties": { + "a": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": "object", + "properties": { + "n": { + "description": "Name of the APM agent capturing information.", + "type": "string", + "maxLength": 1024, + "minLength": 1 + }, + "ve": { + "description": "Version of the APM agent capturing information.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "n", + "ve" + ] + }, + "en": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "fw": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "la": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the used programming language", + "type": "string", + "maxLength": 1024 + }, + "ve": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "n" + ] + }, + "n": { + "description": "Name of the monitored service.", + "type": "string", + "maxLength": 1024, + "minLength": 1, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "ru": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the language runtime", + "type": "string", + "maxLength": 1024 + }, + "ve": { + "description": "Name of the language runtime", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "n", + "ve" + ] + }, + "ve": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "a", + "n" + ] + }, + "u": { + "description": "User metadata, which can be overwritten on a per event basis.", + "type": [ + "null", + "object" + ], + "properties": { + "em": { + "description": "Email of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "id": { + "description": "ID identifies the logged in user, e.g. can be the primary key of the user", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "ud": { + "description": "Domain of the user", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "un": { + "description": "Name of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "se" + ] + }, + "span-2": { + "$id": "docs/spec/rumv3/span", + "type": "object", + "properties": { + "ac": { + "description": "Action holds the specific kind of event within the sub-type represented by the span (e.g. query, connect)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "c": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "dt": { + "description": "Destination contains contextual data about the destination of spans", + "type": [ + "null", + "object" + ], + "properties": { + "ad": { + "description": "Address is the destination network address: hostname (e.g. 'localhost'), FQDN (e.g. 'elastic.co'), IPv4 (e.g. '127.0.0.1') IPv6 (e.g. '::1')", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "po": { + "description": "Port is the destination network port (e.g. 443)", + "type": [ + "null", + "integer" + ] + }, + "se": { + "description": "Service describes the destination service", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name is the identifier for the destination service, e.g. 'http://elastic.co', 'elasticsearch', 'rabbitmq' DEPRECATED: this field will be removed in a future release", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "rc": { + "description": "Resource identifies the destination service resource being operated on e.g. 'http://elastic.co:80', 'elasticsearch', 'rabbitmq/queue_name' DEPRECATED: this field will be removed in a future release", + "type": "string", + "maxLength": 1024 + }, + "t": { + "description": "Type of the destination service, e.g. db, elasticsearch. Should typically be the same as span.type. DEPRECATED: this field will be removed in a future release", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "rc" + ] + } + } + }, + "g": { + "description": "Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "h": { + "description": "HTTP contains contextual information when the span concerns an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "mt": { + "description": "Method holds information about the method of the HTTP request.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "r": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "dbs": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "ebs": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "ts": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "sc": { + "description": "Deprecated: Use Response.StatusCode instead. StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "url": { + "description": "URL is the raw url of the correlating HTTP request.", + "type": [ + "null", + "string" + ] + } + } + }, + "se": { + "description": "Service related information can be sent per span. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "a": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "n": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + } + } + } + } + }, + "d": { + "description": "Duration of the span in milliseconds", + "type": "number", + "minimum": 0 + }, + "id": { + "description": "ID holds the hex encoded 64 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "n": { + "description": "Name is the generic designation of a span in the scope of a transaction.", + "type": "string", + "maxLength": 1024 + }, + "o": { + "description": "Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.", + "type": [ + "null", + "string" + ], + "enum": [ + "success", + "failure", + "unknown", + null + ] + }, + "pi": { + "description": "ParentIndex is the index of the parent span in the list. Absent when the parent is a transaction.", + "type": [ + "null", + "integer" + ] + }, + "s": { + "description": "Start is the offset relative to the transaction's timestamp identifying the start of the span, in milliseconds.", + "type": "number" + }, + "sr": { + "description": "SampleRate applied to the monitored service at the time where this span was recorded.", + "type": [ + "null", + "number" + ] + }, + "st": { + "description": "Stacktrace connected to this span event.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "ap": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cli": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cn": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "co": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "f": { + "description": "Filename is the relative name of the frame's file.", + "type": "string" + }, + "fn": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "li": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "mo": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "poc": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "prc": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + } + }, + "required": [ + "f" + ] + }, + "minItems": 0 + }, + "su": { + "description": "Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "sy": { + "description": "Sync indicates whether the span was executed synchronously or asynchronously.", + "type": [ + "null", + "boolean" + ] + }, + "t": { + "description": "Type holds the span's type, and can have specific keywords within the service's domain (eg: 'request', 'backgroundjob', etc)", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "n", + "t", + "id", + "s", + "d" + ] + }, + "transaction-2": { + "$id": "docs/spec/rumv3/transaction", + "type": "object", + "properties": { + "c": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "cu": { + "description": "Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch.", + "type": [ + "null", + "object" + ] + }, + "g": { + "description": "Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "p": { + "description": "Page holds information related to the current page and page referers. It is only sent from RUM agents.", + "type": [ + "null", + "object" + ], + "properties": { + "rf": { + "description": "Referer holds the URL of the page that 'linked' to the current page.", + "type": [ + "null", + "string" + ] + }, + "url": { + "description": "URL of the current page", + "type": [ + "null", + "string" + ] + } + } + }, + "q": { + "description": "Request describes the HTTP request information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "en": { + "description": "Env holds environment variable information passed to the monitored service.", + "type": [ + "null", + "object" + ] + }, + "he": { + "description": "Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "hve": { + "description": "HTTPVersion holds information about the used HTTP version.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "mt": { + "description": "Method holds information about the method of the HTTP request.", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "mt" + ] + }, + "r": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "dbs": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "ebs": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "he": { + "description": "Headers holds the http headers sent in the http response.", + "type": [ + "null", + "object" + ], + "additionalProperties": false, + "patternProperties": { + "[.*]*$": { + "type": [ + "null", + "array", + "string" + ], + "items": { + "type": "string" + } + } + } + }, + "sc": { + "description": "StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "ts": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "se": { + "description": "Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "a": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "en": { + "description": "Environment in which the monitored service is running, e.g. `production` or `staging`.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "fw": { + "description": "Framework holds information about the framework used in the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the used framework", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "la": { + "description": "Language holds information about the programming language of the monitored service.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the used programming language", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "n": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + }, + "ru": { + "description": "Runtime holds information about the language runtime running the monitored service", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the language runtime", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "ve": { + "description": "Version of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "u": { + "description": "User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event.", + "type": [ + "null", + "object" + ], + "properties": { + "em": { + "description": "Email of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "id": { + "description": "ID identifies the logged in user, e.g. can be the primary key of the user", + "type": [ + "null", + "string", + "integer" + ], + "maxLength": 1024 + }, + "ud": { + "description": "Domain of the user", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "un": { + "description": "Name of the user.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + } + }, + "d": { + "description": "Duration how long the transaction took to complete, in milliseconds with 3 decimal points.", + "type": "number", + "minimum": 0 + }, + "exp": { + "description": "UserExperience holds metrics for measuring real user experience. This information is only sent by RUM agents.", + "type": [ + "null", + "object" + ], + "properties": { + "cls": { + "description": "CumulativeLayoutShift holds the Cumulative Layout Shift (CLS) metric value, or a negative value if CLS is unknown. See https://web.dev/cls/", + "type": [ + "null", + "number" + ], + "minimum": 0 + }, + "fid": { + "description": "FirstInputDelay holds the First Input Delay (FID) metric value, or a negative value if FID is unknown. See https://web.dev/fid/", + "type": [ + "null", + "number" + ], + "minimum": 0 + }, + "lt": { + "description": "Longtask holds longtask duration/count metrics.", + "type": [ + "null", + "object" + ], + "properties": { + "count": { + "description": "Count is the total number of of longtasks.", + "type": "integer", + "minimum": 0 + }, + "max": { + "description": "Max longtask duration", + "type": "number", + "minimum": 0 + }, + "sum": { + "description": "Sum of longtask durations", + "type": "number", + "minimum": 0 + } + }, + "required": [ + "count", + "max", + "sum" + ] + }, + "tbt": { + "description": "TotalBlockingTime holds the Total Blocking Time (TBT) metric value, or a negative value if TBT is unknown. See https://web.dev/tbt/", + "type": [ + "null", + "number" + ], + "minimum": 0 + } + } + }, + "id": { + "description": "ID holds the hex encoded 64 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "k": { + "description": "Marks capture the timing of a significant event during the lifetime of a transaction. Marks are organized into groups and can be set by the user or the agent. Marks are only reported by RUM agents.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "number" + ] + } + } + }, + "me": { + "description": "Metricsets is a collection metrics related to this transaction.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "sa": { + "description": "Samples hold application metrics collected from the agent.", + "type": "object", + "properties": { + "ysc": { + "description": "SpanSelfTimeCount holds the count of the related spans' self_time.", + "type": [ + "null", + "object" + ], + "properties": { + "v": { + "description": "Value holds the value of a single metric sample.", + "type": "number" + } + }, + "required": [ + "v" + ] + }, + "yss": { + "description": "SpanSelfTimeSum holds the sum of the related spans' self_time.", + "type": [ + "null", + "object" + ], + "properties": { + "v": { + "description": "Value holds the value of a single metric sample.", + "type": "number" + } + }, + "required": [ + "v" + ] + } + } + }, + "y": { + "description": "Span holds selected information about the correlated transaction.", + "type": [ + "null", + "object" + ], + "properties": { + "su": { + "description": "Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "t": { + "description": "Type expresses the correlated span's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + } + }, + "required": [ + "sa" + ] + }, + "minItems": 0 + }, + "n": { + "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "o": { + "description": "Outcome of the transaction with a limited set of permitted values, describing the success or failure of the transaction from the service's perspective. It is used for calculating error rates for incoming requests. Permitted values: success, failure, unknown.", + "type": [ + "null", + "string" + ], + "enum": [ + "success", + "failure", + "unknown", + null + ] + }, + "pid": { + "description": "ParentID holds the hex encoded 64 random bits ID of the parent transaction or span.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "rt": { + "description": "Result of the transaction. For HTTP-related transactions, this should be the status code formatted like 'HTTP 2xx'.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ses": { + "description": "Session holds optional transaction session information for RUM.", + "type": [ + "null", + "object" + ], + "properties": { + "id": { + "description": "ID holds a session ID for grouping a set of related transactions.", + "type": "string" + }, + "seq": { + "description": "Sequence holds an optional sequence number for a transaction within a session. It is not meaningful to compare sequences across two different sessions.", + "type": [ + "null", + "integer" + ], + "minimum": 1 + } + }, + "required": [ + "id" + ] + }, + "sm": { + "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.", + "type": [ + "null", + "boolean" + ] + }, + "sr": { + "description": "SampleRate applied to the monitored service at the time where this transaction was recorded. Allowed values are [0..1]. A SampleRate <1 indicates that not all spans are recorded.", + "type": [ + "null", + "number" + ] + }, + "t": { + "description": "Type expresses the transaction's type as keyword that has specific relevance within the service's domain, eg: 'request', 'backgroundjob'.", + "type": "string", + "maxLength": 1024 + }, + "tid": { + "description": "TraceID holds the hex encoded 128 random bits ID of the correlated trace.", + "type": "string", + "maxLength": 1024 + }, + "y": { + "description": "Spans is a collection of spans related to this transaction.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "ac": { + "description": "Action holds the specific kind of event within the sub-type represented by the span (e.g. query, connect)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "c": { + "description": "Context holds arbitrary contextual information for the event.", + "type": [ + "null", + "object" + ], + "properties": { + "dt": { + "description": "Destination contains contextual data about the destination of spans", + "type": [ + "null", + "object" + ], + "properties": { + "ad": { + "description": "Address is the destination network address: hostname (e.g. 'localhost'), FQDN (e.g. 'elastic.co'), IPv4 (e.g. '127.0.0.1') IPv6 (e.g. '::1')", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "po": { + "description": "Port is the destination network port (e.g. 443)", + "type": [ + "null", + "integer" + ] + }, + "se": { + "description": "Service describes the destination service", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name is the identifier for the destination service, e.g. 'http://elastic.co', 'elasticsearch', 'rabbitmq' DEPRECATED: this field will be removed in a future release", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "rc": { + "description": "Resource identifies the destination service resource being operated on e.g. 'http://elastic.co:80', 'elasticsearch', 'rabbitmq/queue_name' DEPRECATED: this field will be removed in a future release", + "type": "string", + "maxLength": 1024 + }, + "t": { + "description": "Type of the destination service, e.g. db, elasticsearch. Should typically be the same as span.type. DEPRECATED: this field will be removed in a future release", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + }, + "required": [ + "rc" + ] + } + } + }, + "g": { + "description": "Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable.", + "type": [ + "null", + "object" + ], + "additionalProperties": { + "type": [ + "null", + "string", + "boolean", + "number" + ], + "maxLength": 1024 + } + }, + "h": { + "description": "HTTP contains contextual information when the span concerns an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "mt": { + "description": "Method holds information about the method of the HTTP request.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "r": { + "description": "Response describes the HTTP response information in case the event was created as a result of an HTTP request.", + "type": [ + "null", + "object" + ], + "properties": { + "dbs": { + "description": "DecodedBodySize holds the size of the decoded payload.", + "type": [ + "null", + "integer" + ] + }, + "ebs": { + "description": "EncodedBodySize holds the size of the encoded payload.", + "type": [ + "null", + "integer" + ] + }, + "ts": { + "description": "TransferSize holds the total size of the payload.", + "type": [ + "null", + "integer" + ] + } + } + }, + "sc": { + "description": "Deprecated: Use Response.StatusCode instead. StatusCode sent in the http response.", + "type": [ + "null", + "integer" + ] + }, + "url": { + "description": "URL is the raw url of the correlating HTTP request.", + "type": [ + "null", + "string" + ] + } + } + }, + "se": { + "description": "Service related information can be sent per span. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information.", + "type": [ + "null", + "object" + ], + "properties": { + "a": { + "description": "Agent holds information about the APM agent capturing the event.", + "type": [ + "null", + "object" + ], + "properties": { + "n": { + "description": "Name of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "ve": { + "description": "Version of the APM agent capturing information.", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + } + } + }, + "n": { + "description": "Name of the monitored service.", + "type": [ + "null", + "string" + ], + "maxLength": 1024, + "pattern": "^[a-zA-Z0-9 _-]+$" + } + } + } + } + }, + "d": { + "description": "Duration of the span in milliseconds", + "type": "number", + "minimum": 0 + }, + "id": { + "description": "ID holds the hex encoded 64 random bits ID of the event.", + "type": "string", + "maxLength": 1024 + }, + "n": { + "description": "Name is the generic designation of a span in the scope of a transaction.", + "type": "string", + "maxLength": 1024 + }, + "o": { + "description": "Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.", + "type": [ + "null", + "string" + ], + "enum": [ + "success", + "failure", + "unknown", + null + ] + }, + "pi": { + "description": "ParentIndex is the index of the parent span in the list. Absent when the parent is a transaction.", + "type": [ + "null", + "integer" + ] + }, + "s": { + "description": "Start is the offset relative to the transaction's timestamp identifying the start of the span, in milliseconds.", + "type": "number" + }, + "sr": { + "description": "SampleRate applied to the monitored service at the time where this span was recorded.", + "type": [ + "null", + "number" + ] + }, + "st": { + "description": "Stacktrace connected to this span event.", + "type": [ + "null", + "array" + ], + "items": { + "type": "object", + "properties": { + "ap": { + "description": "AbsPath is the absolute path of the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cli": { + "description": "ContextLine is the line from the frame's file.", + "type": [ + "null", + "string" + ] + }, + "cn": { + "description": "Classname of the frame.", + "type": [ + "null", + "string" + ] + }, + "co": { + "description": "ColumnNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "f": { + "description": "Filename is the relative name of the frame's file.", + "type": "string" + }, + "fn": { + "description": "Function represented by the frame.", + "type": [ + "null", + "string" + ] + }, + "li": { + "description": "LineNumber of the frame.", + "type": [ + "null", + "integer" + ] + }, + "mo": { + "description": "Module to which the frame belongs to.", + "type": [ + "null", + "string" + ] + }, + "poc": { + "description": "PostContext is a slice of code lines immediately before the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + }, + "prc": { + "description": "PreContext is a slice of code lines immediately after the line from the frame's file.", + "type": [ + "null", + "array" + ], + "items": { + "type": "string" + }, + "minItems": 0 + } + }, + "required": [ + "f" + ] + }, + "minItems": 0 + }, + "su": { + "description": "Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch)", + "type": [ + "null", + "string" + ], + "maxLength": 1024 + }, + "sy": { + "description": "Sync indicates whether the span was executed synchronously or asynchronously.", + "type": [ + "null", + "boolean" + ] + }, + "t": { + "description": "Type holds the span's type, and can have specific keywords within the service's domain (eg: 'request', 'backgroundjob', etc)", + "type": "string", + "maxLength": 1024 + } + }, + "required": [ + "n", + "t", + "id", + "s", + "d" + ] + }, + "minItems": 0 + }, + "yc": { + "description": "SpanCount counts correlated spans.", + "type": "object", + "properties": { + "dd": { + "description": "Dropped is the number of correlated spans that have been dropped by the APM agent recording the transaction.", + "type": [ + "null", + "integer" + ] + }, + "sd": { + "description": "Started is the number of correlated spans that are recorded.", + "type": "integer" + } + }, + "required": [ + "sd" + ] + } + }, + "required": [ + "tid", + "t", + "id", + "yc", + "d" + ] + } + }, + "responses": { + "200_server_info": { + "description": "A successful response indicates that the server is up.", + "content": { + "application/json": { + "schema": { + "description": "If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server.", + "type": "object", + "properties": { + "build_date": { + "type": "string", + "format": "time-date" + }, + "build_sha": { + "type": "string" + }, + "publish_ready": { + "type": "boolean" + }, + "version": { + "type": "string" + } + } + }, + "examples": { + "getServerHealthAuthResponse": { + "summary": "Example APM Server information request with a secret token", + "value": { + "build_date": "2021-12-18T19:59:06Z", + "build_sha": "24fe620eeff5a19e2133c940c7e5ce1ceddb1445", + "publish_ready": true, + "version": "8.12.2" + } + } + } + } + } + } + }, + "examples": { + "metadataEventIntakeRequestExample": { + "summary": "A request body example for the metadata event type.", + "value": { + "metadata": { + "process": { + "pid": 1234, + "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java", + "ppid": 1, + "argv": [ + "-v" + ] + }, + "system": { + "architecture": "amd64", + "detected_hostname": "8ec7ceb99074", + "configured_hostname": "host1", + "platform": "Linux", + "container": { + "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + }, + "kubernetes": { + "namespace": "default", + "pod": { + "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3", + "name": "instrumented-java-service" + }, + "node": { + "name": "node-name" + } + } + }, + "service": { + "name": "1234_service-12a3", + "version": "4.3.0", + "node": { + "configured_name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + }, + "environment": "production", + "language": { + "name": "Java", + "version": "10.0.2" + }, + "agent": { + "version": "1.10.0", + "name": "java", + "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + }, + "framework": { + "name": "spring", + "version": "5.0.0" + }, + "runtime": { + "name": "Java", + "version": "10.0.2" + } + }, + "labels": { + "group": "experimental", + "ab_testing": true, + "segment": 5 + } + } + } + }, + "metricSetEventIntakeRequestExample": { + "summary": "A request body example for the metricset event type.", + "value": { + "metricset": { + "samples": { + "transaction.breakdown.count": { + "value": 12 + }, + "transaction.duration.sum.us": { + "value": 12 + }, + "transaction.duration.count": { + "value": 2 + }, + "transaction.self_time.sum.us": { + "value": 10 + }, + "transaction.self_time.count": { + "value": 2 + }, + "span.self_time.count": { + "value": 1 + }, + "span.self_time.sum.us": { + "value": 633.288 + }, + "byte_counter": { + "value": 1 + }, + "short_counter": { + "value": 227 + }, + "integer_gauge": { + "value": 42767 + }, + "long_gauge": { + "value": 3147483648 + }, + "float_gauge": { + "value": 9.16 + }, + "double_gauge": { + "value": 3.141592653589793 + }, + "dotted.float.gauge": { + "value": 6.12 + }, + "negative.d.o.t.t.e.d": { + "value": -1022 + } + }, + "tags": { + "code": 200, + "success": true + }, + "transaction": { + "type": "request", + "name": "GET/" + }, + "span": { + "type": "db", + "subtype": "mysql" + }, + "timestamp": 1571657444929001 + } + } + } + } + } +} \ No newline at end of file diff --git a/docs/spec/openapi/bundled.yaml b/docs/spec/openapi/bundled.yaml new file mode 100644 index 00000000000..0dcdffe0b13 --- /dev/null +++ b/docs/spec/openapi/bundled.yaml @@ -0,0 +1,5103 @@ +openapi: 3.1.0 +info: + title: APM Server + description: OpenAPI schema for APM Server APIs + version: '0.1' + license: + name: Elastic License 2.0 + url: https://www.elastic.co/licensing/elastic-license + contact: + name: APM Team +servers: + - url: / +security: + - apiKeyAuth: [] + - secretToken: [] +tags: + - name: agent config + description: APIs that query the APM Server for configuration changes. + x-displayName: APM agent configuration + - name: event intake + description: The events intake API is the internal protocol that APM agents use to talk to the APM Server. + x-displayName: APM event intake + - name: server info + description: APIs that query general APM Server information. + x-displayName: APM server information +paths: + /: + get: + summary: Get general server information + description: | + This lightweight endpoint is useful as a server up/down health check. + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + post: + summary: Get general server information + operationId: postServerHealth + tags: + - server info + responses: + '200': + $ref: '#/components/responses/200_server_info' + /config/v1/agents: + get: + summary: Get agent configuration changes + description: | + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getAgentConfig + tags: + - agent config + parameters: + - in: query + name: service.name + required: true + schema: + type: string + - in: query + name: service.environment + schema: + type: string + responses: + '200': + description: A successful response. + content: + application/json: + schema: + type: object + post: + summary: Get agent configuration changes + description: | + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: postAgentConfig + tags: + - agent config + requestBody: + content: + application/json: + schema: + type: object + required: + - service + properties: + CAPTURE_BODY: + type: string + example: 'off' + service: + type: object + required: + - name + properties: + environment: + type: string + example: all + name: + type: string + example: test-service + additionalProperties: true + responses: + '200': + description: Successful response + content: + application/json: + schema: + type: object + properties: + capture_body: + type: string + enum: + - 'off' + - errors + - transactions + - all + description: | + For transactions that are HTTP requests, the agent can optionally capture the request body (for example, POST variables). For transactions that are initiated by receiving a message from a message broker, the agent can capture the textual message body. + example: 'off' + transaction_max_spans: + type: integer + minimum: 0 + description: The maximum number of spans that are recorded per transaction. + example: 500 + transaction_sample_rate: + type: number + format: float + minimum: 0 + maximum: 1 + description: The agent samples transactions at this rate. + example: 0.3 + additionalProperties: true + '403': + description: APM Server is configured to fetch agent configuration from Elasticsearch but the configuration is invalid. + '503': + description: APM Server is starting up or Elasticsearch is unreachable. + /config/v1/rum/agents: + get: + summary: Get RUM agent configuration changes + description: | + To configure authenticated access to the APM server, the instructions at [APM API key](https://www.elastic.co/guide/en/observability/current/api-key.html) or [APM Secret Token](https://www.elastic.co/guide/en/observability/current/secret-token.html) must be followed to configure the correct permissions for APM access. + operationId: getRumAgentConfig + tags: + - agent config + responses: + '200': + description: Successful response. + /intake/v2/events: + post: + summary: Send APM agent events + description: | + NOTE: Most users do not need to interact directly with the events intake API. Agents communicate with the APM Server by sending events--captured pieces of information--in an HTTP request. Events can be transactions, spans, errors, or metrics. Each event is sent as its own line in the HTTP request body, which is known as newline delimited JSON (NDJSON). With NDJSON, agents can open an HTTP POST request and use chunked encoding to stream events to the APM Server as soon as they are recorded in the agent. This makes it simple for agents to serialize each event to a stream of newline delimited JSON. The APM Server also treats the HTTP body as a compressed stream and thus reads and handles each event independently. See the [APM data model](https://www.elastic.co/guide/en/observability/current/apm-data-model.html) to learn more about the different types of events. + operationId: postEventIntake + tags: + - event intake + parameters: + - in: query + name: async + description: | + Indicates whether to use asynchronous processing, which is supported by APM Server in 8.5.0 and later. NOTE: Since asynchronous processing defers some of the event processing to the background and takes place after the client has closed the request, some errors can't be communicated back to the client and are logged by the APM Server. Furthermore, asynchronous processing requests will only be scheduled if the APM Server can service the incoming request; requests that cannot be serviced will receive an internal error 503 "queue is full" error. + schema: + type: boolean + requestBody: + content: + application/ndjson: + schema: + anyOf: + - $ref: '#/components/schemas/ErrorEvent' + - $ref: '#/components/schemas/MetadataEvent' + - $ref: '#/components/schemas/MetricSetEvent' + - $ref: '#/components/schemas/SpanEvent' + - $ref: '#/components/schemas/TransactionEvent' + examples: + postMetadataEventIntakeExample: + $ref: '#/components/examples/metadataEventIntakeRequestExample' + postMetricSetEventIntakeExample: + $ref: '#/components/examples/metricSetEventIntakeRequestExample' + responses: + '202': + description: Successful response; all events succeeded. + /intake/v2/rum/events: + post: + summary: Send RUM events + description: | + NOTE: Most users do not need to interact directly with the events intake API. + operationId: postRumEventIntakeV2 + tags: + - event intake + requestBody: + content: + application/ndjson: + schema: + anyOf: + - $ref: '#/components/schemas/ErrorEvent' + - $ref: '#/components/schemas/MetadataEvent' + - $ref: '#/components/schemas/MetricSetEvent' + - $ref: '#/components/schemas/SpanEvent' + - $ref: '#/components/schemas/TransactionEvent' + responses: + '202': + description: Successful response; all events succeeded. + /intake/v3/rum/events: + post: + summary: Send RUM events + description: | + NOTE: Most users do not need to interact directly with the events intake API. + operationId: postRumEventIntakeV3 + tags: + - event intake + requestBody: + content: + application/ndjson: + schema: + anyOf: + - $ref: '#/components/schemas/ErrorEventv3' + - $ref: '#/components/schemas/MetadataEventv3' + - $ref: '#/components/schemas/SpanEventv3' + - $ref: '#/components/schemas/TransactionEventv3' + responses: + '202': + description: Successful response; all events succeeded. +components: + securitySchemes: + apiKeyAuth: + type: apiKey + in: header + name: Authorization + description: 'e.g. Authorization: ApiKey base64AccessApiKey' + secretToken: + type: http + scheme: bearer + bearerFormat: Secret token + schemas: + ErrorEvent: + type: object + description: | + Errors are events that occur in a monitored service and correspond to an error or a logged message captured by an agent. + required: + - error + properties: + error: + $ref: '#/components/schemas/error' + ErrorEventv3: + type: object + required: + - error + properties: + error: + $ref: '#/components/schemas/error-2' + MetadataEvent: + type: object + description: | + Every new connection to the APM Server starts with a metadata stanza. This provides general metadata concerning the other objects in the stream. Rather than send this metadata information from the agent multiple times, the APM Server hangs on to this information and applies it to other objects in the stream as necessary. TIP: Metadata is stored under context when viewing documents in Elasticsearch. APM agents automatically read Kubernetes data and send it to the APM Server. In most instances, agents are able to read this data from inside the container. If this is not the case, or if you wish to override this data, you can set environment variables for the agents to read. These environment variable are set via the Kubernetes Downward API. + required: + - metadata + properties: + metadata: + $ref: '#/components/schemas/metadata' + MetadataEventv3: + type: object + required: + - metadata + properties: + metadata: + $ref: '#/components/schemas/metadata-2' + MetricSetEvent: + type: object + description: | + Metric sets are events that contain application metric data captured by an APM agent. + required: + - metricset + properties: + metricset: + $ref: '#/components/schemas/metricset' + SpanEvent: + type: object + description: | + Spans are events captured by an agent occurring in a monitored service. + required: + - span + properties: + span: + $ref: '#/components/schemas/span' + SpanEventv3: + type: object + required: + - span + properties: + span: + $ref: '#/components/schemas/span-2' + TransactionEvent: + type: object + description: | + Transactions are events corresponding to an incoming request or similar task occurring in a monitored service. + required: + - transaction + properties: + transaction: + $ref: '#/components/schemas/transaction' + TransactionEventv3: + type: object + required: + - transaction + properties: + transaction: + $ref: '#/components/schemas/transaction-2' + error: + $id: docs/spec/v2/error + description: errorEvent represents an error or a logged error message, captured by an APM agent in a monitored service. + type: object + properties: + context: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + cloud: + description: Cloud holds fields related to the cloud or infrastructure the events are coming from. + type: + - 'null' + - object + properties: + origin: + description: Origin contains the self-nested field groups for cloud. + type: + - 'null' + - object + properties: + account: + description: The cloud account or organization id used to identify different entities in a multi-tenant environment. + type: + - 'null' + - object + properties: + id: + description: The cloud account or organization id used to identify different entities in a multi-tenant environment. + type: + - 'null' + - string + provider: + description: Name of the cloud provider. + type: + - 'null' + - string + region: + description: Region in which this host, resource, or service is located. + type: + - 'null' + - string + service: + description: The cloud service name is intended to distinguish services running on different platforms within a provider. + type: + - 'null' + - object + properties: + name: + description: The cloud service name is intended to distinguish services running on different platforms within a provider. + type: + - 'null' + - string + custom: + description: Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch. + type: + - 'null' + - object + message: + description: Message holds details related to message receiving and publishing if the captured event integrates with a messaging system + type: + - 'null' + - object + properties: + age: + description: Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field. + type: + - 'null' + - object + properties: + ms: + description: Age of the message in milliseconds. + type: + - 'null' + - integer + body: + description: Body of the received message, similar to an HTTP request body + type: + - 'null' + - string + headers: + description: Headers received with the message, similar to HTTP request headers. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + queue: + description: Queue holds information about the message queue where the message is received. + type: + - 'null' + - object + properties: + name: + description: Name holds the name of the message queue where the message is received. + type: + - 'null' + - string + maxLength: 1024 + routing_key: + description: RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ. + type: + - 'null' + - string + page: + description: Page holds information related to the current page and page referers. It is only sent from RUM agents. + type: + - 'null' + - object + properties: + referer: + description: Referer holds the URL of the page that 'linked' to the current page. + type: + - 'null' + - string + url: + description: URL of the current page + type: + - 'null' + - string + request: + description: Request describes the HTTP request information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + body: + description: Body only contais the request bod, not the query string information. It can either be a dictionary (for standard HTTP requests) or a raw request body. + type: + - 'null' + - string + - object + cookies: + description: Cookies used by the request, parsed as key-value objects. + type: + - 'null' + - object + env: + description: Env holds environment variable information passed to the monitored service. + type: + - 'null' + - object + headers: + description: Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + http_version: + description: HTTPVersion holds information about the used HTTP version. + type: + - 'null' + - string + maxLength: 1024 + method: + description: Method holds information about the method of the HTTP request. + type: string + maxLength: 1024 + socket: + description: Socket holds information related to the recorded request, such as whether or not data were encrypted and the remote address. + type: + - 'null' + - object + properties: + encrypted: + description: 'Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.' + type: + - 'null' + - boolean + remote_address: + description: RemoteAddress holds the network address sending the request. It should be obtained through standard APIs and not be parsed from any headers like 'Forwarded'. + type: + - 'null' + - string + url: + description: URL holds information sucha as the raw URL, scheme, host and path. + type: + - 'null' + - object + properties: + full: + description: Full, possibly agent-assembled URL of the request, e.g. https://example.com:443/search?q=elasticsearch#top. + type: + - 'null' + - string + maxLength: 1024 + hash: + description: Hash of the request URL, e.g. 'top' + type: + - 'null' + - string + maxLength: 1024 + hostname: + description: Hostname information of the request, e.g. 'example.com'." + type: + - 'null' + - string + maxLength: 1024 + pathname: + description: Path of the request, e.g. '/search' + type: + - 'null' + - string + maxLength: 1024 + port: + description: Port of the request, e.g. '443'. Can be sent as string or int. + type: + - 'null' + - string + - integer + maxLength: 1024 + protocol: + description: Protocol information for the recorded request, e.g. 'https:'. + type: + - 'null' + - string + maxLength: 1024 + raw: + description: Raw unparsed URL of the HTTP request line, e.g https://example.com:443/search?q=elasticsearch. This URL may be absolute or relative. For more details, see https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2. + type: + - 'null' + - string + maxLength: 1024 + search: + description: Search contains the query string information of the request. It is expected to have values delimited by ampersands. + type: + - 'null' + - string + maxLength: 1024 + required: + - method + response: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + decoded_body_size: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + encoded_body_size: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + finished: + description: Finished indicates whether the response was finished or not. + type: + - 'null' + - boolean + headers: + description: Headers holds the http headers sent in the http response. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + headers_sent: + description: HeadersSent indicates whether http headers were sent. + type: + - 'null' + - boolean + status_code: + description: StatusCode sent in the http response. + type: + - 'null' + - integer + transfer_size: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + service: + description: Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + agent: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + ephemeral_id: + description: EphemeralID is a free format ID used for metrics correlation by agents + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + environment: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + framework: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID holds a unique identifier for the service. + type: + - 'null' + - string + language: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used programming language + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + node: + description: Node must be a unique meaningful name of the service node. + type: + - 'null' + - object + properties: + configured_name: + description: Name of the service node + type: + - 'null' + - string + maxLength: 1024 + origin: + description: Origin contains the self-nested field groups for service. + type: + - 'null' + - object + properties: + id: + description: Immutable id of the service emitting this event. + type: + - 'null' + - string + name: + description: Immutable name of the service emitting this event. + type: + - 'null' + - string + version: + description: The version of the service the data was collected from. + type: + - 'null' + - string + runtime: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + name: + description: Name of the language runtime + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the language runtime + type: + - 'null' + - string + maxLength: 1024 + target: + description: Target holds information about the outgoing service in case of an outgoing event + type: + - 'null' + - object + properties: + name: + description: Immutable name of the target service for the event + type: + - 'null' + - string + type: + description: Immutable type of the target service for the event + type: + - 'null' + - string + anyOf: + - properties: + type: + type: string + required: + - type + - properties: + name: + type: string + required: + - name + version: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + tags: + description: Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + user: + description: User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event. + type: + - 'null' + - object + properties: + domain: + description: Domain of the logged in user + type: + - 'null' + - string + maxLength: 1024 + email: + description: Email of the user. + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID identifies the logged in user, e.g. can be the primary key of the user + type: + - 'null' + - string + - integer + maxLength: 1024 + username: + description: Name of the user. + type: + - 'null' + - string + maxLength: 1024 + culprit: + description: Culprit identifies the function call which was the primary perpetrator of this event. + type: + - 'null' + - string + maxLength: 1024 + exception: + description: Exception holds information about the original error. The information is language specific. + type: + - 'null' + - object + properties: + attributes: + description: Attributes of the exception. + type: + - 'null' + - object + cause: + description: Cause can hold a collection of error exceptions representing chained exceptions. The chain starts with the outermost exception, followed by its cause, and so on. + type: + - 'null' + - array + items: + type: object + minItems: 0 + code: + description: Code that is set when the error happened, e.g. database error code. + type: + - 'null' + - string + - integer + maxLength: 1024 + handled: + description: Handled indicates whether the error was caught in the code or not. + type: + - 'null' + - boolean + message: + description: Message contains the originally captured error message. + type: + - 'null' + - string + module: + description: Module describes the exception type's module namespace. + type: + - 'null' + - string + maxLength: 1024 + stacktrace: + description: Stacktrace information of the captured exception. + type: + - 'null' + - array + items: + type: object + properties: + abs_path: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + classname: + description: Classname of the frame. + type: + - 'null' + - string + colno: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + context_line: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + filename: + description: Filename is the relative name of the frame's file. + type: + - 'null' + - string + function: + description: Function represented by the frame. + type: + - 'null' + - string + library_frame: + description: LibraryFrame indicates whether the frame is from a third party library. + type: + - 'null' + - boolean + lineno: + description: LineNumber of the frame. + type: + - 'null' + - integer + module: + description: Module to which the frame belongs to. + type: + - 'null' + - string + post_context: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + pre_context: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + vars: + description: Vars is a flat mapping of local variables of the frame. + type: + - 'null' + - object + anyOf: + - properties: + classname: + type: string + required: + - classname + - properties: + filename: + type: string + required: + - filename + minItems: 0 + type: + description: Type of the exception. + type: + - 'null' + - string + maxLength: 1024 + anyOf: + - properties: + message: + type: string + required: + - message + - properties: + type: + type: string + required: + - type + id: + description: ID holds the hex encoded 128 random bits ID of the event. + type: string + maxLength: 1024 + log: + description: Log holds additional information added when the error is logged. + type: + - 'null' + - object + properties: + level: + description: Level represents the severity of the recorded log. + type: + - 'null' + - string + maxLength: 1024 + logger_name: + description: LoggerName holds the name of the used logger instance. + type: + - 'null' + - string + maxLength: 1024 + message: + description: Message of the logged error. In case a parameterized message is captured, Message should contain the same information, but with any placeholders being replaced. + type: string + param_message: + description: ParamMessage should contain the same information as Message, but with placeholders where parameters were logged, e.g. 'error connecting to %s'. The string is not interpreted, allowing differnt placeholders per client languange. The information might be used to group errors together. + type: + - 'null' + - string + maxLength: 1024 + stacktrace: + description: Stacktrace information of the captured error. + type: + - 'null' + - array + items: + type: object + properties: + abs_path: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + classname: + description: Classname of the frame. + type: + - 'null' + - string + colno: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + context_line: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + filename: + description: Filename is the relative name of the frame's file. + type: + - 'null' + - string + function: + description: Function represented by the frame. + type: + - 'null' + - string + library_frame: + description: LibraryFrame indicates whether the frame is from a third party library. + type: + - 'null' + - boolean + lineno: + description: LineNumber of the frame. + type: + - 'null' + - integer + module: + description: Module to which the frame belongs to. + type: + - 'null' + - string + post_context: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + pre_context: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + vars: + description: Vars is a flat mapping of local variables of the frame. + type: + - 'null' + - object + anyOf: + - properties: + classname: + type: string + required: + - classname + - properties: + filename: + type: string + required: + - filename + minItems: 0 + required: + - message + parent_id: + description: ParentID holds the hex encoded 64 random bits ID of the parent transaction or span. + type: + - 'null' + - string + maxLength: 1024 + timestamp: + description: Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch. + type: + - 'null' + - integer + trace_id: + description: TraceID holds the hex encoded 128 random bits ID of the correlated trace. + type: + - 'null' + - string + maxLength: 1024 + transaction: + description: Transaction holds information about the correlated transaction. + type: + - 'null' + - object + properties: + name: + description: 'Name is the generic designation of a transaction in the scope of a single service, eg: ''GET /users/:id''.' + type: + - 'null' + - string + maxLength: 1024 + sampled: + description: Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported. + type: + - 'null' + - boolean + type: + description: 'Type expresses the correlated transaction''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: + - 'null' + - string + maxLength: 1024 + transaction_id: + description: TransactionID holds the hex encoded 64 random bits ID of the correlated transaction. + type: + - 'null' + - string + maxLength: 1024 + required: + - id + allOf: + - if: + properties: + transaction_id: + type: string + required: + - transaction_id + then: + properties: + parent_id: + type: string + required: + - parent_id + - if: + properties: + trace_id: + type: string + required: + - trace_id + then: + properties: + parent_id: + type: string + required: + - parent_id + - if: + properties: + transaction_id: + type: string + required: + - transaction_id + then: + properties: + trace_id: + type: string + required: + - trace_id + - if: + properties: + parent_id: + type: string + required: + - parent_id + then: + properties: + trace_id: + type: string + required: + - trace_id + anyOf: + - properties: + exception: + type: object + required: + - exception + - properties: + log: + type: object + required: + - log + metadata: + $id: docs/spec/v2/metadata + type: object + properties: + cloud: + description: Cloud metadata about where the monitored service is running. + type: + - 'null' + - object + properties: + account: + description: Account where the monitored service is running. + type: + - 'null' + - object + properties: + id: + description: ID of the cloud account. + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the cloud account. + type: + - 'null' + - string + maxLength: 1024 + availability_zone: + description: AvailabilityZone where the monitored service is running, e.g. us-east-1a + type: + - 'null' + - string + maxLength: 1024 + instance: + description: Instance on which the monitored service is running. + type: + - 'null' + - object + properties: + id: + description: ID of the cloud instance. + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the cloud instance. + type: + - 'null' + - string + maxLength: 1024 + machine: + description: Machine on which the monitored service is running. + type: + - 'null' + - object + properties: + type: + description: ID of the cloud machine. + type: + - 'null' + - string + maxLength: 1024 + project: + description: Project in which the monitored service is running. + type: + - 'null' + - object + properties: + id: + description: ID of the cloud project. + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the cloud project. + type: + - 'null' + - string + maxLength: 1024 + provider: + description: Provider that is used, e.g. aws, azure, gcp, digitalocean. + type: string + maxLength: 1024 + region: + description: Region where the monitored service is running, e.g. us-east-1 + type: + - 'null' + - string + maxLength: 1024 + service: + description: Service that is monitored on cloud + type: + - 'null' + - object + properties: + name: + description: Name of the cloud service, intended to distinguish services running on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs App Engine, Azure VM vs App Server. + type: + - 'null' + - string + maxLength: 1024 + required: + - provider + labels: + description: Labels are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Labels are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + network: + description: Network holds information about the network over which the monitored service is communicating. + type: + - 'null' + - object + properties: + connection: + type: + - 'null' + - object + properties: + type: + type: + - 'null' + - string + maxLength: 1024 + process: + description: Process metadata about the monitored service. + type: + - 'null' + - object + properties: + argv: + description: Argv holds the command line arguments used to start this process. + type: + - 'null' + - array + items: + type: string + minItems: 0 + pid: + description: PID holds the process ID of the service. + type: integer + ppid: + description: Ppid holds the parent process ID of the service. + type: + - 'null' + - integer + title: + description: Title is the process title. It can be the same as process name. + type: + - 'null' + - string + maxLength: 1024 + required: + - pid + service: + description: Service metadata about the monitored service. + type: object + properties: + agent: + description: Agent holds information about the APM agent capturing the event. + type: object + properties: + activation_method: + description: ActivationMethod of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + ephemeral_id: + description: EphemeralID is a free format ID used for metrics correlation by agents + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the APM agent capturing information. + type: string + maxLength: 1024 + minLength: 1 + version: + description: Version of the APM agent capturing information. + type: string + maxLength: 1024 + required: + - name + - version + environment: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + framework: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID holds a unique identifier for the running service. + type: + - 'null' + - string + language: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used programming language + type: string + maxLength: 1024 + version: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + required: + - name + name: + description: Name of the monitored service. + type: string + maxLength: 1024 + minLength: 1 + pattern: ^[a-zA-Z0-9 _-]+$ + node: + description: Node must be a unique meaningful name of the service node. + type: + - 'null' + - object + properties: + configured_name: + description: Name of the service node + type: + - 'null' + - string + maxLength: 1024 + runtime: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + name: + description: Name of the language runtime + type: string + maxLength: 1024 + version: + description: Name of the language runtime + type: string + maxLength: 1024 + required: + - name + - version + version: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + required: + - agent + - name + system: + description: System metadata + type: + - 'null' + - object + properties: + architecture: + description: Architecture of the system the monitored service is running on. + type: + - 'null' + - string + maxLength: 1024 + configured_hostname: + description: ConfiguredHostname is the configured name of the host the monitored service is running on. It should only be sent when configured by the user. If given, it is used as the event's hostname. + type: + - 'null' + - string + maxLength: 1024 + container: + description: Container holds the system's container ID if available. + type: + - 'null' + - object + properties: + id: + description: ID of the container the monitored service is running in. + type: + - 'null' + - string + maxLength: 1024 + detected_hostname: + description: DetectedHostname is the hostname detected by the APM agent. It usually contains what the hostname command returns on the host machine. It will be used as the event's hostname if ConfiguredHostname is not present. + type: + - 'null' + - string + maxLength: 1024 + host_id: + description: The OpenTelemetry semantic conventions compliant "host.id" attribute, if available. + type: + - 'null' + - string + maxLength: 1024 + hostname: + description: 'Deprecated: Use ConfiguredHostname and DetectedHostname instead. DeprecatedHostname is the host name of the system the service is running on. It does not distinguish between configured and detected hostname and therefore is deprecated and only used if no other hostname information is available.' + type: + - 'null' + - string + maxLength: 1024 + kubernetes: + description: Kubernetes system information if the monitored service runs on Kubernetes. + type: + - 'null' + - object + properties: + namespace: + description: Namespace of the Kubernetes resource the monitored service is run on. + type: + - 'null' + - string + maxLength: 1024 + node: + description: Node related information + type: + - 'null' + - object + properties: + name: + description: Name of the Kubernetes Node + type: + - 'null' + - string + maxLength: 1024 + pod: + description: Pod related information + type: + - 'null' + - object + properties: + name: + description: Name of the Kubernetes Pod + type: + - 'null' + - string + maxLength: 1024 + uid: + description: UID is the system-generated string uniquely identifying the Pod. + type: + - 'null' + - string + maxLength: 1024 + platform: + description: Platform name of the system platform the monitored service is running on. + type: + - 'null' + - string + maxLength: 1024 + user: + description: User metadata, which can be overwritten on a per event basis. + type: + - 'null' + - object + properties: + domain: + description: Domain of the logged in user + type: + - 'null' + - string + maxLength: 1024 + email: + description: Email of the user. + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID identifies the logged in user, e.g. can be the primary key of the user + type: + - 'null' + - string + - integer + maxLength: 1024 + username: + description: Name of the user. + type: + - 'null' + - string + maxLength: 1024 + required: + - service + metricset: + $id: docs/spec/v2/metricset + type: object + properties: + faas: + description: FAAS holds fields related to Function as a Service events. + type: + - 'null' + - object + properties: + coldstart: + description: Indicates whether a function invocation was a cold start or not. + type: + - 'null' + - boolean + execution: + description: The request id of the function invocation. + type: + - 'null' + - string + id: + description: A unique identifier of the invoked serverless function. + type: + - 'null' + - string + name: + description: The lambda function name. + type: + - 'null' + - string + trigger: + description: Trigger attributes. + type: + - 'null' + - object + properties: + request_id: + description: The id of the origin trigger request. + type: + - 'null' + - string + type: + description: The trigger type. + type: + - 'null' + - string + version: + description: The lambda function version. + type: + - 'null' + - string + samples: + description: Samples hold application metrics collected from the agent. + type: object + additionalProperties: false + patternProperties: + ^[^*"]*$: + type: + - 'null' + - object + properties: + counts: + description: Counts holds the bucket counts for histogram metrics. These numbers must be positive or zero. If Counts is specified, then Values is expected to be specified with the same number of elements, and with the same order. + type: + - 'null' + - array + items: + type: integer + minimum: 0 + minItems: 0 + type: + description: 'Type holds an optional metric type: gauge, counter, or histogram. If Type is unknown, it will be ignored.' + type: + - 'null' + - string + unit: + description: 'Unit holds an optional unit for the metric. - "percent" (value is in the range [0,1]) - "byte" - a time unit: "nanos", "micros", "ms", "s", "m", "h", "d" If Unit is unknown, it will be ignored.' + type: + - 'null' + - string + value: + description: Value holds the value of a single metric sample. + type: + - 'null' + - number + values: + description: Values holds the bucket values for histogram metrics. Values must be provided in ascending order; failure to do so will result in the metric being discarded. + type: + - 'null' + - array + items: + type: number + minItems: 0 + allOf: + - if: + properties: + counts: + type: array + required: + - counts + then: + properties: + values: + type: array + required: + - values + - if: + properties: + values: + type: array + required: + - values + then: + properties: + counts: + type: array + required: + - counts + anyOf: + - properties: + value: + type: number + required: + - value + - properties: + values: + type: array + required: + - values + service: + description: Service holds selected information about the correlated service. + type: + - 'null' + - object + properties: + name: + description: Name of the correlated service. + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the correlated service. + type: + - 'null' + - string + maxLength: 1024 + span: + description: Span holds selected information about the correlated transaction. + type: + - 'null' + - object + properties: + subtype: + description: Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch) + type: + - 'null' + - string + maxLength: 1024 + type: + description: 'Type expresses the correlated span''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: + - 'null' + - string + maxLength: 1024 + tags: + description: Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + timestamp: + description: Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch + type: + - 'null' + - integer + transaction: + description: Transaction holds selected information about the correlated transaction. + type: + - 'null' + - object + properties: + name: + description: Name of the correlated transaction. + type: + - 'null' + - string + maxLength: 1024 + type: + description: 'Type expresses the correlated transaction''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: + - 'null' + - string + maxLength: 1024 + required: + - samples + span: + $id: docs/spec/v2/span + type: object + properties: + action: + description: Action holds the specific kind of event within the sub-type represented by the span (e.g. query, connect) + type: + - 'null' + - string + maxLength: 1024 + child_ids: + description: ChildIDs holds a list of successor transactions and/or spans. + type: + - 'null' + - array + items: + type: string + maxLength: 1024 + minItems: 0 + composite: + description: Composite holds details on a group of spans represented by a single one. + type: + - 'null' + - object + properties: + compression_strategy: + description: A string value indicating which compression strategy was used. The valid values are `exact_match` and `same_kind`. + type: string + count: + description: Count is the number of compressed spans the composite span represents. The minimum count is 2, as a composite span represents at least two spans. + type: integer + minimum: 2 + sum: + description: Sum is the durations of all compressed spans this composite span represents in milliseconds. + type: number + minimum: 0 + required: + - compression_strategy + - count + - sum + context: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + db: + description: Database contains contextual data for database spans + type: + - 'null' + - object + properties: + instance: + description: Instance name of the database. + type: + - 'null' + - string + link: + description: Link to the database server. + type: + - 'null' + - string + maxLength: 1024 + rows_affected: + description: RowsAffected shows the number of rows affected by the statement. + type: + - 'null' + - integer + statement: + description: Statement of the recorded database event, e.g. query. + type: + - 'null' + - string + type: + description: Type of the recorded database event., e.g. sql, cassandra, hbase, redis. + type: + - 'null' + - string + user: + description: User is the username with which the database is accessed. + type: + - 'null' + - string + destination: + description: Destination contains contextual data about the destination of spans + type: + - 'null' + - object + properties: + address: + description: 'Address is the destination network address: hostname (e.g. ''localhost''), FQDN (e.g. ''elastic.co''), IPv4 (e.g. ''127.0.0.1'') IPv6 (e.g. ''::1'')' + type: + - 'null' + - string + maxLength: 1024 + port: + description: Port is the destination network port (e.g. 443) + type: + - 'null' + - integer + service: + description: Service describes the destination service + type: + - 'null' + - object + properties: + name: + description: 'Name is the identifier for the destination service, e.g. ''http://elastic.co'', ''elasticsearch'', ''rabbitmq'' ( DEPRECATED: this field will be removed in a future release' + type: + - 'null' + - string + maxLength: 1024 + resource: + description: 'Resource identifies the destination service resource being operated on e.g. ''http://elastic.co:80'', ''elasticsearch'', ''rabbitmq/queue_name'' DEPRECATED: this field will be removed in a future release' + type: string + maxLength: 1024 + type: + description: 'Type of the destination service, e.g. db, elasticsearch. Should typically be the same as span.type. DEPRECATED: this field will be removed in a future release' + type: + - 'null' + - string + maxLength: 1024 + required: + - resource + http: + description: HTTP contains contextual information when the span concerns an HTTP request. + type: + - 'null' + - object + properties: + method: + description: Method holds information about the method of the HTTP request. + type: + - 'null' + - string + maxLength: 1024 + request: + description: Request describes the HTTP request information. + type: + - 'null' + - object + properties: + id: + description: ID holds the unique identifier for the http request. + type: + - 'null' + - string + response: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + decoded_body_size: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + encoded_body_size: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + headers: + description: Headers holds the http headers sent in the http response. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + status_code: + description: StatusCode sent in the http response. + type: + - 'null' + - integer + transfer_size: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + status_code: + description: 'Deprecated: Use Response.StatusCode instead. StatusCode sent in the http response.' + type: + - 'null' + - integer + url: + description: URL is the raw url of the correlating HTTP request. + type: + - 'null' + - string + message: + description: Message holds details related to message receiving and publishing if the captured event integrates with a messaging system + type: + - 'null' + - object + properties: + age: + description: Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field. + type: + - 'null' + - object + properties: + ms: + description: Age of the message in milliseconds. + type: + - 'null' + - integer + body: + description: Body of the received message, similar to an HTTP request body + type: + - 'null' + - string + headers: + description: Headers received with the message, similar to HTTP request headers. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + queue: + description: Queue holds information about the message queue where the message is received. + type: + - 'null' + - object + properties: + name: + description: Name holds the name of the message queue where the message is received. + type: + - 'null' + - string + maxLength: 1024 + routing_key: + description: RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ. + type: + - 'null' + - string + service: + description: Service related information can be sent per span. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + agent: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + ephemeral_id: + description: EphemeralID is a free format ID used for metrics correlation by agents + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + environment: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + framework: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID holds a unique identifier for the service. + type: + - 'null' + - string + language: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used programming language + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + node: + description: Node must be a unique meaningful name of the service node. + type: + - 'null' + - object + properties: + configured_name: + description: Name of the service node + type: + - 'null' + - string + maxLength: 1024 + origin: + description: Origin contains the self-nested field groups for service. + type: + - 'null' + - object + properties: + id: + description: Immutable id of the service emitting this event. + type: + - 'null' + - string + name: + description: Immutable name of the service emitting this event. + type: + - 'null' + - string + version: + description: The version of the service the data was collected from. + type: + - 'null' + - string + runtime: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + name: + description: Name of the language runtime + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the language runtime + type: + - 'null' + - string + maxLength: 1024 + target: + description: Target holds information about the outgoing service in case of an outgoing event + type: + - 'null' + - object + properties: + name: + description: Immutable name of the target service for the event + type: + - 'null' + - string + type: + description: Immutable type of the target service for the event + type: + - 'null' + - string + anyOf: + - properties: + type: + type: string + required: + - type + - properties: + name: + type: string + required: + - name + version: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + tags: + description: Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + duration: + description: Duration of the span in milliseconds. When the span is a composite one, duration is the gross duration, including "whitespace" in between spans. + type: number + minimum: 0 + id: + description: ID holds the hex encoded 64 random bits ID of the event. + type: string + maxLength: 1024 + links: + description: Links holds links to other spans, potentially in other traces. + type: + - 'null' + - array + items: + type: object + properties: + span_id: + description: SpanID holds the ID of the linked span. + type: string + maxLength: 1024 + trace_id: + description: TraceID holds the ID of the linked span's trace. + type: string + maxLength: 1024 + required: + - span_id + - trace_id + minItems: 0 + name: + description: Name is the generic designation of a span in the scope of a transaction. + type: string + maxLength: 1024 + otel: + description: OTel contains unmapped OpenTelemetry attributes. + type: + - 'null' + - object + properties: + attributes: + description: Attributes hold the unmapped OpenTelemetry attributes. + type: + - 'null' + - object + span_kind: + description: SpanKind holds the incoming OpenTelemetry span kind. + type: + - 'null' + - string + outcome: + description: 'Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.' + type: + - 'null' + - string + enum: + - success + - failure + - unknown + - null + parent_id: + description: ParentID holds the hex encoded 64 random bits ID of the parent transaction or span. + type: string + maxLength: 1024 + sample_rate: + description: SampleRate applied to the monitored service at the time where this span was recorded. + type: + - 'null' + - number + stacktrace: + description: Stacktrace connected to this span event. + type: + - 'null' + - array + items: + type: object + properties: + abs_path: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + classname: + description: Classname of the frame. + type: + - 'null' + - string + colno: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + context_line: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + filename: + description: Filename is the relative name of the frame's file. + type: + - 'null' + - string + function: + description: Function represented by the frame. + type: + - 'null' + - string + library_frame: + description: LibraryFrame indicates whether the frame is from a third party library. + type: + - 'null' + - boolean + lineno: + description: LineNumber of the frame. + type: + - 'null' + - integer + module: + description: Module to which the frame belongs to. + type: + - 'null' + - string + post_context: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + pre_context: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + vars: + description: Vars is a flat mapping of local variables of the frame. + type: + - 'null' + - object + anyOf: + - properties: + classname: + type: string + required: + - classname + - properties: + filename: + type: string + required: + - filename + minItems: 0 + start: + description: Start is the offset relative to the transaction's timestamp identifying the start of the span, in milliseconds. + type: + - 'null' + - number + subtype: + description: Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch) + type: + - 'null' + - string + maxLength: 1024 + sync: + description: Sync indicates whether the span was executed synchronously or asynchronously. + type: + - 'null' + - boolean + timestamp: + description: Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch + type: + - 'null' + - integer + trace_id: + description: TraceID holds the hex encoded 128 random bits ID of the correlated trace. + type: string + maxLength: 1024 + transaction_id: + description: TransactionID holds the hex encoded 64 random bits ID of the correlated transaction. + type: + - 'null' + - string + maxLength: 1024 + type: + description: 'Type holds the span''s type, and can have specific keywords within the service''s domain (eg: ''request'', ''backgroundjob'', etc)' + type: string + maxLength: 1024 + required: + - id + - trace_id + - name + - parent_id + - type + - duration + anyOf: + - properties: + start: + type: number + required: + - start + - properties: + timestamp: + type: integer + required: + - timestamp + transaction: + $id: docs/spec/v2/transaction + type: object + properties: + context: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + cloud: + description: Cloud holds fields related to the cloud or infrastructure the events are coming from. + type: + - 'null' + - object + properties: + origin: + description: Origin contains the self-nested field groups for cloud. + type: + - 'null' + - object + properties: + account: + description: The cloud account or organization id used to identify different entities in a multi-tenant environment. + type: + - 'null' + - object + properties: + id: + description: The cloud account or organization id used to identify different entities in a multi-tenant environment. + type: + - 'null' + - string + provider: + description: Name of the cloud provider. + type: + - 'null' + - string + region: + description: Region in which this host, resource, or service is located. + type: + - 'null' + - string + service: + description: The cloud service name is intended to distinguish services running on different platforms within a provider. + type: + - 'null' + - object + properties: + name: + description: The cloud service name is intended to distinguish services running on different platforms within a provider. + type: + - 'null' + - string + custom: + description: Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch. + type: + - 'null' + - object + message: + description: Message holds details related to message receiving and publishing if the captured event integrates with a messaging system + type: + - 'null' + - object + properties: + age: + description: Age of the message. If the monitored messaging framework provides a timestamp for the message, agents may use it. Otherwise, the sending agent can add a timestamp in milliseconds since the Unix epoch to the message's metadata to be retrieved by the receiving agent. If a timestamp is not available, agents should omit this field. + type: + - 'null' + - object + properties: + ms: + description: Age of the message in milliseconds. + type: + - 'null' + - integer + body: + description: Body of the received message, similar to an HTTP request body + type: + - 'null' + - string + headers: + description: Headers received with the message, similar to HTTP request headers. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + queue: + description: Queue holds information about the message queue where the message is received. + type: + - 'null' + - object + properties: + name: + description: Name holds the name of the message queue where the message is received. + type: + - 'null' + - string + maxLength: 1024 + routing_key: + description: RoutingKey holds the optional routing key of the received message as set on the queuing system, such as in RabbitMQ. + type: + - 'null' + - string + page: + description: Page holds information related to the current page and page referers. It is only sent from RUM agents. + type: + - 'null' + - object + properties: + referer: + description: Referer holds the URL of the page that 'linked' to the current page. + type: + - 'null' + - string + url: + description: URL of the current page + type: + - 'null' + - string + request: + description: Request describes the HTTP request information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + body: + description: Body only contais the request bod, not the query string information. It can either be a dictionary (for standard HTTP requests) or a raw request body. + type: + - 'null' + - string + - object + cookies: + description: Cookies used by the request, parsed as key-value objects. + type: + - 'null' + - object + env: + description: Env holds environment variable information passed to the monitored service. + type: + - 'null' + - object + headers: + description: Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + http_version: + description: HTTPVersion holds information about the used HTTP version. + type: + - 'null' + - string + maxLength: 1024 + method: + description: Method holds information about the method of the HTTP request. + type: string + maxLength: 1024 + socket: + description: Socket holds information related to the recorded request, such as whether or not data were encrypted and the remote address. + type: + - 'null' + - object + properties: + encrypted: + description: 'Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.' + type: + - 'null' + - boolean + remote_address: + description: RemoteAddress holds the network address sending the request. It should be obtained through standard APIs and not be parsed from any headers like 'Forwarded'. + type: + - 'null' + - string + url: + description: URL holds information sucha as the raw URL, scheme, host and path. + type: + - 'null' + - object + properties: + full: + description: Full, possibly agent-assembled URL of the request, e.g. https://example.com:443/search?q=elasticsearch#top. + type: + - 'null' + - string + maxLength: 1024 + hash: + description: Hash of the request URL, e.g. 'top' + type: + - 'null' + - string + maxLength: 1024 + hostname: + description: Hostname information of the request, e.g. 'example.com'." + type: + - 'null' + - string + maxLength: 1024 + pathname: + description: Path of the request, e.g. '/search' + type: + - 'null' + - string + maxLength: 1024 + port: + description: Port of the request, e.g. '443'. Can be sent as string or int. + type: + - 'null' + - string + - integer + maxLength: 1024 + protocol: + description: Protocol information for the recorded request, e.g. 'https:'. + type: + - 'null' + - string + maxLength: 1024 + raw: + description: Raw unparsed URL of the HTTP request line, e.g https://example.com:443/search?q=elasticsearch. This URL may be absolute or relative. For more details, see https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2. + type: + - 'null' + - string + maxLength: 1024 + search: + description: Search contains the query string information of the request. It is expected to have values delimited by ampersands. + type: + - 'null' + - string + maxLength: 1024 + required: + - method + response: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + decoded_body_size: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + encoded_body_size: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + finished: + description: Finished indicates whether the response was finished or not. + type: + - 'null' + - boolean + headers: + description: Headers holds the http headers sent in the http response. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + headers_sent: + description: HeadersSent indicates whether http headers were sent. + type: + - 'null' + - boolean + status_code: + description: StatusCode sent in the http response. + type: + - 'null' + - integer + transfer_size: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + service: + description: Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + agent: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + ephemeral_id: + description: EphemeralID is a free format ID used for metrics correlation by agents + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + environment: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + framework: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID holds a unique identifier for the service. + type: + - 'null' + - string + language: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + name: + description: Name of the used programming language + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + name: + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + node: + description: Node must be a unique meaningful name of the service node. + type: + - 'null' + - object + properties: + configured_name: + description: Name of the service node + type: + - 'null' + - string + maxLength: 1024 + origin: + description: Origin contains the self-nested field groups for service. + type: + - 'null' + - object + properties: + id: + description: Immutable id of the service emitting this event. + type: + - 'null' + - string + name: + description: Immutable name of the service emitting this event. + type: + - 'null' + - string + version: + description: The version of the service the data was collected from. + type: + - 'null' + - string + runtime: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + name: + description: Name of the language runtime + type: + - 'null' + - string + maxLength: 1024 + version: + description: Version of the language runtime + type: + - 'null' + - string + maxLength: 1024 + target: + description: Target holds information about the outgoing service in case of an outgoing event + type: + - 'null' + - object + properties: + name: + description: Immutable name of the target service for the event + type: + - 'null' + - string + type: + description: Immutable type of the target service for the event + type: + - 'null' + - string + anyOf: + - properties: + type: + type: string + required: + - type + - properties: + name: + type: string + required: + - name + version: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + tags: + description: Tags are a flat mapping of user-defined tags. On the agent side, tags are called labels. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + user: + description: User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event. + type: + - 'null' + - object + properties: + domain: + description: Domain of the logged in user + type: + - 'null' + - string + maxLength: 1024 + email: + description: Email of the user. + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID identifies the logged in user, e.g. can be the primary key of the user + type: + - 'null' + - string + - integer + maxLength: 1024 + username: + description: Name of the user. + type: + - 'null' + - string + maxLength: 1024 + dropped_spans_stats: + description: DroppedSpanStats holds information about spans that were dropped (for example due to transaction_max_spans or exit_span_min_duration). + type: + - 'null' + - array + items: + type: object + properties: + destination_service_resource: + description: DestinationServiceResource identifies the destination service resource being operated on. e.g. 'http://elastic.co:80', 'elasticsearch', 'rabbitmq/queue_name'. + type: + - 'null' + - string + maxLength: 1024 + duration: + description: Duration holds duration aggregations about the dropped span. + type: + - 'null' + - object + properties: + count: + description: Count holds the number of times the dropped span happened. + type: + - 'null' + - integer + minimum: 1 + sum: + description: Sum holds dimensions about the dropped span's duration. + type: + - 'null' + - object + properties: + us: + description: Us represents the summation of the span duration. + type: + - 'null' + - integer + minimum: 0 + outcome: + description: 'Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.' + type: + - 'null' + - string + enum: + - success + - failure + - unknown + - null + service_target_name: + description: ServiceTargetName identifies the instance name of the target service being operated on + type: + - 'null' + - string + maxLength: 512 + service_target_type: + description: ServiceTargetType identifies the type of the target service being operated on e.g. 'oracle', 'rabbitmq' + type: + - 'null' + - string + maxLength: 512 + minItems: 0 + duration: + description: Duration how long the transaction took to complete, in milliseconds with 3 decimal points. + type: number + minimum: 0 + experience: + description: UserExperience holds metrics for measuring real user experience. This information is only sent by RUM agents. + type: + - 'null' + - object + properties: + cls: + description: CumulativeLayoutShift holds the Cumulative Layout Shift (CLS) metric value, or a negative value if CLS is unknown. See https://web.dev/cls/ + type: + - 'null' + - number + minimum: 0 + fid: + description: FirstInputDelay holds the First Input Delay (FID) metric value, or a negative value if FID is unknown. See https://web.dev/fid/ + type: + - 'null' + - number + minimum: 0 + longtask: + description: Longtask holds longtask duration/count metrics. + type: + - 'null' + - object + properties: + count: + description: Count is the total number of of longtasks. + type: integer + minimum: 0 + max: + description: Max longtask duration + type: number + minimum: 0 + sum: + description: Sum of longtask durations + type: number + minimum: 0 + required: + - count + - max + - sum + tbt: + description: TotalBlockingTime holds the Total Blocking Time (TBT) metric value, or a negative value if TBT is unknown. See https://web.dev/tbt/ + type: + - 'null' + - number + minimum: 0 + faas: + description: FAAS holds fields related to Function as a Service events. + type: + - 'null' + - object + properties: + coldstart: + description: Indicates whether a function invocation was a cold start or not. + type: + - 'null' + - boolean + execution: + description: The request id of the function invocation. + type: + - 'null' + - string + id: + description: A unique identifier of the invoked serverless function. + type: + - 'null' + - string + name: + description: The lambda function name. + type: + - 'null' + - string + trigger: + description: Trigger attributes. + type: + - 'null' + - object + properties: + request_id: + description: The id of the origin trigger request. + type: + - 'null' + - string + type: + description: The trigger type. + type: + - 'null' + - string + version: + description: The lambda function version. + type: + - 'null' + - string + id: + description: ID holds the hex encoded 64 random bits ID of the event. + type: string + maxLength: 1024 + links: + description: Links holds links to other spans, potentially in other traces. + type: + - 'null' + - array + items: + type: object + properties: + span_id: + description: SpanID holds the ID of the linked span. + type: string + maxLength: 1024 + trace_id: + description: TraceID holds the ID of the linked span's trace. + type: string + maxLength: 1024 + required: + - span_id + - trace_id + minItems: 0 + marks: + description: Marks capture the timing of a significant event during the lifetime of a transaction. Marks are organized into groups and can be set by the user or the agent. Marks are only reported by RUM agents. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - number + name: + description: 'Name is the generic designation of a transaction in the scope of a single service, eg: ''GET /users/:id''.' + type: + - 'null' + - string + maxLength: 1024 + otel: + description: OTel contains unmapped OpenTelemetry attributes. + type: + - 'null' + - object + properties: + attributes: + description: Attributes hold the unmapped OpenTelemetry attributes. + type: + - 'null' + - object + span_kind: + description: SpanKind holds the incoming OpenTelemetry span kind. + type: + - 'null' + - string + outcome: + description: 'Outcome of the transaction with a limited set of permitted values, describing the success or failure of the transaction from the service''s perspective. It is used for calculating error rates for incoming requests. Permitted values: success, failure, unknown.' + type: + - 'null' + - string + enum: + - success + - failure + - unknown + - null + parent_id: + description: ParentID holds the hex encoded 64 random bits ID of the parent transaction or span. + type: + - 'null' + - string + maxLength: 1024 + result: + description: Result of the transaction. For HTTP-related transactions, this should be the status code formatted like 'HTTP 2xx'. + type: + - 'null' + - string + maxLength: 1024 + sample_rate: + description: SampleRate applied to the monitored service at the time where this transaction was recorded. Allowed values are [0..1]. A SampleRate <1 indicates that not all spans are recorded. + type: + - 'null' + - number + sampled: + description: Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported. + type: + - 'null' + - boolean + session: + description: Session holds optional transaction session information for RUM. + type: + - 'null' + - object + properties: + id: + description: ID holds a session ID for grouping a set of related transactions. + type: string + maxLength: 1024 + sequence: + description: Sequence holds an optional sequence number for a transaction within a session. It is not meaningful to compare sequences across two different sessions. + type: + - 'null' + - integer + minimum: 1 + required: + - id + span_count: + description: SpanCount counts correlated spans. + type: object + properties: + dropped: + description: Dropped is the number of correlated spans that have been dropped by the APM agent recording the transaction. + type: + - 'null' + - integer + started: + description: Started is the number of correlated spans that are recorded. + type: integer + required: + - started + timestamp: + description: Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch + type: + - 'null' + - integer + trace_id: + description: TraceID holds the hex encoded 128 random bits ID of the correlated trace. + type: string + maxLength: 1024 + type: + description: 'Type expresses the transaction''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: string + maxLength: 1024 + required: + - trace_id + - id + - type + - span_count + - duration + error-2: + $id: docs/spec/rumv3/error + type: object + properties: + c: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + cu: + description: Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch. + type: + - 'null' + - object + g: + description: Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + p: + description: Page holds information related to the current page and page referers. It is only sent from RUM agents. + type: + - 'null' + - object + properties: + rf: + description: Referer holds the URL of the page that 'linked' to the current page. + type: + - 'null' + - string + url: + description: URL of the current page + type: + - 'null' + - string + q: + description: Request describes the HTTP request information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + en: + description: Env holds environment variable information passed to the monitored service. + type: + - 'null' + - object + he: + description: Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + hve: + description: HTTPVersion holds information about the used HTTP version. + type: + - 'null' + - string + maxLength: 1024 + mt: + description: Method holds information about the method of the HTTP request. + type: string + maxLength: 1024 + required: + - mt + r: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + dbs: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + ebs: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + he: + description: Headers holds the http headers sent in the http response. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + sc: + description: StatusCode sent in the http response. + type: + - 'null' + - integer + ts: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + se: + description: Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + a: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + 'n': + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + en: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + fw: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + 'n': + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + la: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + 'n': + description: Name of the used programming language + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + 'n': + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + ru: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + 'n': + description: Name of the language runtime + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the language runtime + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + u: + description: User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event. + type: + - 'null' + - object + properties: + em: + description: Email of the user. + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID identifies the logged in user, e.g. can be the primary key of the user + type: + - 'null' + - string + - integer + maxLength: 1024 + ud: + description: Domain of the user + type: + - 'null' + - string + maxLength: 1024 + un: + description: Name of the user. + type: + - 'null' + - string + maxLength: 1024 + cl: + description: Culprit identifies the function call which was the primary perpetrator of this event. + type: + - 'null' + - string + maxLength: 1024 + ex: + description: Exception holds information about the original error. The information is language specific. + type: + - 'null' + - object + properties: + at: + description: Attributes of the exception. + type: + - 'null' + - object + ca: + description: Cause can hold a collection of error exceptions representing chained exceptions. The chain starts with the outermost exception, followed by its cause, and so on. + type: + - 'null' + - array + items: + type: object + minItems: 0 + cd: + description: Code that is set when the error happened, e.g. database error code. + type: + - 'null' + - string + - integer + maxLength: 1024 + hd: + description: Handled indicates whether the error was caught in the code or not. + type: + - 'null' + - boolean + mg: + description: Message contains the originally captured error message. + type: + - 'null' + - string + mo: + description: Module describes the exception type's module namespace. + type: + - 'null' + - string + maxLength: 1024 + st: + description: Stacktrace information of the captured exception. + type: + - 'null' + - array + items: + type: object + properties: + ap: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + cli: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + cn: + description: Classname of the frame. + type: + - 'null' + - string + co: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + f: + description: Filename is the relative name of the frame's file. + type: string + fn: + description: Function represented by the frame. + type: + - 'null' + - string + li: + description: LineNumber of the frame. + type: + - 'null' + - integer + mo: + description: Module to which the frame belongs to. + type: + - 'null' + - string + poc: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + prc: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + required: + - f + minItems: 0 + t: + description: Type of the exception. + type: + - 'null' + - string + maxLength: 1024 + anyOf: + - properties: + mg: + type: string + required: + - mg + - properties: + t: + type: string + required: + - t + id: + description: ID holds the hex encoded 128 random bits ID of the event. + type: string + maxLength: 1024 + log: + description: Log holds additional information added when the error is logged. + type: + - 'null' + - object + properties: + ln: + description: LoggerName holds the name of the used logger instance. + type: + - 'null' + - string + maxLength: 1024 + lv: + description: Level represents the severity of the recorded log. + type: + - 'null' + - string + maxLength: 1024 + mg: + description: Message of the logged error. In case a parameterized message is captured, Message should contain the same information, but with any placeholders being replaced. + type: string + pmg: + description: ParamMessage should contain the same information as Message, but with placeholders where parameters were logged, e.g. 'error connecting to %s'. The string is not interpreted, allowing differnt placeholders per client languange. The information might be used to group errors together. + type: + - 'null' + - string + maxLength: 1024 + st: + description: Stacktrace information of the captured error. + type: + - 'null' + - array + items: + type: object + properties: + ap: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + cli: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + cn: + description: Classname of the frame. + type: + - 'null' + - string + co: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + f: + description: Filename is the relative name of the frame's file. + type: string + fn: + description: Function represented by the frame. + type: + - 'null' + - string + li: + description: LineNumber of the frame. + type: + - 'null' + - integer + mo: + description: Module to which the frame belongs to. + type: + - 'null' + - string + poc: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + prc: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + required: + - f + minItems: 0 + required: + - mg + pid: + description: ParentID holds the hex encoded 64 random bits ID of the parent transaction or span. + type: + - 'null' + - string + maxLength: 1024 + tid: + description: TraceID holds the hex encoded 128 random bits ID of the correlated trace. + type: + - 'null' + - string + maxLength: 1024 + timestamp: + description: Timestamp holds the recorded time of the event, UTC based and formatted as microseconds since Unix epoch. + type: + - 'null' + - integer + x: + description: Transaction holds information about the correlated transaction. + type: + - 'null' + - object + properties: + 'n': + description: 'Name is the generic designation of a transaction in the scope of a single service, eg: ''GET /users/:id''.' + type: + - 'null' + - string + maxLength: 1024 + sm: + description: Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported. + type: + - 'null' + - boolean + t: + description: 'Type expresses the correlated transaction''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: + - 'null' + - string + maxLength: 1024 + xid: + description: TransactionID holds the hex encoded 64 random bits ID of the correlated transaction. + type: + - 'null' + - string + maxLength: 1024 + required: + - id + allOf: + - if: + properties: + xid: + type: string + required: + - xid + then: + properties: + pid: + type: string + required: + - pid + - if: + properties: + tid: + type: string + required: + - tid + then: + properties: + pid: + type: string + required: + - pid + - if: + properties: + xid: + type: string + required: + - xid + then: + properties: + tid: + type: string + required: + - tid + - if: + properties: + pid: + type: string + required: + - pid + then: + properties: + tid: + type: string + required: + - tid + anyOf: + - properties: + ex: + type: object + required: + - ex + - properties: + log: + type: object + required: + - log + metadata-2: + $id: docs/spec/rumv3/metadata + type: object + properties: + l: + description: Labels are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Labels are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + 'n': + description: Network holds information about the network over which the monitored service is communicating. + type: + - 'null' + - object + properties: + c: + type: + - 'null' + - object + properties: + t: + type: + - 'null' + - string + maxLength: 1024 + se: + description: Service metadata about the monitored service. + type: object + properties: + a: + description: Agent holds information about the APM agent capturing the event. + type: object + properties: + 'n': + description: Name of the APM agent capturing information. + type: string + maxLength: 1024 + minLength: 1 + ve: + description: Version of the APM agent capturing information. + type: string + maxLength: 1024 + required: + - 'n' + - ve + en: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + fw: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + 'n': + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + la: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + 'n': + description: Name of the used programming language + type: string + maxLength: 1024 + ve: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + required: + - 'n' + 'n': + description: Name of the monitored service. + type: string + maxLength: 1024 + minLength: 1 + pattern: ^[a-zA-Z0-9 _-]+$ + ru: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + 'n': + description: Name of the language runtime + type: string + maxLength: 1024 + ve: + description: Name of the language runtime + type: string + maxLength: 1024 + required: + - 'n' + - ve + ve: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + required: + - a + - 'n' + u: + description: User metadata, which can be overwritten on a per event basis. + type: + - 'null' + - object + properties: + em: + description: Email of the user. + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID identifies the logged in user, e.g. can be the primary key of the user + type: + - 'null' + - string + - integer + maxLength: 1024 + ud: + description: Domain of the user + type: + - 'null' + - string + maxLength: 1024 + un: + description: Name of the user. + type: + - 'null' + - string + maxLength: 1024 + required: + - se + span-2: + $id: docs/spec/rumv3/span + type: object + properties: + ac: + description: Action holds the specific kind of event within the sub-type represented by the span (e.g. query, connect) + type: + - 'null' + - string + maxLength: 1024 + c: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + dt: + description: Destination contains contextual data about the destination of spans + type: + - 'null' + - object + properties: + ad: + description: 'Address is the destination network address: hostname (e.g. ''localhost''), FQDN (e.g. ''elastic.co''), IPv4 (e.g. ''127.0.0.1'') IPv6 (e.g. ''::1'')' + type: + - 'null' + - string + maxLength: 1024 + po: + description: Port is the destination network port (e.g. 443) + type: + - 'null' + - integer + se: + description: Service describes the destination service + type: + - 'null' + - object + properties: + 'n': + description: 'Name is the identifier for the destination service, e.g. ''http://elastic.co'', ''elasticsearch'', ''rabbitmq'' DEPRECATED: this field will be removed in a future release' + type: + - 'null' + - string + maxLength: 1024 + rc: + description: 'Resource identifies the destination service resource being operated on e.g. ''http://elastic.co:80'', ''elasticsearch'', ''rabbitmq/queue_name'' DEPRECATED: this field will be removed in a future release' + type: string + maxLength: 1024 + t: + description: 'Type of the destination service, e.g. db, elasticsearch. Should typically be the same as span.type. DEPRECATED: this field will be removed in a future release' + type: + - 'null' + - string + maxLength: 1024 + required: + - rc + g: + description: Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + h: + description: HTTP contains contextual information when the span concerns an HTTP request. + type: + - 'null' + - object + properties: + mt: + description: Method holds information about the method of the HTTP request. + type: + - 'null' + - string + maxLength: 1024 + r: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + dbs: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + ebs: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + ts: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + sc: + description: 'Deprecated: Use Response.StatusCode instead. StatusCode sent in the http response.' + type: + - 'null' + - integer + url: + description: URL is the raw url of the correlating HTTP request. + type: + - 'null' + - string + se: + description: Service related information can be sent per span. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + a: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + 'n': + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + 'n': + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + d: + description: Duration of the span in milliseconds + type: number + minimum: 0 + id: + description: ID holds the hex encoded 64 random bits ID of the event. + type: string + maxLength: 1024 + 'n': + description: Name is the generic designation of a span in the scope of a transaction. + type: string + maxLength: 1024 + o: + description: 'Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.' + type: + - 'null' + - string + enum: + - success + - failure + - unknown + - null + pi: + description: ParentIndex is the index of the parent span in the list. Absent when the parent is a transaction. + type: + - 'null' + - integer + s: + description: Start is the offset relative to the transaction's timestamp identifying the start of the span, in milliseconds. + type: number + sr: + description: SampleRate applied to the monitored service at the time where this span was recorded. + type: + - 'null' + - number + st: + description: Stacktrace connected to this span event. + type: + - 'null' + - array + items: + type: object + properties: + ap: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + cli: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + cn: + description: Classname of the frame. + type: + - 'null' + - string + co: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + f: + description: Filename is the relative name of the frame's file. + type: string + fn: + description: Function represented by the frame. + type: + - 'null' + - string + li: + description: LineNumber of the frame. + type: + - 'null' + - integer + mo: + description: Module to which the frame belongs to. + type: + - 'null' + - string + poc: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + prc: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + required: + - f + minItems: 0 + su: + description: Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch) + type: + - 'null' + - string + maxLength: 1024 + sy: + description: Sync indicates whether the span was executed synchronously or asynchronously. + type: + - 'null' + - boolean + t: + description: 'Type holds the span''s type, and can have specific keywords within the service''s domain (eg: ''request'', ''backgroundjob'', etc)' + type: string + maxLength: 1024 + required: + - 'n' + - t + - id + - s + - d + transaction-2: + $id: docs/spec/rumv3/transaction + type: object + properties: + c: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + cu: + description: Custom can contain additional metadata to be stored with the event. The format is unspecified and can be deeply nested objects. The information will not be indexed or searchable in Elasticsearch. + type: + - 'null' + - object + g: + description: Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + p: + description: Page holds information related to the current page and page referers. It is only sent from RUM agents. + type: + - 'null' + - object + properties: + rf: + description: Referer holds the URL of the page that 'linked' to the current page. + type: + - 'null' + - string + url: + description: URL of the current page + type: + - 'null' + - string + q: + description: Request describes the HTTP request information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + en: + description: Env holds environment variable information passed to the monitored service. + type: + - 'null' + - object + he: + description: Headers includes any HTTP headers sent by the requester. Cookies will be taken by headers if supplied. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + hve: + description: HTTPVersion holds information about the used HTTP version. + type: + - 'null' + - string + maxLength: 1024 + mt: + description: Method holds information about the method of the HTTP request. + type: string + maxLength: 1024 + required: + - mt + r: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + dbs: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + ebs: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + he: + description: Headers holds the http headers sent in the http response. + type: + - 'null' + - object + additionalProperties: false + patternProperties: + '[.*]*$': + type: + - 'null' + - array + - string + items: + type: string + sc: + description: StatusCode sent in the http response. + type: + - 'null' + - integer + ts: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + se: + description: Service related information can be sent per event. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + a: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + 'n': + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + en: + description: Environment in which the monitored service is running, e.g. `production` or `staging`. + type: + - 'null' + - string + maxLength: 1024 + fw: + description: Framework holds information about the framework used in the monitored service. + type: + - 'null' + - object + properties: + 'n': + description: Name of the used framework + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the used framework + type: + - 'null' + - string + maxLength: 1024 + la: + description: Language holds information about the programming language of the monitored service. + type: + - 'null' + - object + properties: + 'n': + description: Name of the used programming language + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the used programming language + type: + - 'null' + - string + maxLength: 1024 + 'n': + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + ru: + description: Runtime holds information about the language runtime running the monitored service + type: + - 'null' + - object + properties: + 'n': + description: Name of the language runtime + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the language runtime + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + u: + description: User holds information about the correlated user for this event. If user data are provided here, all user related information from metadata is ignored, otherwise the metadata's user information will be stored with the event. + type: + - 'null' + - object + properties: + em: + description: Email of the user. + type: + - 'null' + - string + maxLength: 1024 + id: + description: ID identifies the logged in user, e.g. can be the primary key of the user + type: + - 'null' + - string + - integer + maxLength: 1024 + ud: + description: Domain of the user + type: + - 'null' + - string + maxLength: 1024 + un: + description: Name of the user. + type: + - 'null' + - string + maxLength: 1024 + d: + description: Duration how long the transaction took to complete, in milliseconds with 3 decimal points. + type: number + minimum: 0 + exp: + description: UserExperience holds metrics for measuring real user experience. This information is only sent by RUM agents. + type: + - 'null' + - object + properties: + cls: + description: CumulativeLayoutShift holds the Cumulative Layout Shift (CLS) metric value, or a negative value if CLS is unknown. See https://web.dev/cls/ + type: + - 'null' + - number + minimum: 0 + fid: + description: FirstInputDelay holds the First Input Delay (FID) metric value, or a negative value if FID is unknown. See https://web.dev/fid/ + type: + - 'null' + - number + minimum: 0 + lt: + description: Longtask holds longtask duration/count metrics. + type: + - 'null' + - object + properties: + count: + description: Count is the total number of of longtasks. + type: integer + minimum: 0 + max: + description: Max longtask duration + type: number + minimum: 0 + sum: + description: Sum of longtask durations + type: number + minimum: 0 + required: + - count + - max + - sum + tbt: + description: TotalBlockingTime holds the Total Blocking Time (TBT) metric value, or a negative value if TBT is unknown. See https://web.dev/tbt/ + type: + - 'null' + - number + minimum: 0 + id: + description: ID holds the hex encoded 64 random bits ID of the event. + type: string + maxLength: 1024 + k: + description: Marks capture the timing of a significant event during the lifetime of a transaction. Marks are organized into groups and can be set by the user or the agent. Marks are only reported by RUM agents. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - number + me: + description: Metricsets is a collection metrics related to this transaction. + type: + - 'null' + - array + items: + type: object + properties: + sa: + description: Samples hold application metrics collected from the agent. + type: object + properties: + ysc: + description: SpanSelfTimeCount holds the count of the related spans' self_time. + type: + - 'null' + - object + properties: + v: + description: Value holds the value of a single metric sample. + type: number + required: + - v + yss: + description: SpanSelfTimeSum holds the sum of the related spans' self_time. + type: + - 'null' + - object + properties: + v: + description: Value holds the value of a single metric sample. + type: number + required: + - v + 'y': + description: Span holds selected information about the correlated transaction. + type: + - 'null' + - object + properties: + su: + description: Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch) + type: + - 'null' + - string + maxLength: 1024 + t: + description: 'Type expresses the correlated span''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: + - 'null' + - string + maxLength: 1024 + required: + - sa + minItems: 0 + 'n': + description: 'Name is the generic designation of a transaction in the scope of a single service, eg: ''GET /users/:id''.' + type: + - 'null' + - string + maxLength: 1024 + o: + description: 'Outcome of the transaction with a limited set of permitted values, describing the success or failure of the transaction from the service''s perspective. It is used for calculating error rates for incoming requests. Permitted values: success, failure, unknown.' + type: + - 'null' + - string + enum: + - success + - failure + - unknown + - null + pid: + description: ParentID holds the hex encoded 64 random bits ID of the parent transaction or span. + type: + - 'null' + - string + maxLength: 1024 + rt: + description: Result of the transaction. For HTTP-related transactions, this should be the status code formatted like 'HTTP 2xx'. + type: + - 'null' + - string + maxLength: 1024 + ses: + description: Session holds optional transaction session information for RUM. + type: + - 'null' + - object + properties: + id: + description: ID holds a session ID for grouping a set of related transactions. + type: string + seq: + description: Sequence holds an optional sequence number for a transaction within a session. It is not meaningful to compare sequences across two different sessions. + type: + - 'null' + - integer + minimum: 1 + required: + - id + sm: + description: Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported. + type: + - 'null' + - boolean + sr: + description: SampleRate applied to the monitored service at the time where this transaction was recorded. Allowed values are [0..1]. A SampleRate <1 indicates that not all spans are recorded. + type: + - 'null' + - number + t: + description: 'Type expresses the transaction''s type as keyword that has specific relevance within the service''s domain, eg: ''request'', ''backgroundjob''.' + type: string + maxLength: 1024 + tid: + description: TraceID holds the hex encoded 128 random bits ID of the correlated trace. + type: string + maxLength: 1024 + 'y': + description: Spans is a collection of spans related to this transaction. + type: + - 'null' + - array + items: + type: object + properties: + ac: + description: Action holds the specific kind of event within the sub-type represented by the span (e.g. query, connect) + type: + - 'null' + - string + maxLength: 1024 + c: + description: Context holds arbitrary contextual information for the event. + type: + - 'null' + - object + properties: + dt: + description: Destination contains contextual data about the destination of spans + type: + - 'null' + - object + properties: + ad: + description: 'Address is the destination network address: hostname (e.g. ''localhost''), FQDN (e.g. ''elastic.co''), IPv4 (e.g. ''127.0.0.1'') IPv6 (e.g. ''::1'')' + type: + - 'null' + - string + maxLength: 1024 + po: + description: Port is the destination network port (e.g. 443) + type: + - 'null' + - integer + se: + description: Service describes the destination service + type: + - 'null' + - object + properties: + 'n': + description: 'Name is the identifier for the destination service, e.g. ''http://elastic.co'', ''elasticsearch'', ''rabbitmq'' DEPRECATED: this field will be removed in a future release' + type: + - 'null' + - string + maxLength: 1024 + rc: + description: 'Resource identifies the destination service resource being operated on e.g. ''http://elastic.co:80'', ''elasticsearch'', ''rabbitmq/queue_name'' DEPRECATED: this field will be removed in a future release' + type: string + maxLength: 1024 + t: + description: 'Type of the destination service, e.g. db, elasticsearch. Should typically be the same as span.type. DEPRECATED: this field will be removed in a future release' + type: + - 'null' + - string + maxLength: 1024 + required: + - rc + g: + description: Tags are a flat mapping of user-defined tags. Allowed value types are string, boolean and number values. Tags are indexed and searchable. + type: + - 'null' + - object + additionalProperties: + type: + - 'null' + - string + - boolean + - number + maxLength: 1024 + h: + description: HTTP contains contextual information when the span concerns an HTTP request. + type: + - 'null' + - object + properties: + mt: + description: Method holds information about the method of the HTTP request. + type: + - 'null' + - string + maxLength: 1024 + r: + description: Response describes the HTTP response information in case the event was created as a result of an HTTP request. + type: + - 'null' + - object + properties: + dbs: + description: DecodedBodySize holds the size of the decoded payload. + type: + - 'null' + - integer + ebs: + description: EncodedBodySize holds the size of the encoded payload. + type: + - 'null' + - integer + ts: + description: TransferSize holds the total size of the payload. + type: + - 'null' + - integer + sc: + description: 'Deprecated: Use Response.StatusCode instead. StatusCode sent in the http response.' + type: + - 'null' + - integer + url: + description: URL is the raw url of the correlating HTTP request. + type: + - 'null' + - string + se: + description: Service related information can be sent per span. Information provided here will override the more generic information retrieved from metadata, missing service fields will be retrieved from the metadata information. + type: + - 'null' + - object + properties: + a: + description: Agent holds information about the APM agent capturing the event. + type: + - 'null' + - object + properties: + 'n': + description: Name of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + ve: + description: Version of the APM agent capturing information. + type: + - 'null' + - string + maxLength: 1024 + 'n': + description: Name of the monitored service. + type: + - 'null' + - string + maxLength: 1024 + pattern: ^[a-zA-Z0-9 _-]+$ + d: + description: Duration of the span in milliseconds + type: number + minimum: 0 + id: + description: ID holds the hex encoded 64 random bits ID of the event. + type: string + maxLength: 1024 + 'n': + description: Name is the generic designation of a span in the scope of a transaction. + type: string + maxLength: 1024 + o: + description: 'Outcome of the span: success, failure, or unknown. Outcome may be one of a limited set of permitted values describing the success or failure of the span. It can be used for calculating error rates for outgoing requests.' + type: + - 'null' + - string + enum: + - success + - failure + - unknown + - null + pi: + description: ParentIndex is the index of the parent span in the list. Absent when the parent is a transaction. + type: + - 'null' + - integer + s: + description: Start is the offset relative to the transaction's timestamp identifying the start of the span, in milliseconds. + type: number + sr: + description: SampleRate applied to the monitored service at the time where this span was recorded. + type: + - 'null' + - number + st: + description: Stacktrace connected to this span event. + type: + - 'null' + - array + items: + type: object + properties: + ap: + description: AbsPath is the absolute path of the frame's file. + type: + - 'null' + - string + cli: + description: ContextLine is the line from the frame's file. + type: + - 'null' + - string + cn: + description: Classname of the frame. + type: + - 'null' + - string + co: + description: ColumnNumber of the frame. + type: + - 'null' + - integer + f: + description: Filename is the relative name of the frame's file. + type: string + fn: + description: Function represented by the frame. + type: + - 'null' + - string + li: + description: LineNumber of the frame. + type: + - 'null' + - integer + mo: + description: Module to which the frame belongs to. + type: + - 'null' + - string + poc: + description: PostContext is a slice of code lines immediately before the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + prc: + description: PreContext is a slice of code lines immediately after the line from the frame's file. + type: + - 'null' + - array + items: + type: string + minItems: 0 + required: + - f + minItems: 0 + su: + description: Subtype is a further sub-division of the type (e.g. postgresql, elasticsearch) + type: + - 'null' + - string + maxLength: 1024 + sy: + description: Sync indicates whether the span was executed synchronously or asynchronously. + type: + - 'null' + - boolean + t: + description: 'Type holds the span''s type, and can have specific keywords within the service''s domain (eg: ''request'', ''backgroundjob'', etc)' + type: string + maxLength: 1024 + required: + - 'n' + - t + - id + - s + - d + minItems: 0 + yc: + description: SpanCount counts correlated spans. + type: object + properties: + dd: + description: Dropped is the number of correlated spans that have been dropped by the APM agent recording the transaction. + type: + - 'null' + - integer + sd: + description: Started is the number of correlated spans that are recorded. + type: integer + required: + - sd + required: + - tid + - t + - id + - yc + - d + responses: + 200_server_info: + description: A successful response indicates that the server is up. + content: + application/json: + schema: + description: If an API key or a secret token is passed along with the request, the response payload includes some information about the APM server. + type: object + properties: + build_date: + type: string + format: time-date + build_sha: + type: string + publish_ready: + type: boolean + version: + type: string + examples: + getServerHealthAuthResponse: + summary: Example APM Server information request with a secret token + value: + build_date: '2021-12-18T19:59:06Z' + build_sha: 24fe620eeff5a19e2133c940c7e5ce1ceddb1445 + publish_ready: true + version: 8.12.2 + examples: + metadataEventIntakeRequestExample: + summary: A request body example for the metadata event type. + value: + metadata: + process: + pid: 1234 + title: /usr/lib/jvm/java-10-openjdk-amd64/bin/java + ppid: 1 + argv: + - '-v' + system: + architecture: amd64 + detected_hostname: 8ec7ceb99074 + configured_hostname: host1 + platform: Linux + container: + id: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 + kubernetes: + namespace: default + pod: + uid: b17f231da0ad128dc6c6c0b2e82f6f303d3893e3 + name: instrumented-java-service + node: + name: node-name + service: + name: 1234_service-12a3 + version: 4.3.0 + node: + configured_name: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 + environment: production + language: + name: Java + version: 10.0.2 + agent: + version: 1.10.0 + name: java + ephemeral_id: e71be9ac-93b0-44b9-a997-5638f6ccfc36 + framework: + name: spring + version: 5.0.0 + runtime: + name: Java + version: 10.0.2 + labels: + group: experimental + ab_testing: true + segment: 5 + metricSetEventIntakeRequestExample: + summary: A request body example for the metricset event type. + value: + metricset: + samples: + transaction.breakdown.count: + value: 12 + transaction.duration.sum.us: + value: 12 + transaction.duration.count: + value: 2 + transaction.self_time.sum.us: + value: 10 + transaction.self_time.count: + value: 2 + span.self_time.count: + value: 1 + span.self_time.sum.us: + value: 633.288 + byte_counter: + value: 1 + short_counter: + value: 227 + integer_gauge: + value: 42767 + long_gauge: + value: 3147483648 + float_gauge: + value: 9.16 + double_gauge: + value: 3.141592653589793 + dotted.float.gauge: + value: 6.12 + negative.d.o.t.t.e.d: + value: -1022 + tags: + code: 200 + success: true + transaction: + type: request + name: GET/ + span: + type: db + subtype: mysql + timestamp: 1571657444929001 From 8fdf5039b7cf4017c60d8b8ff452c0c5e8de3ba5 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:39:53 -0400 Subject: [PATCH 123/133] 8.14: update docs, mergify, versions and changelogs (#12984) * [Release] update version 8.15.0 * [Release] update changelogs for 8.14 release --------- Co-authored-by: apmmachine Co-authored-by: Edoardo Tenani <526307+endorama@users.noreply.github.com> Co-authored-by: Carson Ip --- .mergify.yml | 14 ++++++++++++++ CHANGELOG.asciidoc | 2 ++ changelogs/8.14.asciidoc | 24 ++++++++++++++++++++++++ changelogs/head.asciidoc | 4 +--- cmd/intake-receiver/version.go | 2 +- internal/version/version.go | 2 +- 6 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 changelogs/8.14.asciidoc diff --git a/.mergify.yml b/.mergify.yml index fb0f2880eb0..8cb101bb087 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -332,3 +332,17 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + - name: backport patches to 8.14 branch + conditions: + - merged + - base=main + - label=backport-8.14 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.14" + labels: + - "backport" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index e57b067927a..623bc75afd3 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,5 @@ // tag::list[] +* <> * <> * <> * <> @@ -17,6 +18,7 @@ // tag::includes[] include::./changelogs/head.asciidoc[] +include::./changelogs/8.14.asciidoc[] include::./changelogs/8.13.asciidoc[] include::./changelogs/8.12.asciidoc[] include::./changelogs/8.11.asciidoc[] diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc new file mode 100644 index 00000000000..0f7b06b3b99 --- /dev/null +++ b/changelogs/8.14.asciidoc @@ -0,0 +1,24 @@ +[[apm-release-notes-8.14]] +== APM version 8.14 +* <> + +[float] +[[apm-release-notes-8.14.0]] +=== APM version 8.14.0 + +https://github.com/elastic/apm-server/compare/v8.13.2\...v8.14.0[View commits] + +[float] +==== Breaking Changes + +[float] +==== Deprecations + +[float] +==== Intake API Changes + +[float] +==== Added +- OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940] +- Add support for setting the `host.id` via IntakeV2 {pull}12940[12940] +- Improved error message when tail sampling processor fails to read from subscriber position file {pull}12759[12759] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 2960ca0b5b5..a3cf1bf266d 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -1,7 +1,7 @@ [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/8.13\...main[View commits] +https://github.com/elastic/apm-server/compare/8.14\...main[View commits] [float] ==== Breaking Changes @@ -14,5 +14,3 @@ https://github.com/elastic/apm-server/compare/8.13\...main[View commits] [float] ==== Added -- OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940] -- Add support for setting the `host.id` via IntakeV2 {pull}12940[12940] \ No newline at end of file diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go index 7b4c8aa6075..a7731b88d2a 100644 --- a/cmd/intake-receiver/version.go +++ b/cmd/intake-receiver/version.go @@ -18,4 +18,4 @@ package main // version matches the APM Server's version -const version = "8.14.0" +const version = "8.15.0" diff --git a/internal/version/version.go b/internal/version/version.go index fdde5cd026d..2985c194338 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -18,4 +18,4 @@ package version // Version holds the APM Server version. -const Version = "8.14.0" +const Version = "8.15.0" From 2ca24dde431b7770791a378465b27d73c45a45d5 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Wed, 17 Apr 2024 18:47:26 +0200 Subject: [PATCH 124/133] fix: add rsync protect filter to preserve openapi spec (#12987) * fix: add rsync protect filter to preserve openapi spec we're syncing docs spec from apm-data which causes rsync to delete the openapi spec because it's not in the target dir (apm-data). This PR adds a protect filter to prevent the openapi folder from being deleted. * lint: remove unused make task --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 82830266b17..f977ea22115 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ testing/infra/terraform/modules/%/README.md: .FORCE # and just keep the JSON Schema there. docs/spec: go.mod @$(GO) mod download github.com/elastic/apm-data - rsync -v --delete --chmod=Du+rwx,go+rx --chmod=Fu+rw,go+r -r $$($(GO) list -m -f {{.Dir}} github.com/elastic/apm-data)/input/elasticapm/docs/spec ./docs + rsync -v --delete --filter='P spec/openapi/' --chmod=Du+rwx,go+rx --chmod=Fu+rw,go+r -r $$($(GO) list -m -f {{.Dir}} github.com/elastic/apm-data)/input/elasticapm/docs/spec ./docs ############################################################################## # Beats synchronisation. @@ -189,11 +189,6 @@ update-beats: update-beats-module update update-beats-module: $(GO) get -d $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy -.PHONY: update-beats-docs -update-beats-docs: - $(GO) mod download $(BEATS_MODULE) - rsync -v -r --existing $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/libbeat/ ./docs/legacy/copied-from-beats - ############################################################################## # Linting, style-checking, license header checks, etc. ############################################################################## From 574f200ef486cb71471b9a24d28b54fbc2009986 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 19:21:48 +0000 Subject: [PATCH 125/133] build(deps): bump github.com/elastic/elastic-agent-libs from 0.9.3 to 0.9.4 (#12997) * build(deps): bump github.com/elastic/elastic-agent-libs Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.9.3 to 0.9.4. - [Release notes](https://github.com/elastic/elastic-agent-libs/releases) - [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.9.3...v0.9.4) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-libs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 450a501a487..27683c4cf33 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.9.3 +Version: v0.9.4 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.4/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index dfe5e919a85..2a438febe1a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/elastic/apm-data v1.1.0 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 github.com/elastic/elastic-agent-client/v7 v7.8.1 - github.com/elastic/elastic-agent-libs v0.9.3 + github.com/elastic/elastic-agent-libs v0.9.4 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.2 github.com/elastic/go-docappender v1.1.0 diff --git a/go.sum b/go.sum index 10b32419079..f0c108b965a 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14 github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY= -github.com/elastic/elastic-agent-libs v0.9.3 h1:w1Ykn8aUFxDorUAEGt/7A/NzZtFf74n4OAe1ik8mS80= -github.com/elastic/elastic-agent-libs v0.9.3/go.mod h1:SkMnpLm+tXybBrIWK6f3rcOhrDIztLbYCV46m8gwc8g= +github.com/elastic/elastic-agent-libs v0.9.4 h1:I6c1NAj3grJ1YZgo+U04w0csMAWGIn6eZTb23Z5MbAI= +github.com/elastic/elastic-agent-libs v0.9.4/go.mod h1:SkMnpLm+tXybBrIWK6f3rcOhrDIztLbYCV46m8gwc8g= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= From 8515f1b0d0df15467cb729ce56387cc3de922e36 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 17 Apr 2024 18:01:27 -0400 Subject: [PATCH 126/133] chore: Update to elastic/beats@ab27a657e4f1 (#12998) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 27683c4cf33..511740f7c2a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 +Version: v7.0.0-alpha2.0.20240417171853-ab27a657e4f1 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240416130620-3f1d32b372a4/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240417171853-ab27a657e4f1/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 2a438febe1a..85c5faadafa 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240417171853-ab27a657e4f1 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.4 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index f0c108b965a..234912f08f3 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4 h1:azZwBRDNDh7jtzfmwHeXulGJcz22MrYOdg5TTtBOad4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240416130620-3f1d32b372a4/go.mod h1:soTo0BeTumTga3+hWq1gt0zw9AR0WaSUL1573Dzor30= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240417171853-ab27a657e4f1 h1:d75NgiGosMpHbEY7cENmbQci2CO6E7SyKoCSrk0TOqM= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240417171853-ab27a657e4f1/go.mod h1:JCX9F/mkZ3NhDFcY2F5IQn/FDYJWzQW5asNWsE11h8w= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 68fa3c9fff75a7c9a52be0e9ee78a77f7ef614f8 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 17 Apr 2024 18:38:05 -0400 Subject: [PATCH 127/133] [updatecli] Bump elastic stack version to 8.14.0-799c1dc0 (#12992) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f82dded40f..07f370fe7d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-918a815f-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-799c1dc0-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-918a815f-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-799c1dc0-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-918a815f-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-799c1dc0-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 8ad8a10e79c..a6352f18ec1 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-918a815f-SNAPSHOT + version: 8.14.0-799c1dc0-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 22fa4138197..a3db8821f67 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-918a815f-SNAPSHOT + version: 8.14.0-799c1dc0-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index b8522622ce0..afc6b36e664 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-918a815f-SNAPSHOT + version: 8.14.0-799c1dc0-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 92d1ef747789dd16afd34b41937ef7c5cc6699e3 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 18 Apr 2024 14:40:34 +0200 Subject: [PATCH 128/133] github-action: use finer-grained token (#13000) --- .github/workflows/run-minor-release.yml | 12 ++---------- .github/workflows/run-patch-release.yml | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/run-minor-release.yml b/.github/workflows/run-minor-release.yml index f5dba2bb0d6..69034507f6a 100644 --- a/.github/workflows/run-minor-release.yml +++ b/.github/workflows/run-minor-release.yml @@ -19,6 +19,7 @@ permissions: env: JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} SLACK_CHANNEL: "#apm-server" + GH_TOKEN: ${{ secrets.APM_SERVER_RELEASE_TOKEN }} jobs: prepare: @@ -67,23 +68,14 @@ jobs: # Required to use a service account, otherwise PRs created by # GitHub bot won't trigger any CI builds. # See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081 - - name: Configure github token - uses: elastic/apm-pipeline-library/.github/actions/github-token@current - with: - url: ${{ secrets.VAULT_ADDR }} - roleId: ${{ secrets.VAULT_ROLE_ID }} - secretId: ${{ secrets.VAULT_SECRET_ID }} - - name: Configure git user uses: elastic/apm-pipeline-library/.github/actions/setup-git@current with: username: ${{ env.GIT_USER }} email: ${{ env.GIT_EMAIL }} - token: ${{ env.GITHUB_TOKEN }} + token: ${{ env.GH_TOKEN }} - run: make minor-release - env: - GH_TOKEN: ${{ env.GITHUB_TOKEN }} - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current if: success() diff --git a/.github/workflows/run-patch-release.yml b/.github/workflows/run-patch-release.yml index 2ace35f01db..3b0644f9f5f 100644 --- a/.github/workflows/run-patch-release.yml +++ b/.github/workflows/run-patch-release.yml @@ -19,6 +19,7 @@ permissions: env: JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} SLACK_CHANNEL: "#apm-server" + GH_TOKEN: ${{ secrets.APM_SERVER_RELEASE_TOKEN }} jobs: prepare: @@ -58,23 +59,14 @@ jobs: # Required to use a service account, otherwise PRs created by # GitHub bot won't trigger any CI builds. # See https://github.com/peter-evans/create-pull-request/issues/48#issuecomment-537478081 - - name: Configure github token - uses: elastic/apm-pipeline-library/.github/actions/github-token@current - with: - url: ${{ secrets.VAULT_ADDR }} - roleId: ${{ secrets.VAULT_ROLE_ID }} - secretId: ${{ secrets.VAULT_SECRET_ID }} - - name: Configure git user uses: elastic/apm-pipeline-library/.github/actions/setup-git@current with: username: ${{ env.GIT_USER }} email: ${{ env.GIT_EMAIL }} - token: ${{ env.GITHUB_TOKEN }} + token: ${{ env.GH_TOKEN }} - run: make patch-release - env: - GH_TOKEN: ${{ env.GITHUB_TOKEN }} - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current if: success() From 11f600d42e90bef73983f7a13402ba33aec48029 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:04:39 -0400 Subject: [PATCH 129/133] chore: Update to elastic/beats@b4ff53ce2b2d (#13010) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 511740f7c2a..b9f2b39810d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240417171853-ab27a657e4f1 +Version: v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240417171853-ab27a657e4f1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 85c5faadafa..35c4bbfe188 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240417171853-ab27a657e4f1 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.4 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index 234912f08f3..cf94e1de7fb 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/Azure/azure-sdk-for-go v59.0.0+incompatible h1:I1ULJqny1qQhUBFy11yDXHhW3pLvbhwV0PTn7mjp9V0= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 h1:fb8kj/Dh4CSwgsOzHeZY4Xh68cFVbzXx+ONXGMY//4w= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3qKzmAucSi51+SP1OhohieR821Q= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240417171853-ab27a657e4f1 h1:d75NgiGosMpHbEY7cENmbQci2CO6E7SyKoCSrk0TOqM= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240417171853-ab27a657e4f1/go.mod h1:JCX9F/mkZ3NhDFcY2F5IQn/FDYJWzQW5asNWsE11h8w= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d h1:unQ7BLxUmKbGsX1RFmeJWZ+ln/T2GJ4qnyXD1ltuIMg= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d/go.mod h1:/JY27BlnmiLgbBaUh20k7XVWrUOng+ZZqaSOabyPaPw= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM= From 8227dee795ea75d88d8c8d5c4089cb73da696304 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:26:36 -0400 Subject: [PATCH 130/133] [updatecli] Bump elastic stack version to 8.14.0-318ae53b (#13008) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update docker-compose.yml Made with ❤️️ by updatecli * chore: Update k8s stack yaml files Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 07f370fe7d7..91386511300 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-799c1dc0-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-318ae53b-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.14.0-799c1dc0-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-318ae53b-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.14.0-799c1dc0-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.14.0-318ae53b-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index a6352f18ec1..e4686f6bfe7 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.14.0-799c1dc0-SNAPSHOT + version: 8.14.0-318ae53b-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index a3db8821f67..e06725d0c82 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.14.0-799c1dc0-SNAPSHOT + version: 8.14.0-318ae53b-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index afc6b36e664..da06ad78489 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.14.0-799c1dc0-SNAPSHOT + version: 8.14.0-318ae53b-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From f319e0d280fa700898c6eb5c2fae23bf97c8f13f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 13:18:21 +0000 Subject: [PATCH 131/133] build(deps): bump golang.org/x/net from 0.17.0 to 0.23.0 in /systemtest (#13014) * build(deps): bump golang.org/x/net from 0.17.0 to 0.23.0 in /systemtest Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.17.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- systemtest/go.mod | 6 +++--- systemtest/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/systemtest/go.mod b/systemtest/go.mod index 49baa4550bc..c50ff2f29ea 100644 --- a/systemtest/go.mod +++ b/systemtest/go.mod @@ -34,7 +34,7 @@ require ( go.opentelemetry.io/otel/trace v1.19.0 go.uber.org/zap v1.24.0 golang.org/x/sync v0.3.0 - golang.org/x/sys v0.13.0 + golang.org/x/sys v0.18.0 golang.org/x/time v0.3.0 google.golang.org/grpc v1.58.3 gopkg.in/yaml.v3 v3.0.1 @@ -95,8 +95,8 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/net v0.23.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.12.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect diff --git a/systemtest/go.sum b/systemtest/go.sum index 366de551ec2..e5de0d346f2 100644 --- a/systemtest/go.sum +++ b/systemtest/go.sum @@ -210,8 +210,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -224,12 +224,12 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From f4b7d7529760ee2dbd9cd37c65b440f32bd5872b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 13:46:31 +0000 Subject: [PATCH 132/133] build(deps): bump golang.org/x/net from 0.20.0 to 0.23.0 in /tools (#13015) * build(deps): bump golang.org/x/net from 0.20.0 to 0.23.0 in /tools Bumps [golang.org/x/net](https://github.com/golang/net) from 0.20.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.20.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] * Update NOTICE.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- tools/go.mod | 8 ++++---- tools/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 9db730bdcd2..f215693650f 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -127,14 +127,14 @@ require ( github.com/zclconf/go-cty v1.14.1 // indirect gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.18.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.20.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect diff --git a/tools/go.sum b/tools/go.sum index 10d5e2ef948..54cf2eb4edd 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1942,8 +1942,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2090,8 +2090,8 @@ golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2256,8 +2256,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2275,8 +2275,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From efbd3e6d574390a505627a543d8b64a1fe086cd0 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:36:05 -0400 Subject: [PATCH 133/133] chore: Update to elastic/beats@0d726a60be84 (#13017) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index b9f2b39810d..997259a88fd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.1.0 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d +Version: v7.0.0-alpha2.0.20240419143307-0d726a60be84 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240419143307-0d726a60be84/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 35c4bbfe188..96d02872e53 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v1.1.0 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240419143307-0d726a60be84 github.com/elastic/elastic-agent-client/v7 v7.8.1 github.com/elastic/elastic-agent-libs v0.9.4 github.com/elastic/elastic-agent-system-metrics v0.9.2 diff --git a/go.sum b/go.sum index cf94e1de7fb..44ba5c383dd 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v1.1.0 h1:5ahaTQwWb6+OmrXrc1dzfD2wjvTG7yJRaldcsc9dIc4= github.com/elastic/apm-data v1.1.0/go.mod h1:TLHPd2H8wYlf3FIqriQ018NZzE1FLC6VtsQ6DN0vRmY= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d h1:unQ7BLxUmKbGsX1RFmeJWZ+ln/T2GJ4qnyXD1ltuIMg= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240418135020-b4ff53ce2b2d/go.mod h1:/JY27BlnmiLgbBaUh20k7XVWrUOng+ZZqaSOabyPaPw= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240419143307-0d726a60be84 h1:Lxm0AURIqS0YMboRg2JLl4/ywdZCXtMDY/WVlzm/laM= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240419143307-0d726a60be84/go.mod h1:/JY27BlnmiLgbBaUh20k7XVWrUOng+ZZqaSOabyPaPw= github.com/elastic/elastic-agent-autodiscover v0.6.8 h1:BSXz+QwjZAEt08G+T3GDGl14Bh9a6zD8luNCvZut/b8= github.com/elastic/elastic-agent-autodiscover v0.6.8/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM=