diff --git a/.buildkite/package.yml b/.buildkite/package.yml index ab7c500adb7..218b4d975a9 100644 --- a/.buildkite/package.yml +++ b/.buildkite/package.yml @@ -7,6 +7,7 @@ notify: env: IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2004" IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64" + GENERATE_CHAINGUARD_IMAGES: true steps: - group: "Package" diff --git a/.buildkite/scripts/dra.sh b/.buildkite/scripts/dra.sh index 4c5604f253b..ec7e4d761e2 100644 --- a/.buildkite/scripts/dra.sh +++ b/.buildkite/scripts/dra.sh @@ -5,7 +5,7 @@ ## ## It downloads the generated artifacts and run the DRA only if the branch is an active ## branch, based on the Unified Release policy. Otherwise, it won't run the DRA but print -## some traces. +## some traces and fail unless it's a feature branch then it will list the DRA artifacts. ## set -eo pipefail @@ -28,7 +28,12 @@ if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "true" ]]; then exit 0 fi -curl -s https://storage.googleapis.com/artifacts-api/snapshots/branches.json > active-branches.json +# by default it uses the buildkite branch +DRA_BRANCH="$BUILDKITE_BRANCH" +# by default it publishes the DRA artifacts, for such it uses the collect command. +dra_command=collect +BRANCHES_URL=https://storage.googleapis.com/artifacts-api/snapshots/branches.json +curl -s "${BRANCHES_URL}" > active-branches.json if ! grep -q "\"$BUILDKITE_BRANCH\"" active-branches.json ; then echo "--- :arrow_right: Release Manager only supports the current active branches, skipping" echo "BUILDKITE_BRANCH=$BUILDKITE_BRANCH" @@ -36,12 +41,34 @@ if ! grep -q "\"$BUILDKITE_BRANCH\"" active-branches.json ; then echo "VERSION=$VERSION" echo "Supported branches:" cat active-branches.json - exit 0 + if [[ $BUILDKITE_BRANCH =~ "feature/" ]]; then + buildkite-agent annotate "${BUILDKITE_BRANCH} will list DRA artifacts. Feature branches are not supported. Look for the supported branches in ${BRANCHES_URL}" --style 'info' --context 'ctx-info' + dra_command=list + + # use a different branch since DRA does not support feature branches but main/release branches + # for such we will use the VERSION and https://storage.googleapis.com/artifacts-api/snapshots/.json + # to know if the branch was branched out from main or the release branches. + MAJOR_MINOR=${VERSION%.*} + if curl -s "https://storage.googleapis.com/artifacts-api/snapshots/main.json" | grep -q "$VERSION" ; then + DRA_BRANCH=main + else + if curl -s "https://storage.googleapis.com/artifacts-api/snapshots/$MAJOR_MINOR.json" | grep -q "$VERSION" ; then + DRA_BRANCH="$MAJOR_MINOR" + else + buildkite-agent annotate "It was not possible to know the original base branch for ${BUILDKITE_BRANCH}. This won't fail - this is a feature branch." --style 'info' --context 'ctx-info-feature-branch' + exit 0 + fi + fi + else + buildkite-agent annotate "${BUILDKITE_BRANCH} is not supported yet. Look for the supported branches in ${BRANCHES_URL}" --style 'warning' --context 'ctx-warn' + exit 1 + fi fi dra() { local workflow=$1 - echo "--- Run release manager $workflow" + local command=$2 + echo "--- Run release manager $workflow (DRA command: $command)" docker run --rm \ --name release-manager \ -e VAULT_ADDR="${VAULT_ADDR_SECRET}" \ @@ -49,16 +76,16 @@ dra() { -e VAULT_SECRET_ID="${VAULT_SECRET}" \ --mount type=bind,readonly=false,src=$(pwd),target=/artifacts \ docker.elastic.co/infra/release-manager:latest \ - cli collect \ + cli "$command" \ --project apm-server \ - --branch $BUILDKITE_BRANCH \ + --branch $DRA_BRANCH \ --commit $BUILDKITE_COMMIT \ --workflow $workflow \ --artifact-set main \ --version $VERSION } -dra "snapshot" -if [[ "${BUILDKITE_BRANCH}" != "main" ]]; then - dra "staging" +dra "snapshot" "$dra_command" +if [[ "${DRA_BRANCH}" != "main" ]]; then + dra "staging" "$dra_command" fi diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml index 980d6480640..b863c094858 100644 --- a/.ci/bump-golang.yml +++ b/.ci/bump-golang.yml @@ -52,7 +52,7 @@ sources: owner: golang repository: go token: '{{ requiredEnv "GITHUB_TOKEN" }}' - username: '{{ requiredEnv "GIT_USER" }}' + username: '{{ requiredEnv "GITHUB_ACTOR" }}' versionfilter: kind: regex pattern: go1\.{{ source "minor" }}\.\d*$ diff --git a/.github/workflows/bump-elastic-stack.yml b/.github/workflows/bump-elastic-stack.yml index 5bd7d404cf4..30286c6cfc7 100644 --- a/.github/workflows/bump-elastic-stack.yml +++ b/.github/workflows/bump-elastic-stack.yml @@ -30,12 +30,16 @@ jobs: with: ref: ${{ matrix.branch }} - - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current + - uses: elastic/oblt-actions/updatecli/run@v1.2.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - pipeline: ./.ci/bump-elastic-stack-snapshot.yml - command: '--experimental apply' + command: --experimental apply --config .ci/bump-elastic-stack-snapshot.yml env: BRANCH: ${{ matrix.branch }} + GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + + - if: ${{ failure() }} + uses: elastic/oblt-actions/slack/send@v1.2.0 + with: + channel-id: '#apm-server' + message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on " + bot-token: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml index 3fbcd7558da..247869f9428 100644 --- a/.github/workflows/bump-golang.yml +++ b/.github/workflows/bump-golang.yml @@ -15,10 +15,16 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current + + - uses: elastic/oblt-actions/updatecli/run@v1.2.0 + with: + command: --experimental apply --config .ci/bump-golang.yml + env: + GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + + - if: ${{ failure() }} + uses: elastic/oblt-actions/slack/send@v1.2.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - pipeline: ./.ci/bump-golang.yml - command: '--experimental apply' + bot-token: ${{ secrets.SLACK_BOT_TOKEN }} + channel-id: "#apm-server" + message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on " diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6dcf4965a2f..a541e057e6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,3 +87,28 @@ jobs: go-version-file: go.mod cache: false - run: make package-snapshot + env: + GH_TOKEN: ${{ github.token }} + + test-package-and-push: + runs-on: ubuntu-latest + if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) + env: + GENERATE_CHAINGUARD_IMAGES: true + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: go.mod + cache: false + - uses: elastic/apm-pipeline-library/.github/actions/docker-login@current + with: + registry: docker.elastic.co + secret: secret/observability-team/ci/docker-registry/prod + url: ${{ secrets.VAULT_ADDR }} + roleId: ${{ secrets.VAULT_ROLE_ID }} + secretId: ${{ secrets.VAULT_SECRET_ID }} + - run: make package-snapshot + env: + GH_TOKEN: ${{ github.token }} + - run: make publish-docker-images diff --git a/.github/workflows/microbenchmark.yml b/.github/workflows/microbenchmark.yml index ee2c8dfdace..7e82a6ee5d3 100644 --- a/.github/workflows/microbenchmark.yml +++ b/.github/workflows/microbenchmark.yml @@ -19,21 +19,14 @@ permissions: jobs: microbenchmark: runs-on: ubuntu-latest - # wait up to 1 hour - timeout-minutes: 60 + timeout-minutes: 5 steps: - - id: buildkite - name: Run buildkite pipeline - uses: elastic/apm-pipeline-library/.github/actions/buildkite@current + - name: Run buildkite pipeline + uses: elastic/oblt-actions/buildkite/run@v1.4.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} + token: ${{ secrets.BUILDKITE_TOKEN }} pipeline: apm-agent-microbenchmark - triggerMessage: "${{ github.repository }}@${{ github.ref_name }}" - waitFor: true - printBuildLogs: true - buildEnvVars: | + env-vars: | script=.ci/scripts/bench.sh repo=apm-server sha=${{ github.sha }} diff --git a/.github/workflows/opentelemetry.yml b/.github/workflows/opentelemetry.yml deleted file mode 100644 index 84a6209ff2c..00000000000 --- a/.github/workflows/opentelemetry.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Look up results at https://ela.st/oblt-ci-cd-stats. -# There will be one service per GitHub repository, including the org name, and one Transaction per Workflow. -name: OpenTelemetry Export Trace - -on: - workflow_run: - workflows: [ "*" ] - types: [completed] - -permissions: - contents: read - -jobs: - otel-export-trace: - runs-on: ubuntu-latest - steps: - - uses: elastic/apm-pipeline-library/.github/actions/opentelemetry@current - with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} diff --git a/.github/workflows/update-beats.yml b/.github/workflows/update-beats.yml index be5f1e2e816..92694cfaa23 100644 --- a/.github/workflows/update-beats.yml +++ b/.github/workflows/update-beats.yml @@ -28,22 +28,21 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} + - uses: actions/setup-go@v5 with: go-version-file: go.mod - - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current + + - uses: elastic/oblt-actions/updatecli/run@v1.2.0 + with: + command: --experimental apply --config .ci/update-beats.yml env: BRANCH_NAME: ${{ matrix.branch }} + GITHUB_TOKEN: ${{ secrets.UPDATECLI_GH_TOKEN }} + + - if: ${{ failure() }} + uses: elastic/oblt-actions/slack/send@v1.2.0 with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - pipeline: ./.ci/update-beats.yml - command: '--experimental apply' - - if: failure() - uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current - with: - vaultUrl: ${{ secrets.VAULT_ADDR }} - vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} - vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} - slackChannel: "#apm-server" + channel-id: '#apm-server' + message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, @robots-ci please look what's going on " + bot-token: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/.go-version b/.go-version index 6fee2fedb0a..89144dbc38f 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.2 +1.22.3 diff --git a/NOTICE.txt b/NOTICE.txt index b7233605476..4c45b97390e 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.20240507133336-f4a984d21af6 +Version: v7.0.0-alpha2.0.20240528110759-f411b0624c17 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240507133336-f4a984d21af6/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240528110759-f411b0624c17/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.1 +Version: v7.9.0 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.8.1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.9.0/LICENSE.txt: ELASTIC LICENSE AGREEMENT @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.9.7 +Version: v0.9.8 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.7/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.9.8/LICENSE: Apache License Version 2.0, January 2004 @@ -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.3 +Version: v0.10.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.9.3/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.10.2/LICENSE.txt: Apache License Version 2.0, January 2004 @@ -1461,12 +1461,12 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.2/LIC -------------------------------------------------------------------------------- -Dependency : github.com/elastic/go-docappender -Version: v1.1.0 +Dependency : github.com/elastic/go-docappender/v2 +Version: v2.1.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@v1.1.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.2/LICENSE: Apache License Version 2.0, January 2004 @@ -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.100.0 +Version: v0.101.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.100.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.101.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.100.0 +Version: v0.101.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.100.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.101.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.7.0 +Version: v1.8.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.7.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.8.0/LICENSE: Apache License @@ -5921,11 +5921,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel -Version: v1.26.0 +Version: v1.27.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.26.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.27.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6132,11 +6132,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.26.0/L -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/metric -Version: v1.26.0 +Version: v1.27.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.26.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.27.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.26.0 +Version: v1.27.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.26.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.27.0/LICENSE: Apache License Version 2.0, January 2004 @@ -6611,11 +6611,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.24.0 +Version: v0.25.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.25.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.19.0 +Version: v0.20.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.19.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.20.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -6759,11 +6759,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/grpc -Version: v1.63.2 +Version: v1.64.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.63.2/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.64.0/LICENSE: Apache License @@ -6971,11 +6971,11 @@ Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.63.2/LIC -------------------------------------------------------------------------------- Dependency : google.golang.org/protobuf -Version: v1.34.0 +Version: v1.34.1 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.34.0/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/protobuf@v1.34.1/LICENSE: Copyright (c) 2018 The Go Authors. All rights reserved. @@ -9156,109 +9156,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -Dependency : github.com/elastic/elastic-agent-shipper-client -Version: v0.5.1-0.20230228231646-f04347b666f3 -Licence type (autodetected): Elastic-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-shipper-client@v0.5.1-0.20230228231646-f04347b666f3/LICENSE.txt: - -Elastic License 2.0 - -URL: https://www.elastic.co/licensing/elastic-license - -## Acceptance - -By using the software, you agree to all of the terms and conditions below. - -## Copyright License - -The licensor grants you a non-exclusive, royalty-free, worldwide, -non-sublicensable, non-transferable license to use, copy, distribute, make -available, and prepare derivative works of the software, in each case subject to -the limitations and conditions below. - -## Limitations - -You may not provide the software to third parties as a hosted or managed -service, where the service provides users with access to any substantial set of -the features or functionality of the software. - -You may not move, change, disable, or circumvent the license key functionality -in the software, and you may not remove or obscure any functionality in the -software that is protected by the license key. - -You may not alter, remove, or obscure any licensing, copyright, or other notices -of the licensor in the software. Any use of the licensor’s trademarks is subject -to applicable law. - -## Patents - -The licensor grants you a license, under any patent claims the licensor can -license, or becomes able to license, to make, have made, use, sell, offer for -sale, import and have imported the software, in each case subject to the -limitations and conditions in this license. This license does not cover any -patent claims that you cause to be infringed by modifications or additions to -the software. If you or your company make any written claim that the software -infringes or contributes to infringement of any patent, your patent license for -the software granted under these terms ends immediately. If your company makes -such a claim, your patent license ends immediately for work on behalf of your -company. - -## Notices - -You must ensure that anyone who gets a copy of any part of the software from you -also gets a copy of these terms. - -If you modify the software, you must include in any modified copies of the -software prominent notices stating that you have modified the software. - -## No Other Rights - -These terms do not imply any licenses other than those expressly granted in -these terms. - -## Termination - -If you use the software in violation of these terms, such use is not licensed, -and your licenses will automatically terminate. If the licensor provides you -with a notice of your violation, and you cease all violation of this license no -later than 30 days after you receive that notice, your licenses will be -reinstated retroactively. However, if you violate these terms after such -reinstatement, any additional violation of these terms will cause your licenses -to terminate automatically and permanently. - -## No Liability - -*As far as the law allows, the software comes as is, without any warranty or -condition, and the licensor will not be liable to you for any damages arising -out of these terms or the use or nature of the software, under any kind of -legal claim.* - -## Definitions - -The **licensor** is the entity offering these terms, and the **software** is the -software the licensor makes available under these terms, including any portion -of it. - -**you** refers to the individual or entity agreeing to these terms. - -**your company** is any legal entity, sole proprietorship, or other kind of -organization that you work for, plus all organizations that have control over, -are under the control of, or are under common control with that -organization. **control** means ownership of substantially all the assets of an -entity, or the power to direct its management and policies by vote, contract, or -otherwise. Control can be direct or indirect. - -**your licenses** are all the licenses granted to you for the software under -these terms. - -**use** means anything you do with the software requiring one of your licenses. - -**trademark** means trademarks, service marks, and similar rights. - - -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-transport-go/v8 Version: v8.5.0 @@ -13905,11 +13802,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.100.0 +Version: v0.101.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.100.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.101.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14192,11 +14089,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/prometheus/client_golang -Version: v1.19.0 +Version: v1.19.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.19.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_golang@v1.19.1/LICENSE: Apache License Version 2.0, January 2004 @@ -15182,11 +15079,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/shirou/gopsutil/v3 -Version: v3.24.3 +Version: v3.24.4 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.24.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.24.4/LICENSE: gopsutil is distributed under BSD license reproduced below. @@ -16276,11 +16173,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmzap/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/apmzap/v2@v2.5.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -16698,11 +16595,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.2/LICENS -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/collector/semconv -Version: v0.100.0 +Version: v0.101.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.100.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.101.0/LICENSE: Apache License @@ -16910,11 +16807,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semc -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/sdk -Version: v1.26.0 +Version: v1.27.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.26.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.27.0/LICENSE: Apache License Version 2.0, January 2004 @@ -17121,11 +17018,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.26 -------------------------------------------------------------------------------- Dependency : go.opentelemetry.io/otel/trace -Version: v1.26.0 +Version: v1.27.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.26.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.27.0/LICENSE: Apache License Version 2.0, January 2004 @@ -17361,11 +17258,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : golang.org/x/crypto -Version: v0.22.0 +Version: v0.23.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.22.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.23.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17435,11 +17332,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/sys -Version: v0.19.0 +Version: v0.20.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.19.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.20.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17472,11 +17369,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/text -Version: v0.14.0 +Version: v0.15.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.14.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.15.0/LICENSE: Copyright (c) 2009 The Go Authors. All rights reserved. @@ -17509,11 +17406,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : google.golang.org/genproto/googleapis/rpc -Version: v0.0.0-20240401170217-c3f982113cda +Version: v0.0.0-20240415180920-8c6c420018be Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240401170217-c3f982113cda/LICENSE: +Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240415180920-8c6c420018be/LICENSE: Apache License diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc index 4028a0f69d8..00e3c38da6d 100644 --- a/changelogs/8.13.asciidoc +++ b/changelogs/8.13.asciidoc @@ -1,11 +1,20 @@ [[apm-release-notes-8.13]] == APM version 8.13 +* <> * <> * <> * <> * <> +[float] +[[apm-release-notes-8.13.4]] +=== APM version 8.13.4 + +https://github.com/elastic/apm-server/compare/v8.13.3\...v8.13.4[View commits] + +No significant changes. + [float] [[apm-release-notes-8.13.3]] === APM version 8.13.3 diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index a3cf1bf266d..1449a322f50 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -3,6 +3,12 @@ https://github.com/elastic/apm-server/compare/8.14\...main[View commits] +[float] +==== Bug fixes + +- Avoid data race due to reuse of `bytes.Buffer` in ES bulk requests {pull}13155[13155] +- APM Server now relies on the Elasticsearch apm-data plugin's index templates, which reverts some unsafe uses of `flattened` field types {pull}12066[12066] + [float] ==== Breaking Changes @@ -14,3 +20,6 @@ https://github.com/elastic/apm-server/compare/8.14\...main[View commits] [float] ==== Added + +- Add `elasticsearch.flushed.uncompressed.bytes` metric {pull}13155[13155] +- APM Server now relies on the Elasticsearch apm-data plugin's index templates, removing the requirement to install the APM integration package {pull}12066[12066] diff --git a/docker-compose.yml b/docker-compose.yml index c951249c2bf..0184ed52909 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.15.0-177234da-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-1b4d655a-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.15.0-177234da-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.15.0-1b4d655a-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.15.0-177234da-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.15.0-1b4d655a-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/go.mod b/go.mod index 8fdfb0e7a45..6ed949253d3 100644 --- a/go.mod +++ b/go.mod @@ -10,12 +10,12 @@ 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.20240507133336-f4a984d21af6 - github.com/elastic/elastic-agent-client/v7 v7.8.1 - github.com/elastic/elastic-agent-libs v0.9.7 - github.com/elastic/elastic-agent-system-metrics v0.9.3 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240528110759-f411b0624c17 + github.com/elastic/elastic-agent-client/v7 v7.9.0 + github.com/elastic/elastic-agent-libs v0.9.8 + github.com/elastic/elastic-agent-system-metrics v0.10.2 github.com/elastic/gmux v0.3.2 - github.com/elastic/go-docappender v1.1.0 + github.com/elastic/go-docappender/v2 v2.1.2 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 @@ -30,7 +30,7 @@ require ( github.com/jaegertracing/jaeger v1.57.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.100.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.101.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,19 +44,19 @@ 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.100.0 - go.opentelemetry.io/collector/pdata v1.7.0 - go.opentelemetry.io/otel v1.26.0 - go.opentelemetry.io/otel/metric v1.26.0 - go.opentelemetry.io/otel/sdk/metric v1.26.0 + go.opentelemetry.io/collector/consumer v0.101.0 + go.opentelemetry.io/collector/pdata v1.8.0 + go.opentelemetry.io/otel v1.27.0 + go.opentelemetry.io/otel/metric v1.27.0 + go.opentelemetry.io/otel/sdk/metric v1.27.0 go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 - golang.org/x/net v0.24.0 + golang.org/x/net v0.25.0 golang.org/x/sync v0.7.0 - golang.org/x/term v0.19.0 + golang.org/x/term v0.20.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.63.2 - google.golang.org/protobuf v1.34.0 + google.golang.org/grpc v1.64.0 + google.golang.org/protobuf v1.34.1 gopkg.in/yaml.v3 v3.0.1 ) @@ -87,7 +87,6 @@ require ( 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 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 @@ -125,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.100.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.101.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_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.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 - github.com/shirou/gopsutil/v3 v3.24.3 // indirect + github.com/shirou/gopsutil/v3 v3.24.4 // 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 @@ -145,19 +144,19 @@ require ( github.com/xdg/stringprep v1.0.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.elastic.co/apm/module/apmzap/v2 v2.5.0 // indirect + go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect go.elastic.co/ecszap v1.0.2 // indirect - go.opentelemetry.io/collector/semconv v0.100.0 // indirect - go.opentelemetry.io/otel/sdk v1.26.0 // indirect - go.opentelemetry.io/otel/trace v1.26.0 // indirect + go.opentelemetry.io/collector/semconv v0.101.0 // indirect + go.opentelemetry.io/otel/sdk v1.27.0 // indirect + go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.22.0 // indirect + golang.org/x/crypto v0.23.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 - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/tools v0.19.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // 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 ce4a2ac5d5a..13b093dbb0c 100644 --- a/go.sum +++ b/go.sum @@ -38,28 +38,30 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= -github.com/aws/aws-sdk-go-v2/config v1.17.7 h1:odVM52tFHhpqZBKNjVW5h+Zt1tKHbhdTQRb+0WHrNtw= -github.com/aws/aws-sdk-go-v2/config v1.17.7/go.mod h1:dN2gja/QXxFF15hQreyrqYhLBaQo1d9ZKe/v/uplQoI= -github.com/aws/aws-sdk-go-v2/credentials v1.12.20 h1:9+ZhlDY7N9dPnUmf7CDfW9In4sW5Ff3bh7oy4DzS1IE= -github.com/aws/aws-sdk-go-v2/credentials v1.12.20/go.mod h1:UKY5HyIux08bbNA7Blv4PcXQ8cTkGh7ghHMFklaviR4= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 h1:r08j4sbZu/RVi+BNxkBJwPMUYY3P8mgSDuKkZ/ZN1lE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17/go.mod h1:yIkQcCDYNsZfXpd5UX2Cy+sWA1jPgIhGTw9cOBzfVnQ= +github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSRM4BULGmfgNA= +github.com/aws/aws-sdk-go-v2/config v1.27.11/go.mod h1:SMsV78RIOYdve1vf36z8LmnszlRWkwMQtomCAI0/mIE= +github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs= +github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24 h1:wj5Rwc05hvUSvKuOF29IYb9QrCLjU+rHAy/x/o0DK2c= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24/go.mod h1:jULHjqqjDlbyTa7pfM7WICATnOv+iOhjletM3N0Xbu8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.36.1 h1:FS8Ja6LuLDVHcX+rmoNpOXqYb52N2A5DwQy7Dgduq4Q= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.36.1/go.mod h1:KOy1O7Fc2+GRgsbn/Kjr15vYDVXMEQALBaPRia3twSY= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.160.0 h1:ooy0OFbrdSwgk32OFGPnvBwry5ySYCKkgTEbQ2hejs8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.160.0/go.mod h1:xejKuuRDjz6z5OqyeLsz01MlOqqW7CqpAB4PabNvpu8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 h1:ogRAwT1/gxJBcSWDMZlgyFUM962F51A5CRhDLbxLdmo= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7/go.mod h1:YCsIZhXfRPLFFCl5xxY+1T9RKzOKjCut+28JSX2DnAk= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.23 h1:pwvCchFUEnlceKIgPUouBJwK81aCkQ8UDMORfeFtW10= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.23/go.mod h1:/w0eg9IhFGjGyyncHIQrXtU8wvNsTJOP0R6PPj0wf80= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5 h1:GUnZ62TevLqIoDyHeiWj2P7EqaosgakBKVvWriIdLQY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5/go.mod h1:csZuQY65DAdFBt1oIjO5hhBR49kQqop4+lcuCjf2arA= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 h1:9pPi0PsFNAGILFfPCk8Y0iyEBGc6lu6OQ97U7hmdesg= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.19/go.mod h1:h4J3oPZQbxLhzGnk+j9dfYHi5qIOVJ5kczZd658/ydM= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4/go.mod h1:mUYPBhaF2lGiukDEjJX2BLRRKTmoUSitGDUgM4tRxak= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 h1:cwIxeBttqPN3qkaAjcEcsh8NYr8n2HZPkcKgPAi1phU= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.6/go.mod h1:FZf1/nKNEkHdGGJP/cI2MoIMquumuRK6ol3QQJNDxmw= github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc h1:Keo7wQ7UODUaHcEi7ltENhbAK2VgZjfat6mLy03tQzo= @@ -93,8 +95,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.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= -github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= +github.com/containerd/containerd v1.7.15 h1:afEHXdil9iAm03BmhjzKyXnnEBtjaLJefdU7DV0IFes= +github.com/containerd/containerd v1.7.15/go.mod h1:ISzRRTMF8EXNpJlTzyr2XMhN+j9K302C21/+cr3kUnY= 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= @@ -145,24 +147,22 @@ 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.20240507133336-f4a984d21af6 h1:uJlWHWRnyT8KcOWzxB3cBA841iFVs9J5e/n1Hq1vOac= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240507133336-f4a984d21af6/go.mod h1:UMGh+I+rct6yas9Fij9XXMgThY/lsbGbHXe9vbk8ozo= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240528110759-f411b0624c17 h1:yP3ds+Or83h9tb2GnokmVX1NaVrN//V3iZVYWQAUBLA= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240528110759-f411b0624c17/go.mod h1:HjUJr+gw2jebZYFMKc9TNbgwjHsNSo6HUSonhC0u62U= github.com/elastic/elastic-agent-autodiscover v0.6.14 h1:0zJYNyv9GKTOiNqCHqEVboP+WioV73ia17Et+UlFbz8= github.com/elastic/elastic-agent-autodiscover v0.6.14/go.mod h1:39/fHHlnyTK6oUNZfAhxJwBTVahO9tNasEIjzsxGMu8= -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.7 h1:LZdfxbq724Y1zAdE3COp+OIPwU8SquOCLIXpI/twcdQ= -github.com/elastic/elastic-agent-libs v0.9.7/go.mod h1:xhHF9jeWhPzKPtEHN+epKjdiZi0bCbACLxwkp1aHMpc= -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.3 h1:lIhYp/bMZPwmknv5h1mhslErp3Pg9KaMKHu6RK62qoE= -github.com/elastic/elastic-agent-system-metrics v0.9.3/go.mod h1:w9+sf+aNha3DnDjpDAHOlRJsvkzwYQ+xf/ON7P/ArZM= +github.com/elastic/elastic-agent-client/v7 v7.9.0 h1:ryNbISIg4tTRT9KA0MYOa+fxW0CpsF+qxELWWb13rYE= +github.com/elastic/elastic-agent-client/v7 v7.9.0/go.mod h1:/AeiwX9zxG99eUNrLhpApTpwmE71Qwuh4ozObn7a0ss= +github.com/elastic/elastic-agent-libs v0.9.8 h1:fwl3hp0gNmKkuERcUQTwe4cyIK6M0jJkv16EIsB6Apw= +github.com/elastic/elastic-agent-libs v0.9.8/go.mod h1:xhHF9jeWhPzKPtEHN+epKjdiZi0bCbACLxwkp1aHMpc= +github.com/elastic/elastic-agent-system-metrics v0.10.2 h1:AVW+YqgezR0mNOZ80NxPLH3tiYMenNGZ8SC/bIUf4Uc= +github.com/elastic/elastic-agent-system-metrics v0.10.2/go.mod h1:0jJ2ARnzTTOEMmcRX9UNqSwbwguEluE/mK2HaM3GViI= 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.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-docappender/v2 v2.1.2 h1:zkEh+g/CxpJdQR6BqdcApa/A4oRQiiG3iFiIhNCoovs= +github.com/elastic/go-docappender/v2 v2.1.2/go.mod h1:oHi6MsHriWaG8W6T9iyJ/PkEo2+182HIzq+0RRAzzgA= 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= @@ -414,10 +414,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.100.0 h1:tbqttcOXH9NE1pTwL169c/AhFQj08m8R7supR6sntqc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.100.0/go.mod h1:9MD3lmtQGfRjDR1VDrD6CRs6NbQweRVvOmCoBRQWXfw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.100.0 h1:wle0dUPe1FhxJkoJhweM2KNuKDgKW5PMIH8glSVQo0w= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.100.0/go.mod h1:TT9TPkG6Db7J/XEYFgHngP1WKab20jj/PqlT+I0Doy4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.101.0 h1:X+FXRfxLK2mH813tMyZmX93Mt/3l6F8X5aFi7QPBQDI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.101.0/go.mod h1:j/pizzitn+kpiTNTxsgpaGqAW3qh3pRSbSTUsIeQcLE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.101.0 h1:kCxIL6o19XGAx4rh0f3S9CArOJF7PObBkcFHeMOqrGk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.101.0/go.mod h1:Z0ro3CafhFbJLVP3AzMbj3V5y+qAaMTkrMdByBY+xaY= 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= @@ -446,8 +446,8 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkB 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= -github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= 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= @@ -470,8 +470,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.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE= -github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg= +github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= +github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= 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= @@ -554,30 +554,30 @@ go.elastic.co/apm/module/apmhttp/v2 v2.6.0 h1:s8UeNFQmVBCNd4eoz7KDD9rEFhQC0HeUFX 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/module/apmzap/v2 v2.6.0 h1:R/iVORzGu3F9uM43iEVHD0nwiRo59O0bIXdayKsgayQ= +go.elastic.co/apm/module/apmzap/v2 v2.6.0/go.mod h1:B3i/8xRkqLgi6zNuV+Bp7Pt4cutaOObvrVSa7wUTAPw= 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= go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= -go.opentelemetry.io/collector/consumer v0.100.0 h1:8sALAcWvizSyrZJCF+zTqD2RLmZAyeCuaQrNS2q6ti0= -go.opentelemetry.io/collector/consumer v0.100.0/go.mod h1:JOPOq8nSTdnQwc2xdHl4hcuYBYV8gjN2SlFqlqBe/Nc= -go.opentelemetry.io/collector/pdata v1.7.0 h1:/WNsBbE6KM3TTPUb9v/5B7IDqnDkgf8GyFhVJJqu7II= -go.opentelemetry.io/collector/pdata v1.7.0/go.mod h1:ehCBBA5GoFrMZkwyZAKGY/lAVSgZf6rzUt3p9mddmPU= -go.opentelemetry.io/collector/semconv v0.100.0 h1:QArUvWcbmsMjM4PV0zngUHRizZeUXibsPBWjDuNJXAs= -go.opentelemetry.io/collector/semconv v0.100.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= -go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= -go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= -go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= -go.opentelemetry.io/otel/sdk v1.26.0 h1:Y7bumHf5tAiDlRYFmGqetNcLaVUZmh4iYfmGxtmz7F8= -go.opentelemetry.io/otel/sdk v1.26.0/go.mod h1:0p8MXpqLeJ0pzcszQQN4F0S5FVjBLgypeGSngLsmirs= -go.opentelemetry.io/otel/sdk/metric v1.26.0 h1:cWSks5tfriHPdWFnl+qpX3P681aAYqlZHcAyHw5aU9Y= -go.opentelemetry.io/otel/sdk/metric v1.26.0/go.mod h1:ClMFFknnThJCksebJwz7KIyEDHO+nTB6gK8obLy8RyE= -go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= -go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/collector/consumer v0.101.0 h1:9tDxaeHe1+Uovf3fhdx7T4pV5mo/Dc0hniH7O5H3RBA= +go.opentelemetry.io/collector/consumer v0.101.0/go.mod h1:ud5k64on9m7hHTrhjEeLhWbLkd8+Gp06rDt3p86TKNs= +go.opentelemetry.io/collector/pdata v1.8.0 h1:d/QQgZxB4Y+d3mqLVh2ozvzujUhloD3P/fk7X+In764= +go.opentelemetry.io/collector/pdata v1.8.0/go.mod h1:/W7clu0wFC4WSRp94Ucn6Vm36Wkrt+tmtlDb1aiNZCY= +go.opentelemetry.io/collector/semconv v0.101.0 h1:tOe9iTe9dDCnvz/bqgfNRr4w80kXG8505tQJ5h5v08Q= +go.opentelemetry.io/collector/semconv v0.101.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= +go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= 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= @@ -600,8 +600,9 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y 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/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -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/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= 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= @@ -639,8 +640,8 @@ 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.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= 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= @@ -686,16 +687,17 @@ 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/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.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.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -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/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= 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= @@ -703,8 +705,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -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/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -735,15 +738,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-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= 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.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= -google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= 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= @@ -752,8 +755,8 @@ 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.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= -google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/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= diff --git a/internal/beater/beater.go b/internal/beater/beater.go index 93a3d67abc0..c83ee97a00b 100644 --- a/internal/beater/beater.go +++ b/internal/beater/beater.go @@ -52,7 +52,7 @@ import ( agentconfig "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/go-docappender" + "github.com/elastic/go-docappender/v2" "github.com/elastic/go-ucfg" "github.com/elastic/apm-data/model/modelpb" @@ -85,7 +85,6 @@ type Runner struct { rawConfig *agentconfig.C config *config.Config - fleetConfig *config.Fleet outputConfig agentconfig.Namespace elasticsearchOutputConfig *agentconfig.C @@ -113,7 +112,6 @@ func NewRunner(args RunnerParams) (*Runner, error) { var unpackedConfig struct { APMServer *agentconfig.C `config:"apm-server"` Output agentconfig.Namespace `config:"output"` - Fleet *config.Fleet `config:"fleet"` DataStream struct { Namespace string `config:"namespace"` } `config:"data_stream"` @@ -147,7 +145,6 @@ func NewRunner(args RunnerParams) (*Runner, error) { rawConfig: args.Config, config: cfg, - fleetConfig: unpackedConfig.Fleet, outputConfig: unpackedConfig.Output, elasticsearchOutputConfig: elasticsearchOutputConfig, @@ -328,7 +325,7 @@ func (s *Runner) Run(ctx context.Context) error { publishReady := make(chan struct{}) drain := make(chan struct{}) g.Go(func() error { - if err := s.waitReady(ctx, kibanaClient, tracer); err != nil { + if err := s.waitReady(ctx, tracer); err != nil { // One or more preconditions failed; drop events. close(drain) return errors.Wrap(err, "error waiting for server to be ready") @@ -567,7 +564,6 @@ func linearScaledValue(perGBIncrement, memLimitGB, constant float64) int { // waitReady waits until the server is ready to index events. func (s *Runner) waitReady( ctx context.Context, - kibanaClient *kibana.Client, tracer *apm.Tracer, ) error { var preconditions []func(context.Context) error @@ -618,18 +614,6 @@ func (s *Runner) waitReady( }) } - // When running standalone with data streams enabled, by default we will add - // a precondition that ensures the integration is installed. - fleetManaged := s.fleetConfig != nil - if !fleetManaged && s.config.DataStreams.WaitForIntegration { - if kibanaClient == nil && esOutputClient == nil { - return errors.New("cannot wait for integration without either Kibana or Elasticsearch config") - } - preconditions = append(preconditions, func(ctx context.Context) error { - return checkIntegrationInstalled(ctx, kibanaClient, esOutputClient, s.logger) - }) - } - if len(preconditions) == 0 { return nil } @@ -795,6 +779,9 @@ func docappenderConfig( "docappender.DocumentBufferSize", opts.DocumentBufferSize, memLimit, ) if opts.MaxRequests > 0 { + logger.Infof("docappender.MaxRequests set to %d based on config value", + opts.MaxRequests, + ) return opts } // This formula yields the following max requests for APM Server sized: diff --git a/internal/beater/beatertest/output.go b/internal/beater/beatertest/output.go index 728c9ad6814..6a5f3df125e 100644 --- a/internal/beater/beatertest/output.go +++ b/internal/beater/beatertest/output.go @@ -31,7 +31,7 @@ import ( "github.com/elastic/beats/v7/libbeat/publisher" agentconfig "github.com/elastic/elastic-agent-libs/config" - "github.com/elastic/go-docappender/docappendertest" + "github.com/elastic/go-docappender/v2/docappendertest" ) // ElasticsearchOutputConfig returns "output.elasticsearch" configuration diff --git a/internal/beater/beatertest/server.go b/internal/beater/beatertest/server.go index bab5f02de49..9fc64c8fdf0 100644 --- a/internal/beater/beatertest/server.go +++ b/internal/beater/beatertest/server.go @@ -86,10 +86,6 @@ func NewUnstartedServer(t testing.TB, opts ...option) *Server { config: []*agentconfig.C{agentconfig.MustNewConfigFrom(map[string]interface{}{ "apm-server": map[string]interface{}{ "host": "localhost:0", - - // Disable waiting for integration to be installed by default, - // to simplify tests. This feature is tested independently. - "data_streams.wait_for_integration": false, }, })}, } @@ -206,7 +202,6 @@ type option func(*options) // // apm-server: // host: localhost:0 -// data_streams.wait_for_integration: false func WithConfig(cfg ...*agentconfig.C) option { return func(opts *options) { opts.config = append(opts.config, cfg...) diff --git a/internal/beater/checkintegration.go b/internal/beater/checkintegration.go deleted file mode 100644 index f0fe62ebc59..00000000000 --- a/internal/beater/checkintegration.go +++ /dev/null @@ -1,146 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package beater - -import ( - "bytes" - "context" - "encoding/json" - "fmt" - "io" - "net/http" - - "github.com/pkg/errors" - "golang.org/x/sync/errgroup" - - "github.com/elastic/elastic-agent-libs/logp" - - "github.com/elastic/apm-server/internal/elasticsearch" - "github.com/elastic/apm-server/internal/kibana" - "github.com/elastic/go-elasticsearch/v8/esapi" -) - -// checkIntegrationInstalled checks if the APM integration is installed by querying Kibana -// and/or Elasticsearch, returning nil if and only if it is installed. -func checkIntegrationInstalled( - ctx context.Context, - kibanaClient *kibana.Client, - esClient *elasticsearch.Client, - logger *logp.Logger, -) (err error) { - defer func() { - if err != nil { - // We'd like to include some remediation actions when the APM Integration isn't installed. - err = &actionableError{ - Err: err, - Name: "apm integration installed", - Remediation: "please install the apm integration: https://ela.st/apm-integration-quickstart", - } - } - }() - if kibanaClient != nil { - installed, err := checkIntegrationInstalledKibana(ctx, kibanaClient, logger) - if err != nil { - // We only return the Kibana error if we have no Elasticsearch client, - // as we may not have sufficient privileges to query the Fleet API. - if esClient == nil { - return fmt.Errorf("error querying Kibana for integration package status: %w", err) - } - } else if !installed { - // We were able to query Kibana, but the package is not yet installed. - // We should continue querying the package status via Kibana, as it is - // more authoritative than checking for index template installation. - return errors.New("integration package not yet installed") - } - // Fall through and query Elasticsearch (if we have a client). Kibana may prematurely - // report packages as installed: https://github.com/elastic/kibana/issues/108649 - } - if esClient != nil { - installed, err := checkIntegrationInstalledElasticsearch(ctx, esClient, logger) - if err != nil { - return fmt.Errorf("error querying Elasticsearch for integration index templates: %w", err) - } else if !installed { - return errors.New("integration index templates not installed") - } - } - return nil -} - -// checkIntegrationInstalledKibana checks if the APM integration package -// is installed by querying Kibana. -func checkIntegrationInstalledKibana(ctx context.Context, kibanaClient *kibana.Client, logger *logp.Logger) (bool, error) { - resp, err := kibanaClient.Send(ctx, "GET", "/api/fleet/epm/packages/apm", nil, nil, nil) - if err != nil { - return false, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - body, _ := io.ReadAll(resp.Body) - return false, fmt.Errorf("unexpected HTTP status: %s (%s)", resp.Status, bytes.TrimSpace(body)) - } - var result struct { - Response struct { - Status string `json:"status"` - } `json:"response"` - } - if err := json.NewDecoder(resp.Body).Decode(&result); err != nil { - return false, errors.Wrap(err, "error decoding integration package response") - } - logger.Infof("integration package status: %s", result.Response.Status) - return result.Response.Status == "installed", nil -} - -func checkIntegrationInstalledElasticsearch(ctx context.Context, esClient *elasticsearch.Client, _ *logp.Logger) (bool, error) { - // TODO(axw) generate the list of expected index templates. - templates := []string{ - "traces-apm", - "traces-apm.sampled", - "metrics-apm.app", - "metrics-apm.internal", - "logs-apm.error", - } - for _, intervals := range []string{"1m", "10m", "60m"} { - for _, ds := range []string{"metrics-apm.transaction", "metrics-apm.service_transaction", "metrics-apm.service_destination", "metrics-apm.service_summary"} { - templates = append(templates, fmt.Sprintf("%s.%s", ds, intervals)) - } - } - // IndicesGetIndexTemplateRequest accepts a slice of template names, - // but the REST API expects just one index template name. Query them - // in parallel. - g, ctx := errgroup.WithContext(ctx) - for _, template := range templates { - template := template // copy for closure - g.Go(func() error { - req := esapi.IndicesGetIndexTemplateRequest{Name: template} - resp, err := req.Do(ctx, esClient) - if err != nil { - return err - } - defer resp.Body.Close() - - if resp.IsError() { - body, _ := io.ReadAll(resp.Body) - return fmt.Errorf("unexpected HTTP status: %s (%s)", resp.Status(), bytes.TrimSpace(body)) - } - return nil - }) - } - err := g.Wait() - return err == nil, err -} diff --git a/internal/beater/config/config_test.go b/internal/beater/config/config_test.go index ed99f0caea1..9b136f95b72 100644 --- a/internal/beater/config/config_test.go +++ b/internal/beater/config/config_test.go @@ -370,8 +370,7 @@ func TestUnpackConfig(t *testing.T) { }, DefaultServiceEnvironment: "overridden", DataStreams: DataStreamsConfig{ - Namespace: "default", - WaitForIntegration: true, + Namespace: "default", }, WaitReadyInterval: 5 * time.Second, }, @@ -419,8 +418,7 @@ func TestUnpackConfig(t *testing.T) { "storage_limit": "1GB", }, "data_streams": map[string]interface{}{ - "namespace": "foo", - "wait_for_integration": false, + "namespace": "foo", }, }, outCfg: &Config{ @@ -503,8 +501,7 @@ func TestUnpackConfig(t *testing.T) { }, }, DataStreams: DataStreamsConfig{ - Namespace: "foo", - WaitForIntegration: false, + Namespace: "foo", }, WaitReadyInterval: 5 * time.Second, }, diff --git a/internal/beater/config/data_streams.go b/internal/beater/config/data_streams.go index 0a0456eaa4c..0dbc6d53267 100644 --- a/internal/beater/config/data_streams.go +++ b/internal/beater/config/data_streams.go @@ -20,21 +20,10 @@ package config // DataStreamsConfig holds data streams configuration. type DataStreamsConfig struct { Namespace string `config:"namespace"` - - // WaitForIntegration controls whether APM Server waits for the Fleet - // integration package to be installed before indexing events. - // - // This config is ignored when running under Elastic Agent; it is intended - // for running APM Server standalone, relying on Fleet to install the integration - // for creating Elasticsearch index templates, ILM policies, and ingest pipelines. - // - // This configuration requires either a connection to Kibana or Elasticsearch. - WaitForIntegration bool `config:"wait_for_integration"` } func defaultDataStreamsConfig() DataStreamsConfig { return DataStreamsConfig{ - Namespace: "default", - WaitForIntegration: true, + Namespace: "default", } } diff --git a/internal/beater/config/fleet.go b/internal/beater/config/fleet.go deleted file mode 100644 index 3b584fe3b08..00000000000 --- a/internal/beater/config/fleet.go +++ /dev/null @@ -1,30 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package config - -import ( - "github.com/elastic/elastic-agent-libs/transport/tlscommon" -) - -// Fleet holds configuration required for communicating with fleet-server. -type Fleet struct { - Hosts []string `config:"hosts"` - Protocol string `config:"protocol"` - AccessAPIKey string `config:"access_api_key"` - TLS *tlscommon.Config `config:"ssl"` -} diff --git a/internal/beater/processors.go b/internal/beater/processors.go index 02acc59b351..65e8b07daa0 100644 --- a/internal/beater/processors.go +++ b/internal/beater/processors.go @@ -32,7 +32,7 @@ import ( "github.com/elastic/apm-server/internal/beater/auth" "github.com/elastic/apm-server/internal/beater/ratelimit" "github.com/elastic/apm-server/internal/version" - "github.com/elastic/go-docappender" + "github.com/elastic/go-docappender/v2" ) const ( diff --git a/internal/beater/server_test.go b/internal/beater/server_test.go index 5f3cd4abe6a..4540f45f368 100644 --- a/internal/beater/server_test.go +++ b/internal/beater/server_test.go @@ -28,12 +28,10 @@ import ( "net/http/httptest" "net/url" "os" - "path" "path/filepath" "reflect" "runtime" "strings" - "sync/atomic" "testing" "time" @@ -329,180 +327,18 @@ func TestServerOTLPGRPC(t *testing.T) { assert.NoError(t, err) } -func TestServerWaitForIntegrationKibana(t *testing.T) { - var requests int64 - requestCh := make(chan struct{}) - mux := http.NewServeMux() - mux.HandleFunc("/api/status", func(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(`{"version":{"number":"1.2.3"}}`)) - }) - mux.HandleFunc("/api/fleet/epm/packages/apm", func(w http.ResponseWriter, r *http.Request) { - switch atomic.AddInt64(&requests, 1) { - case 1: - w.WriteHeader(500) - case 2: - fmt.Fprintln(w, `{"response":{"status":"not_installed"}}`) - case 3: - fmt.Fprintln(w, `{"response":{"status":"installed"}}`) - } - select { - case requestCh <- struct{}{}: - case <-r.Context().Done(): - } - }) - kibanaServer := httptest.NewServer(mux) - defer kibanaServer.Close() - - srv := beatertest.NewServer(t, beatertest.WithConfig(agentconfig.MustNewConfigFrom(map[string]interface{}{ - "apm-server": map[string]interface{}{ - "wait_ready_interval": "100ms", - "kibana.enabled": true, - "kibana.host": kibanaServer.URL, - "data_streams.wait_for_integration": true, - }, - }))) - - timeout := time.After(10 * time.Second) - for i := 0; i < 3; i++ { - select { - case <-requestCh: - case <-timeout: - t.Fatal("timed out waiting for request") - } - } - - // TODO(axw) there _should_ be just 2 logs, but there might be an initial - // log message due to the Kibana client connecting asynchronously. We should - // update internal/kibana to remove the async behaviour. - logs := srv.Logs.FilterMessageSnippet("please install the apm integration") - assert.NotZero(t, logs.Len()) - - select { - case <-requestCh: - t.Fatal("unexpected request") - case <-time.After(50 * time.Millisecond): - } -} - -func TestServerWaitForIntegrationElasticsearch(t *testing.T) { - var tracesRequests atomic.Int64 - tracesRequestsCh := make(chan int, 2) - bulkCh := make(chan struct{}, 2) - mux := http.NewServeMux() - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("X-Elastic-Product", "Elasticsearch") - // We must send a valid JSON response for the libbeat - // elasticsearch client to send bulk requests. - fmt.Fprintln(w, `{"version":{"number":"1.2.3"}}`) - }) - mux.HandleFunc("/_index_template/", func(w http.ResponseWriter, r *http.Request) { - template := path.Base(r.URL.Path) - if template == "traces-apm" { - count := tracesRequests.Add(1) - if count == 1 { - w.WriteHeader(404) - } - tracesRequestsCh <- int(count) - } - }) - mux.HandleFunc("/_bulk", func(w http.ResponseWriter, r *http.Request) { - select { - case bulkCh <- struct{}{}: - default: - } - }) - elasticsearchServer := httptest.NewServer(mux) - defer elasticsearchServer.Close() - - srv := beatertest.NewServer(t, beatertest.WithConfig(agentconfig.MustNewConfigFrom(map[string]interface{}{ - "apm-server": map[string]interface{}{ - "wait_ready_interval": "100ms", - "data_streams.wait_for_integration": true, - }, - "output.elasticsearch": map[string]interface{}{ - "hosts": []string{elasticsearchServer.URL}, - "backoff": map[string]interface{}{"init": "10ms", "max": "10ms"}, - "max_retries": 1000, - "flush_interval": "1ms", - }, - }))) - - // Send some events to the server. They should be accepted and enqueued. - req := makeTransactionRequest(t, srv.URL) - req.Header.Add("Content-Type", "application/x-ndjson") - resp, err := srv.Client.Do(req) - assert.NoError(t, err) - assert.Equal(t, http.StatusAccepted, resp.StatusCode) - resp.Body.Close() - - // Healthcheck should report that the server is not publish-ready. - resp, err = srv.Client.Get(srv.URL + api.RootPath) - require.NoError(t, err) - out := decodeJSONMap(t, resp.Body) - resp.Body.Close() - assert.Equal(t, false, out["publish_ready"]) - - // Indexing should be blocked until we receive from tracesRequestsCh. - select { - case <-bulkCh: - t.Fatal("unexpected bulk request") - case <-time.After(50 * time.Millisecond): - } - - timeout := time.After(10 * time.Second) - var done bool - for !done { - select { - case n := <-tracesRequestsCh: - done = n == 2 - case <-timeout: - t.Fatal("timed out waiting for request") - } - } - - // libbeat should keep retrying, and finally succeed now it is unblocked. - select { - case <-bulkCh: - case <-time.After(10 * time.Second): - t.Fatal("timed out waiting for bulk request") - } - - logs := srv.Logs.FilterMessageSnippet("please install the apm integration") - assert.Len(t, logs.All(), 1, "couldn't find remediation message logs") - - // Healthcheck should now report that the server is publish-ready. - resp, err = srv.Client.Get(srv.URL + api.RootPath) - require.NoError(t, err) - out = decodeJSONMap(t, resp.Body) - resp.Body.Close() - assert.Equal(t, true, out["publish_ready"]) -} - func TestServerFailedPreconditionDoesNotIndex(t *testing.T) { bulkCh := make(chan struct{}, 1) - mux := http.NewServeMux() - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("X-Elastic-Product", "Elasticsearch") - // We must send a valid JSON response for the libbeat - // elasticsearch client to send bulk requests. - fmt.Fprintln(w, `{"version":{"number":"1.2.3"}}`) - }) - mux.HandleFunc("/_index_template/", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(404) - }) - mux.HandleFunc("/_bulk", func(w http.ResponseWriter, r *http.Request) { - select { - case bulkCh <- struct{}{}: - default: - } - }) - elasticsearchServer := httptest.NewServer(mux) + elasticsearchServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // When apm-server starts up it will request the Elasticsearch + // cluster UUID, and will not index anything until this is done. + http.Error(w, "server misbehaving", http.StatusInternalServerError) + })) defer elasticsearchServer.Close() srv := beatertest.NewServer(t, beatertest.WithConfig(agentconfig.MustNewConfigFrom(map[string]interface{}{ "apm-server": map[string]interface{}{ - "wait_ready_interval": "100ms", - "data_streams.wait_for_integration": true, + "wait_ready_interval": "100ms", }, "output.elasticsearch.hosts": []string{elasticsearchServer.URL}, }))) diff --git a/internal/elasticsearch/config.go b/internal/elasticsearch/config.go index 8b9e6a423eb..c61ee7c95e1 100644 --- a/internal/elasticsearch/config.go +++ b/internal/elasticsearch/config.go @@ -147,8 +147,8 @@ func NewHTTPTransport(cfg *Config) (*http.Transport, error) { tlsDialer := transport.TLSDialer(dialer, tlsConfig, cfg.Timeout) return &http.Transport{ Proxy: proxy, - Dial: dialer.Dial, - DialTLS: tlsDialer.Dial, + DialContext: dialer.DialContext, + DialTLSContext: tlsDialer.DialContext, TLSClientConfig: tlsConfig.ToConfig(), MaxIdleConnsPerHost: cfg.MaxIdleConnsPerHost, }, nil diff --git a/packaging.mk b/packaging.mk index 0492993d131..91c2f987b4b 100644 --- a/packaging.mk +++ b/packaging.mk @@ -31,19 +31,39 @@ DOCKER_IMAGES := \ build/docker/apm-server-ubi-$(APM_SERVER_VERSION).txt \ build/docker/apm-server-ubi-$(APM_SERVER_VERSION)-SNAPSHOT.txt +# If GENERATE_CHAINGUARD_IMAGES is set then generate chainguard docker images. +ifdef GENERATE_CHAINGUARD_IMAGES +DOCKER_IMAGES := $(DOCKER_IMAGES) \ + build/docker/apm-server-chainguard-$(APM_SERVER_VERSION).txt \ + build/docker/apm-server-chainguard-$(APM_SERVER_VERSION)-SNAPSHOT.txt +endif + build/docker/%.txt: DOCKER_IMAGE_TAG := docker.elastic.co/apm/apm-server:% build/docker/%.txt: VERSION := $(APM_SERVER_VERSION) +build/docker/%.txt: DOCKER_FILE_ARGS := -f packaging/docker/Dockerfile build/docker/%-SNAPSHOT.txt: VERSION := $(APM_SERVER_VERSION)-SNAPSHOT build/docker/apm-server-ubi-%.txt: DOCKER_BUILD_ARGS+=--build-arg BASE_IMAGE=docker.elastic.co/ubi9/ubi-minimal +build/docker/apm-server-chainguard-%.txt: DOCKER_FILE_ARGS := -f packaging/docker/Dockerfile.chainguard + +INTERNAL_DOCKER_IMAGE := docker.elastic.co/observability-ci/apm-server-internal .PHONY: $(DOCKER_IMAGES) $(DOCKER_IMAGES): @mkdir -p $(@D) - 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 build --iidfile="$(@)" \ + --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ + --build-arg VERSION=$(VERSION) \ + $(DOCKER_BUILD_ARGS) \ + --tag $(INTERNAL_DOCKER_IMAGE):$(VERSION)$(if $(findstring arm64,$(GOARCH)),-arm64)$(if $(findstring chainguard,$(@)),-chainguard) \ + $(DOCKER_FILE_ARGS) . + +# Docker image tarballs. We distribute UBI Docker images only for AMD64. DOCKER_IMAGE_SUFFIX := docker-image$(if $(findstring arm64,$(GOARCH)),-arm64).tar.gz DOCKER_IMAGE_PREFIXES := apm-server $(if $(findstring amd64,$(GOARCH)), apm-server-ubi) +# If GENERATE_CHAINGUARD_IMAGES is set then generate chainguard docker images. +ifdef GENERATE_CHAINGUARD_IMAGES +DOCKER_IMAGE_PREFIXES := $(DOCKER_IMAGE_PREFIXES) apm-server-chainguard +endif DOCKER_IMAGE_RELEASE_TARBALLS := $(patsubst %, $(DISTDIR)/%-$(APM_SERVER_VERSION)-$(DOCKER_IMAGE_SUFFIX), $(DOCKER_IMAGE_PREFIXES)) DOCKER_IMAGE_SNAPSHOT_TARBALLS := $(patsubst %, $(DISTDIR)/%-$(APM_SERVER_VERSION)-SNAPSHOT-$(DOCKER_IMAGE_SUFFIX), $(DOCKER_IMAGE_PREFIXES)) @@ -186,7 +206,10 @@ build/dependencies-$(APM_SERVER_VERSION)-SNAPSHOT.csv: build/dependencies-$(APM_ cp $< $@ package-docker: $(DOCKER_IMAGE_RELEASE_TARBALLS) + @echo ">> $(DOCKER_IMAGE_RELEASE_TARBALLS)" + package-docker-snapshot: $(DOCKER_IMAGE_SNAPSHOT_TARBALLS) + @echo ">> $(DOCKER_IMAGE_SNAPSHOT_TARBALLS)" package: \ package-docker \ @@ -200,3 +223,6 @@ package-snapshot: \ $(DOCKER_IMAGE_SNAPSHOT_TARBALLS) \ $(DISTDIR)/apm-server-ironbank-$(APM_SERVER_VERSION)-SNAPSHOT-docker-build-context.tar.gz \ build/dependencies-$(APM_SERVER_VERSION)-SNAPSHOT.csv + +publish-docker-images: + docker push --all-tags $(INTERNAL_DOCKER_IMAGE) diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index f66bf8ef006..22b6c48db74 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,24 +1,31 @@ ARG BASE_IMAGE=ubuntu:22.04 ARG GOLANG_VERSION +################################################################################ +# Build stage 0 # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. +################################################################################ FROM golang:${GOLANG_VERSION} as builder WORKDIR /src -COPY go.mod go.sum /src/ +COPY go.mod go.sum .go-version /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod RUN --mount=type=cache,target=/go/pkg/mod go mod download -COPY Makefile *.mk /src +COPY Makefile *.mk /src/ COPY cmd /src/cmd COPY internal /src/internal COPY x-pack /src/x-pack COPY .git /src/.git +COPY script /src/script -ENV GOROOT /usr/local/go RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ make apm-server +################################################################################ +# Build stage 1 +# Copy prepared files from the previous stage and complete the image. +################################################################################ FROM ${BASE_IMAGE} ARG TARGETARCH ARG BUILD_DATE diff --git a/packaging/docker/Dockerfile.chainguard b/packaging/docker/Dockerfile.chainguard new file mode 100644 index 00000000000..ddd0b22ff68 --- /dev/null +++ b/packaging/docker/Dockerfile.chainguard @@ -0,0 +1,2 @@ +FROM docker.elastic.co/wolfi/chainguard-base:20230214 +RUN echo 'TBC' \ No newline at end of file diff --git a/systemtest/apmservertest/config.go b/systemtest/apmservertest/config.go index 48253f332b5..77bd71d2ae3 100644 --- a/systemtest/apmservertest/config.go +++ b/systemtest/apmservertest/config.go @@ -46,7 +46,6 @@ type Config struct { Kibana *KibanaConfig `json:"apm-server.kibana,omitempty"` Sampling *SamplingConfig `json:"apm-server.sampling,omitempty"` RUM *RUMConfig `json:"apm-server.rum,omitempty"` - WaitForIntegration *bool `json:"apm-server.data_streams.wait_for_integration,omitempty"` DefaultServiceEnvironment string `json:"apm-server.default_service_environment,omitempty"` AgentConfig *AgentConfig `json:"apm-server.agent.config,omitempty"` TLS *TLSConfig `json:"apm-server.ssl,omitempty"` diff --git a/systemtest/approvals/TestAgentConfig.approved.json b/systemtest/approvals/TestAgentConfig.approved.json index 561791606c4..7594040f587 100644 --- a/systemtest/approvals/TestAgentConfig.approved.json +++ b/systemtest/approvals/TestAgentConfig.approved.json @@ -21,6 +21,9 @@ "metricset.name": [ "agent_config" ], + "metricset.name.text": [ + "agent_config" + ], "observer.hostname": [ "dynamic" ], @@ -56,6 +59,9 @@ "metricset.name": [ "agent_config" ], + "metricset.name.text": [ + "agent_config" + ], "observer.hostname": [ "dynamic" ], diff --git a/systemtest/approvals/TestApprovedMetrics.approved.json b/systemtest/approvals/TestApprovedMetrics.approved.json index 3ee806a691b..e2e0622a7dd 100644 --- a/systemtest/approvals/TestApprovedMetrics.approved.json +++ b/systemtest/approvals/TestApprovedMetrics.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -33,6 +36,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -54,12 +60,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -83,6 +98,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -104,6 +122,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -125,12 +146,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.memory.mem.limit.bytes": [ 2048 ], @@ -160,6 +190,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -181,6 +214,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -202,12 +238,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.cpu.cfs.period.us": [ 1024 ], @@ -255,6 +300,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -290,6 +338,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -311,12 +362,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -340,6 +400,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -359,10 +422,10 @@ true ], "faas.coldstart_duration": [ - 422.97 + 422.9700012207031 ], "faas.duration": [ - 182.43 + 182.42999267578125 ], "faas.execution": [ "6f7f0961f83442118a7af6fe80b88d56" @@ -382,6 +445,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -403,12 +469,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.memory.actual.free": [ 54525952 ], @@ -438,6 +513,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -465,6 +543,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -489,12 +570,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "span.self_time.count": [ 1 ], @@ -510,6 +600,9 @@ "transaction.name": [ "GET /" ], + "transaction.name.text": [ + "GET /" + ], "transaction.type": [ "request" ], diff --git a/systemtest/approvals/TestCompressedSpans.approved.json b/systemtest/approvals/TestCompressedSpans.approved.json index cec7f4a25f1..9dfdea38e64 100644 --- a/systemtest/approvals/TestCompressedSpans.approved.json +++ b/systemtest/approvals/TestCompressedSpans.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -36,6 +39,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -66,18 +72,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -108,6 +126,9 @@ "span.name": [ "Calls to redis" ], + "span.name.text": [ + "Calls to redis" + ], "span.representative_count": [ 1 ], @@ -131,6 +152,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -161,6 +185,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -191,18 +218,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -233,6 +272,9 @@ "span.name": [ "_bulk" ], + "span.name.text": [ + "_bulk" + ], "span.representative_count": [ 1 ], diff --git a/systemtest/approvals/TestDropUnsampled.approved.json b/systemtest/approvals/TestDropUnsampled.approved.json index af28a6a95dd..2b5fd5f2544 100644 --- a/systemtest/approvals/TestDropUnsampled.approved.json +++ b/systemtest/approvals/TestDropUnsampled.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -36,6 +39,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -63,18 +69,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -119,6 +137,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -152,6 +173,9 @@ "service.name": [ "allowed" ], + "service.name.text": [ + "allowed" + ], "source.ip": [ "127.0.0.1" ], @@ -185,9 +209,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestErrorIngest.approved.json b/systemtest/approvals/TestErrorIngest.approved.json index 3d73033b329..c542da40e12 100644 --- a/systemtest/approvals/TestErrorIngest.approved.json +++ b/systemtest/approvals/TestErrorIngest.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -21,6 +24,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -30,6 +36,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -39,6 +48,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -48,6 +60,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -87,6 +102,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -96,9 +114,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -142,24 +166,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -181,6 +220,9 @@ "transaction.name": [ "mytx" ], + "transaction.name.text": [ + "mytx" + ], "transaction.sampled": [ true ], diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index 466be37c138..f34d403c731 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -36,6 +39,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -45,6 +51,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -54,6 +63,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -63,6 +75,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -78,23 +93,6 @@ "error.culprit": [ "my.module.function_name" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -110,71 +108,8 @@ "error.exception.module": [ "__builtins__" ], - "error.exception.stacktrace": [ - { - "classname": "BaseClass", - "exclude_from_grouping": false - }, - { - "abs_path": "/real/file/name.py", - "classname": "RName", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "file/name.py", - "function": "foo", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "App::MyModule", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}", - "}", - "", - "Instrumentation.prototype._recoverTransaction = function (trans) {", - " if (this.currentTransaction === trans) return" - ], - "pre": [ - " var trans = this.currentTransaction", - "", - " return instrumented", - "", - " function instrumented () {", - " var prev = ins.currentTransaction", - " ins.currentTransaction = trans" - ] - }, - "exclude_from_grouping": false, - "filename": "lib/instrumentation/index.js", - "function": "instrumented", - "line": { - "context": " var result = original.apply(this, arguments)", - "number": 102 - }, - "vars": { - "key": "value" - } - } + "error.exception.parent": [ + 1 ], "error.exception.type": [ "DbError", @@ -203,71 +138,6 @@ "error.log.param_message": [ "My service could not talk to the database named %s" ], - "error.log.stacktrace": [ - { - "classname": "User::Common", - "exclude_from_grouping": false - }, - { - "abs_path": "/real/file/name.py", - "classname": "Webpack::File::Name", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "/webpack/file/name.py", - "function": "foo", - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "App::MyModule", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}", - "}", - "", - "Instrumentation.prototype._recoverTransaction = function (trans) {", - " if (this.currentTransaction === trans) return" - ], - "pre": [ - " var trans = this.currentTransaction", - "", - " return instrumented", - "", - " function instrumented () {", - " var prev = ins.currentTransaction", - " ins.currentTransaction = trans" - ] - }, - "exclude_from_grouping": false, - "filename": "lib/instrumentation/index.js", - "function": "instrumented", - "line": { - "context": " var result = original.apply(this, arguments)", - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "x64" ], @@ -280,42 +150,38 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": "Hello World" - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -326,8 +192,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -344,9 +214,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -390,24 +266,39 @@ "service.framework.name": [ "Node" ], + "service.framework.name.text": [ + "Node" + ], "service.framework.version": [ "1" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "1.2" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-xyz" ], + "service.node.name.text": [ + "node-xyz" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -462,9 +353,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Other" ], + "user_agent.name.text": [ + "Other" + ], "user_agent.original": [ "Mozilla Chrome Edge" ], @@ -485,6 +382,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -494,6 +394,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -503,6 +406,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -512,6 +418,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -521,6 +430,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -557,6 +469,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -566,9 +481,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -609,24 +530,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -665,6 +601,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -674,6 +613,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -683,6 +625,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -692,6 +637,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -701,6 +649,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -725,12 +676,6 @@ "error.log.message": [ "no user found" ], - "error.log.stacktrace": [ - { - "classname": "User::Special", - "exclude_from_grouping": false - } - ], "host.architecture": [ "x64" ], @@ -743,6 +688,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -752,9 +700,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -795,24 +749,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -851,6 +820,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.1.3" ], @@ -860,6 +832,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -869,6 +844,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -878,6 +856,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -887,6 +868,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -920,6 +904,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -929,9 +916,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -972,24 +965,39 @@ "service.framework.name": [ "Rails" ], + "service.framework.name.text": [ + "Rails" + ], "service.framework.version": [ "5.0" ], "service.language.name": [ "ruby" ], + "service.language.name.text": [ + "ruby" + ], "service.language.version": [ "2.5" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "cruby" ], + "service.runtime.name.text": [ + "cruby" + ], "service.runtime.version": [ "2.5" ], @@ -1031,6 +1039,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1040,6 +1051,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1049,6 +1063,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1058,6 +1075,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1067,6 +1087,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1106,6 +1129,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -1115,9 +1141,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1161,24 +1193,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1200,6 +1247,9 @@ "transaction.name": [ "mytx" ], + "transaction.name.text": [ + "mytx" + ], "transaction.sampled": [ true ], diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json index fbd00d97448..dc21fa8e33a 100644 --- a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json +++ b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -30,23 +33,6 @@ "error.culprit": [ "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -62,44 +48,8 @@ "error.exception.module": [ "org.springframework.http.client" ], - "error.exception.stacktrace": [ - { - "abs_path": "/tmp/AbstractPlainSocketImpl.java", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "AbstractPlainSocketImpl.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "AbstractClientHttpRequest.java", - "function": "execute", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } + "error.exception.parent": [ + 1 ], "error.exception.type": [ "java.net.UnknownHostException", @@ -128,47 +78,6 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], - "error.log.stacktrace": [ - { - "abs_path": "/tmp/Socket.java", - "classname": "Request::Socket", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "Socket.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", - "exclude_from_grouping": false, - "filename": "SimpleBufferingClientHttpRequest.java", - "function": "executeInternal", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "amd64" ], @@ -181,41 +90,37 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": "HelloWorld" - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Content-Length": [ - "0" - ], - "http.request.headers.Cookie": [ - "c1=v1", - "c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "http.request.headers.Forwarded": [ - "for=192.168.0.1" - ], - "http.request.headers.Host": [ - "opbeans-java:3000" + "http.request.headers": [ + { + "Content-Length": [ + "0" + ], + "Cookie": [ + "c1=v1", + "c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" + ], + "Host": [ + "opbeans-java:3000" + ] + } ], "http.request.method": [ "POST" @@ -223,8 +128,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -241,9 +150,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -298,24 +213,39 @@ "service.framework.name": [ "Node" ], + "service.framework.name.text": [ + "Node" + ], "service.framework.version": [ "1" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "1.2" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-xyz" ], + "service.node.name.text": [ + "node-xyz" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index e03a5c1f8ea..e1d4848c822 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -33,23 +36,6 @@ "error.culprit": [ "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -65,44 +51,8 @@ "error.exception.module": [ "org.springframework.http.client" ], - "error.exception.stacktrace": [ - { - "abs_path": "/tmp/AbstractPlainSocketImpl.java", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "AbstractPlainSocketImpl.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "AbstractClientHttpRequest.java", - "function": "execute", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } + "error.exception.parent": [ + 1 ], "error.exception.type": [ "java.net.UnknownHostException", @@ -131,47 +81,6 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], - "error.log.stacktrace": [ - { - "abs_path": "/tmp/Socket.java", - "classname": "Request::Socket", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "Socket.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", - "exclude_from_grouping": false, - "filename": "SimpleBufferingClientHttpRequest.java", - "function": "executeInternal", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "amd64" ], @@ -184,41 +93,37 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": "HelloWorld" - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Content-Length": [ - "0" - ], - "http.request.headers.Cookie": [ - "c1=v1", - "c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "http.request.headers.Forwarded": [ - "for=192.168.0.1" - ], - "http.request.headers.Host": [ - "opbeans-java:3000" + "http.request.headers": [ + { + "Content-Length": [ + "0" + ], + "Cookie": [ + "c1=v1", + "c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" + ], + "Host": [ + "opbeans-java:3000" + ] + } ], "http.request.method": [ "POST" @@ -226,8 +131,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -244,9 +153,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -301,24 +216,39 @@ "service.framework.name": [ "Node" ], + "service.framework.name.text": [ + "Node" + ], "service.framework.version": [ "1" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "1.2" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-xyz" ], + "service.node.name.text": [ + "node-xyz" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -402,6 +332,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -429,6 +362,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -438,9 +374,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -456,6 +398,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -495,24 +440,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -534,6 +494,9 @@ "transaction.name": [ "GET/" ], + "transaction.name.text": [ + "GET/" + ], "transaction.type": [ "request" ] @@ -551,6 +514,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0-SNAPSHOT" ], @@ -584,6 +550,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -596,8 +565,12 @@ "http.response.encoded_body_size": [ 356 ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.status_code": [ 302 @@ -611,9 +584,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -662,24 +641,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "opbeans-java-1" ], + "service.name.text": [ + "opbeans-java-1" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -701,6 +695,9 @@ "span.db.user.name": [ "postgres" ], + "span.db.user.name.text": [ + "postgres" + ], "span.duration.us": [ 3781 ], @@ -710,34 +707,12 @@ "span.name": [ "GET users-authenticated" ], + "span.name.text": [ + "GET users-authenticated" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "exclude_from_grouping": false, - "filename": "DispatcherServlet.java", - "line": { - "number": 547 - } - }, - { - "abs_path": "/tmp/AbstractView.java", - "exclude_from_grouping": false, - "filename": "AbstractView.java", - "function": "render", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "org.springframework.web.servlet.view", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "http" ], @@ -776,6 +751,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0-SNAPSHOT" ], @@ -824,44 +802,34 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additionalinformation" - }, - "string": "helloworld" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", - "MozillaChromeEdge" + "http.request.headers": [ + { + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" + ], + "User-Agent": [ + "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", + "MozillaChromeEdge" + ] + } ], "http.request.method": [ "POST" @@ -875,8 +843,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -896,9 +868,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -950,24 +928,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "experimental-java" ], + "service.name.text": [ + "experimental-java" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -986,19 +979,6 @@ "trace.id": [ "0acd456789abcdef0123456789abcdef" ], - "transaction.custom": [ - { - "(": "notavalidregexandthatisfine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], "transaction.duration.us": [ 32592 ], @@ -1074,9 +1054,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Chrome" ], + "user_agent.name.text": [ + "Chrome" + ], "user_agent.original": [ "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36, MozillaChromeEdge" ], diff --git a/systemtest/approvals/TestIntake/Metricsets.approved.json b/systemtest/approvals/TestIntake/Metricsets.approved.json index 3ee806a691b..e2e0622a7dd 100644 --- a/systemtest/approvals/TestIntake/Metricsets.approved.json +++ b/systemtest/approvals/TestIntake/Metricsets.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -33,6 +36,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -54,12 +60,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -83,6 +98,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -104,6 +122,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -125,12 +146,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.memory.mem.limit.bytes": [ 2048 ], @@ -160,6 +190,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -181,6 +214,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -202,12 +238,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.cpu.cfs.period.us": [ 1024 ], @@ -255,6 +300,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -290,6 +338,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -311,12 +362,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -340,6 +400,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -359,10 +422,10 @@ true ], "faas.coldstart_duration": [ - 422.97 + 422.9700012207031 ], "faas.duration": [ - 182.43 + 182.42999267578125 ], "faas.execution": [ "6f7f0961f83442118a7af6fe80b88d56" @@ -382,6 +445,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -403,12 +469,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.memory.actual.free": [ 54525952 ], @@ -438,6 +513,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -465,6 +543,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -489,12 +570,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "span.self_time.count": [ 1 ], @@ -510,6 +600,9 @@ "transaction.name": [ "GET /" ], + "transaction.name.text": [ + "GET /" + ], "transaction.type": [ "request" ], diff --git a/systemtest/approvals/TestIntake/MinimalEvents.approved.json b/systemtest/approvals/TestIntake/MinimalEvents.approved.json index 0fde9e28423..2913f24e4cb 100644 --- a/systemtest/approvals/TestIntake/MinimalEvents.approved.json +++ b/systemtest/approvals/TestIntake/MinimalEvents.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -51,6 +54,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "timestamp.us": [ "dynamic" ] @@ -62,6 +68,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -107,6 +116,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "timestamp.us": [ "dynamic" ] @@ -118,6 +130,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -157,6 +172,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "timestamp.us": [ "dynamic" ] @@ -171,6 +189,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -189,6 +210,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -203,6 +227,9 @@ ], "service.name": [ "1234_service-12a3" + ], + "service.name.text": [ + "1234_service-12a3" ] }, { @@ -212,6 +239,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -248,6 +278,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "span.duration.us": [ 3564 ], @@ -257,6 +290,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -277,6 +313,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -313,6 +352,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "span.duration.us": [ 3564 ], @@ -322,6 +364,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -342,6 +387,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -375,6 +423,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "span.id": [ "abcdef1478523690" ], diff --git a/systemtest/approvals/TestIntake/Spans.approved.json b/systemtest/approvals/TestIntake/Spans.approved.json index 368417a5185..8de4e79fb7e 100644 --- a/systemtest/approvals/TestIntake/Spans.approved.json +++ b/systemtest/approvals/TestIntake/Spans.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -21,6 +24,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -30,6 +36,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -39,6 +48,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -48,6 +60,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -87,6 +102,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -111,9 +129,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -157,30 +181,48 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], "service.target.name": [ "testdb" ], + "service.target.name.text": [ + "testdb" + ], "service.target.type": [ "postgres" ], @@ -205,9 +247,15 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.destination.service.name": [ "postgresql" ], + "span.destination.service.name.text": [ + "postgresql" + ], "span.destination.service.resource": [ "postgres/testdb" ], @@ -223,58 +271,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], @@ -322,6 +324,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -331,6 +336,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -340,6 +348,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -349,6 +360,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -358,6 +372,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -385,6 +402,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -394,9 +414,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -440,24 +466,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -476,6 +517,9 @@ "span.name": [ "get /api/types" ], + "span.name.text": [ + "get /api/types" + ], "span.representative_count": [ 1 ], @@ -520,6 +564,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -529,6 +576,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -538,6 +588,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -547,6 +600,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -556,6 +612,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -583,6 +642,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -592,9 +654,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -647,24 +715,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -680,6 +763,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -724,6 +810,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -733,6 +822,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -742,6 +834,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -751,6 +846,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -760,6 +858,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -787,6 +888,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -796,9 +900,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -842,24 +952,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -875,6 +1000,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -916,6 +1044,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -925,6 +1056,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -934,6 +1068,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -943,6 +1080,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -952,6 +1092,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -982,6 +1125,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -991,9 +1137,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1037,24 +1189,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1082,6 +1249,9 @@ "span.name": [ "SELECT FROM p_details" ], + "span.name.text": [ + "SELECT FROM p_details" + ], "span.representative_count": [ 1 ], @@ -1129,6 +1299,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -1138,6 +1311,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1147,6 +1323,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1156,6 +1335,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1165,6 +1347,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1204,6 +1389,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1228,9 +1416,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1274,30 +1468,48 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], "service.target.name": [ "testdb" ], + "service.target.name.text": [ + "testdb" + ], "service.target.type": [ "postgres" ], @@ -1322,9 +1534,15 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.destination.service.name": [ "postgresql" ], + "span.destination.service.name.text": [ + "postgresql" + ], "span.destination.service.resource": [ "postgresql" ], @@ -1340,58 +1558,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], @@ -1439,6 +1611,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1448,6 +1623,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1457,6 +1635,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1466,6 +1647,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1475,6 +1659,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1508,6 +1695,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1517,9 +1707,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1563,24 +1759,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1602,12 +1813,18 @@ "span.message.queue.name": [ "new_users" ], + "span.message.queue.name.text": [ + "new_users" + ], "span.message.routing_key": [ "user-created-span" ], "span.name": [ "Rabbitmq receive" ], + "span.name.text": [ + "Rabbitmq receive" + ], "span.representative_count": [ 1 ], @@ -1652,6 +1869,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1664,6 +1884,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1673,6 +1896,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1682,6 +1908,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1691,6 +1920,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1721,6 +1953,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1730,9 +1965,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1776,24 +2017,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1812,6 +2068,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -1856,6 +2115,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1865,6 +2127,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1874,6 +2139,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1883,6 +2151,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1892,6 +2163,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1931,6 +2205,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1940,9 +2217,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1986,30 +2269,48 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], "service.target.name": [ "localhost:8080" ], + "service.target.name.text": [ + "localhost:8080" + ], "service.target.type": [ "" ], @@ -2022,6 +2323,9 @@ "span.destination.service.name": [ "external" ], + "span.destination.service.name.text": [ + "external" + ], "span.destination.service.resource": [ "localhost:8080" ], @@ -2037,6 +2341,9 @@ "span.name": [ "Request" ], + "span.name.text": [ + "Request" + ], "span.representative_count": [ 1 ], @@ -2084,6 +2391,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -2093,6 +2403,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -2102,6 +2415,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -2111,6 +2427,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -2120,6 +2439,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -2159,6 +2481,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -2186,9 +2511,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -2232,24 +2563,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -2277,9 +2623,15 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.destination.service.name": [ "postgresql" ], + "span.destination.service.name.text": [ + "postgresql" + ], "span.destination.service.resource": [ "postgresql" ], @@ -2295,58 +2647,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index ffa5be2928d..d7603216333 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -18,6 +21,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -27,6 +33,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -36,6 +45,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -45,6 +57,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -72,6 +87,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -81,9 +99,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -130,24 +154,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -191,6 +230,9 @@ "transaction.message.queue.name": [ "new_users" ], + "transaction.message.queue.name.text": [ + "new_users" + ], "transaction.message.routing_key": [ "user-created-transaction" ], @@ -235,6 +277,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -244,6 +289,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -253,6 +301,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -262,6 +313,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -271,6 +325,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -301,6 +358,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -310,9 +370,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -359,24 +425,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -444,6 +525,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -468,6 +552,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -477,6 +564,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -486,6 +576,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -495,6 +588,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -525,49 +621,39 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1, c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1, c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -584,8 +670,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -605,9 +695,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -660,24 +756,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "7.0" ], @@ -696,19 +807,6 @@ "trace.id": [ "0acd456789abcdef0123456789abcdef" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], @@ -781,9 +879,15 @@ "user_agent.device.name": [ "Mac" ], + "user_agent.device.name.text": [ + "Mac" + ], "user_agent.name": [ "Chrome" ], + "user_agent.name.text": [ + "Chrome" + ], "user_agent.original": [ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36, Mozilla Chrome Edge" ], @@ -822,6 +926,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -831,6 +938,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -840,6 +950,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -849,6 +962,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -858,6 +974,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -885,6 +1004,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -897,9 +1019,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -943,24 +1071,39 @@ "service.framework.name": [ "Rails" ], + "service.framework.name.text": [ + "Rails" + ], "service.framework.version": [ "5.0" ], "service.language.name": [ "ruby" ], + "service.language.name.text": [ + "ruby" + ], "service.language.version": [ "2.5" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-ABC" ], + "service.node.name.text": [ + "node-ABC" + ], "service.runtime.name": [ "cruby" ], + "service.runtime.name.text": [ + "cruby" + ], "service.runtime.version": [ "2.5" ], @@ -1050,6 +1193,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1059,6 +1205,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1068,6 +1217,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1083,12 +1235,18 @@ "cloud.origin.service.name": [ "serviceName" ], + "cloud.origin.service.name.text": [ + "serviceName" + ], "cloud.project.id": [ "project_id" ], "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1098,6 +1256,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1122,6 +1283,9 @@ "faas.name": [ "faasName" ], + "faas.name.text": [ + "faasName" + ], "faas.trigger.request_id": [ "FuH2Cir_vHcEMUA=" ], @@ -1143,6 +1307,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1152,9 +1319,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1198,33 +1371,51 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.origin.id": [ "abc123" ], "service.origin.name": [ "service-name" ], + "service.origin.name.text": [ + "service-name" + ], "service.origin.version": [ "1.0" ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index c3b48460971..e37a5126355 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -33,6 +36,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -42,6 +48,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -51,6 +60,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -60,6 +72,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -90,49 +105,39 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1, c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1, c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -149,8 +154,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -170,9 +179,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -225,24 +240,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "chatty-service" ], + "service.name.text": [ + "chatty-service" + ], "service.node.name": [ "chatty-node" ], + "service.node.name.text": [ + "chatty-node" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "7.0" ], @@ -261,19 +291,6 @@ "trace.id": [ "646df3b8b5279e982cc12a2f1ac004f3" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], @@ -349,9 +366,15 @@ "user_agent.device.name": [ "Mac" ], + "user_agent.device.name.text": [ + "Mac" + ], "user_agent.name": [ "Chrome" ], + "user_agent.name.text": [ + "Chrome" + ], "user_agent.original": [ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36, Mozilla Chrome Edge" ], diff --git a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json index 578ef307e0b..78b5df3636e 100644 --- a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json +++ b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -48,6 +51,9 @@ "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -91,24 +97,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -127,6 +148,9 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.duration.us": [ 3781 ], @@ -136,45 +160,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "my2file.js", - "line": { - "number": 10 - } - } - ], "span.sync": [ false ], @@ -216,6 +207,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "1.3" ], @@ -234,6 +228,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "host.architecture": [ "x64" ], @@ -243,45 +240,32 @@ "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -292,8 +276,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -310,6 +298,9 @@ "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -356,24 +347,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "serviceabc" ], + "service.name.text": [ + "serviceabc" + ], "service.node.name": [ "special-name" ], + "service.node.name.text": [ + "special-name" + ], "service.runtime.name": [ "javascript" ], + "service.runtime.name.text": [ + "javascript" + ], "service.runtime.version": [ "8.0.0" ], @@ -386,19 +392,6 @@ "trace.id": [ "945254c567a5417eaaaaaaaaaaaaaaaa" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], @@ -480,9 +473,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Other" ], + "user_agent.name.text": [ + "Other" + ], "user_agent.original": [ "Mozilla Chrome Edge" ], diff --git a/systemtest/approvals/TestIntakeLog/with_faas.approved.json b/systemtest/approvals/TestIntakeLog/with_faas.approved.json index f4027880df6..0ad648c5e2e 100644 --- a/systemtest/approvals/TestIntakeLog/with_faas.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_faas.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -51,6 +54,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -60,9 +66,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -108,24 +120,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json index b7af03e4488..6b64465c20e 100644 --- a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -54,6 +57,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -63,9 +69,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -93,6 +105,9 @@ "log.origin.file.name": [ "testFile" ], + "log.origin.file.name.text": [ + "testFile" + ], "log.origin.function": [ "testFunc" ], @@ -129,6 +144,9 @@ "process.thread.name": [ "testThread" ], + "process.thread.name.text": [ + "testThread" + ], "process.title": [ "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" ], @@ -141,24 +159,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "testSvc" ], + "service.name.text": [ + "testSvc" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json index 58e95a53a41..2371bb723f8 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -54,6 +57,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -63,9 +69,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -93,6 +105,9 @@ "log.origin.file.name": [ "testFile" ], + "log.origin.file.name.text": [ + "testFile" + ], "log.origin.function": [ "testFunc" ], @@ -129,6 +144,9 @@ "process.thread.name": [ "testThread" ], + "process.thread.name.text": [ + "testThread" + ], "process.title": [ "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" ], @@ -141,24 +159,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "testSvc" ], + "service.name.text": [ + "testSvc" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json index 14f97043e1e..d75e63da7a7 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -54,6 +57,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -63,9 +69,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -93,6 +105,9 @@ "log.origin.file.name": [ "testFile" ], + "log.origin.file.name.text": [ + "testFile" + ], "log.origin.function": [ "testFunc" ], @@ -129,6 +144,9 @@ "process.thread.name": [ "testThread" ], + "process.thread.name.text": [ + "testThread" + ], "process.title": [ "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" ], @@ -141,24 +159,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "testSvc" ], + "service.name.text": [ + "testSvc" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json index 39869bafc29..be07910b78b 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -42,6 +45,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -51,9 +57,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -99,24 +111,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json index bc0c05fa3e6..18871753bdb 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -42,6 +45,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -51,9 +57,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -99,24 +111,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json index 8620e852b9b..24f22e3a21c 100644 --- a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -42,6 +45,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -51,9 +57,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -99,24 +111,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestJaeger/batch_0.approved.json b/systemtest/approvals/TestJaeger/batch_0.approved.json index 3484db6e060..02292a6a1fd 100644 --- a/systemtest/approvals/TestJaeger/batch_0.approved.json +++ b/systemtest/approvals/TestJaeger/batch_0.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -42,6 +45,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "message": [ "Retrying GetDriver after error" ], @@ -63,12 +69,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -98,6 +113,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -131,6 +149,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "message": [ "Retrying GetDriver after error" ], @@ -152,12 +173,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -187,6 +217,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -220,6 +253,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "message": [ "Retrying GetDriver after error" ], @@ -241,12 +277,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -276,6 +321,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -300,6 +348,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.level": [ "info" ], @@ -321,12 +372,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -347,6 +407,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -371,6 +434,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.level": [ "info" ], @@ -392,12 +458,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -418,6 +493,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -442,6 +520,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.key": [ "customer" ], @@ -463,12 +544,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -489,6 +579,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -516,6 +609,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.as": [ "thrift" ], @@ -549,12 +645,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], diff --git a/systemtest/approvals/TestJaeger/batch_1.approved.json b/systemtest/approvals/TestJaeger/batch_1.approved.json index 71f7aef4764..ccc49861cc5 100644 --- a/systemtest/approvals/TestJaeger/batch_1.approved.json +++ b/systemtest/approvals/TestJaeger/batch_1.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -42,6 +45,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.driver_id": [ "T762465C" ], @@ -66,12 +72,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "timestamp.us": [ 1576827705006847 ], @@ -89,6 +104,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -122,6 +140,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.driver_id": [ "T781861C" ], @@ -146,12 +167,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "timestamp.us": [ 1576827705089372 ], @@ -169,6 +199,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -202,6 +235,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.driver_id": [ "T752547C" ], @@ -226,12 +262,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "timestamp.us": [ 1576827705172347 ], @@ -249,6 +294,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -273,6 +321,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.level": [ "info" ], @@ -288,15 +339,27 @@ "observer.version": [ "dynamic" ], + "parent.id": [ + "7be2fd98d0973be3" + ], "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "6e09e8bcefd6b828" ], @@ -314,6 +377,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -341,6 +407,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752547C" ], @@ -362,12 +431,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 39602 ], @@ -377,6 +455,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -400,6 +481,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -427,6 +511,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T781861C" ], @@ -448,12 +535,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 11802 ], @@ -463,6 +559,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -486,6 +585,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -513,6 +615,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T757338C" ], @@ -534,12 +639,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 10431 ], @@ -549,6 +663,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -572,6 +689,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -599,6 +719,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T708771C" ], @@ -620,12 +743,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 11986 ], @@ -635,6 +767,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -658,6 +793,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -685,6 +823,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T762465C" ], @@ -706,12 +847,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 33732 ], @@ -721,6 +871,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -744,6 +897,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -771,6 +927,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T710624C" ], @@ -792,12 +951,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 7311 ], @@ -807,6 +975,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -830,6 +1001,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -857,6 +1031,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T781861C" ], @@ -878,12 +1055,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 35375 ], @@ -893,6 +1079,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -916,6 +1105,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -943,6 +1135,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T705860C" ], @@ -964,12 +1159,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 12236 ], @@ -979,6 +1183,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1002,6 +1209,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1029,6 +1239,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T762465C" ], @@ -1050,12 +1263,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 9240 ], @@ -1065,6 +1287,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1088,6 +1313,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1115,6 +1343,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752547C" ], @@ -1136,12 +1367,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 14029 ], @@ -1151,6 +1391,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1174,6 +1417,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1201,6 +1447,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752110C" ], @@ -1222,12 +1471,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 10630 ], @@ -1237,6 +1495,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1260,6 +1521,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1287,6 +1551,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T757670C" ], @@ -1308,12 +1575,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 13946 ], @@ -1323,6 +1599,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1346,6 +1625,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1373,6 +1655,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_location": [ "728,326" ], @@ -1394,12 +1679,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 19711 ], @@ -1409,6 +1703,9 @@ "span.name": [ "FindDriverIDs" ], + "span.name.text": [ + "FindDriverIDs" + ], "span.representative_count": [ 1 ], @@ -1432,6 +1729,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1459,6 +1759,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T712515C" ], @@ -1480,12 +1783,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 12561 ], @@ -1495,6 +1807,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], diff --git a/systemtest/approvals/TestNoMatchingSourcemap.approved.json b/systemtest/approvals/TestNoMatchingSourcemap.approved.json index 0c0caf5703f..deab65b210c 100644 --- a/systemtest/approvals/TestNoMatchingSourcemap.approved.json +++ b/systemtest/approvals/TestNoMatchingSourcemap.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -42,6 +45,12 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.0" + ], "source.ip": [ "127.0.0.1" ], @@ -57,38 +66,12 @@ "span.name": [ "transaction" ], + "span.name.text": [ + "transaction" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "line": { - "column": 18, - "number": 1 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-agent-js service.version=1.0.0 bundle.path=http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map" - } - }, - { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "line": { - "column": 18, - "number": 1 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-agent-js service.version=1.0.0 bundle.path=http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map" - } - } - ], "span.type": [ "transaction" ], @@ -106,6 +89,27 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/general-usecase/span" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] } ] diff --git a/systemtest/approvals/TestOTLPGRPCLogs.approved.json b/systemtest/approvals/TestOTLPGRPCLogs.approved.json index c3abed08e21..13ca1da74f9 100644 --- a/systemtest/approvals/TestOTLPGRPCLogs.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogs.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "otlp/go" ], + "agent.name.text": [ + "otlp/go" + ], "agent.version": [ "unknown" ], @@ -45,9 +48,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "span.id": [ "0200000000000000" ], diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index d90d2fe8f8c..b7294fb9d0e 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "android/java" ], + "agent.name.text": [ + "android/java" + ], "agent.version": [ "unknown" ], @@ -60,9 +63,15 @@ "service.language.name": [ "java" ], + "service.language.name.text": [ + "java" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "source.ip": [ "89.160.20.128" ], diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json index 0a439456ec9..3febad1344c 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -24,6 +27,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -39,8 +45,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" + ], + "service.name.text": [ + "unknown_service_systemtest_test" ] } ] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json index ff53d2e172b..be3589de9d4 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -37,6 +40,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -52,8 +58,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" + ], + "service.name.text": [ + "unknown_service_systemtest_test" ] } ] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json index 4ad1b9142cd..74331909ff3 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "otlp" ], + "agent.name.text": [ + "otlp" + ], "agent.version": [ "unknown" ], @@ -21,6 +24,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -36,9 +42,15 @@ "service.language.name": [ "unknown" ], + "service.language.name.text": [ + "unknown" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "summary": [ { "sum": 123.456, diff --git a/systemtest/approvals/TestOTLPGRPCTraces.approved.json b/systemtest/approvals/TestOTLPGRPCTraces.approved.json index dbcfe453a16..0ff335c1c5f 100644 --- a/systemtest/approvals/TestOTLPGRPCTraces.approved.json +++ b/systemtest/approvals/TestOTLPGRPCTraces.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -84,12 +87,21 @@ "service.framework.name": [ "systemtest" ], + "service.framework.name.text": [ + "systemtest" + ], "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" ], + "service.name.text": [ + "unknown_service_systemtest_test" + ], "span.id": [ "b3ee9be3b687a611" ], @@ -116,6 +128,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -167,12 +182,21 @@ "service.framework.name": [ "systemtest" ], + "service.framework.name.text": [ + "systemtest" + ], "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" ], + "service.name.text": [ + "unknown_service_systemtest_test" + ], "span.id": [ "b3ee9be3b687a611" ], @@ -190,6 +214,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -249,12 +276,21 @@ "service.framework.name": [ "systemtest" ], + "service.framework.name.text": [ + "systemtest" + ], "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" ], + "service.name.text": [ + "unknown_service_systemtest_test" + ], "span.id": [ "b3ee9be3b687a611" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json index 45f2b2242f9..1652cdaada6 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -27,192 +30,6 @@ "error.exception.message": [ "Uncaught Error: timeout test error" ], - "error.exception.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "__webpack_require__", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ], - "pre": [ - "", - " \t// expose the modules object (__webpack_modules__)", - " \t__webpack_require__.m = modules;", - "", - " \t// expose the module cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \t__webpack_require__.c = installedModules;", - "number": 33 - }, - "original": { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "colno": 181, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 15, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - "", - "", - "/** WEBPACK FOOTER **", - " ** webpack/bootstrap 6002740481c9666b0d38" - ], - "pre": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "moduleId", - "line": { - "column": 0, - "context": " \treturn __webpack_require__(0);", - "number": 39 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 199, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - " \t\t\treturn installedModules[moduleId].exports;", - "", - " \t\t// Create a new module (and put it into the cache)", - " \t\tvar module = installedModules[moduleId] = {", - " \t\t\texports: {}," - ], - "pre": [ - "", - " \t// The require function", - " \tfunction __webpack_require__(moduleId) {", - "", - " \t\t// Check if module is in cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \t\tif(installedModules[moduleId])", - "number": 8 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 33, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "error.exception.type": [ "Error" ], @@ -228,44 +45,6 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], - "error.log.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], @@ -287,6 +66,9 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], "service.version": [ "1.0.1" ], @@ -326,9 +108,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json index 45f2b2242f9..1652cdaada6 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -27,192 +30,6 @@ "error.exception.message": [ "Uncaught Error: timeout test error" ], - "error.exception.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "__webpack_require__", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ], - "pre": [ - "", - " \t// expose the modules object (__webpack_modules__)", - " \t__webpack_require__.m = modules;", - "", - " \t// expose the module cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \t__webpack_require__.c = installedModules;", - "number": 33 - }, - "original": { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "colno": 181, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 15, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - "", - "", - "/** WEBPACK FOOTER **", - " ** webpack/bootstrap 6002740481c9666b0d38" - ], - "pre": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "moduleId", - "line": { - "column": 0, - "context": " \treturn __webpack_require__(0);", - "number": 39 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 199, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - " \t\t\treturn installedModules[moduleId].exports;", - "", - " \t\t// Create a new module (and put it into the cache)", - " \t\tvar module = installedModules[moduleId] = {", - " \t\t\texports: {}," - ], - "pre": [ - "", - " \t// The require function", - " \tfunction __webpack_require__(moduleId) {", - "", - " \t\t// Check if module is in cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \t\tif(installedModules[moduleId])", - "number": 8 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 33, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "error.exception.type": [ "Error" ], @@ -228,44 +45,6 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], - "error.log.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], @@ -287,6 +66,9 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], "service.version": [ "1.0.1" ], @@ -326,9 +108,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index 9e00f3a44a8..4f3e5090cb7 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -30,6 +33,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.method": [ "POST" ], @@ -60,9 +66,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -72,6 +111,9 @@ "span.destination.service.name": [ "http://localhost:8003" ], + "span.destination.service.name.text": [ + "http://localhost:8003" + ], "span.destination.service.resource": [ "localhost:8003" ], @@ -87,6 +129,9 @@ "span.name": [ "POST http://localhost:8003/data" ], + "span.name.text": [ + "POST http://localhost:8003/data" + ], "span.subtype": [ "h" ], @@ -110,6 +155,39 @@ ], "url.original.text": [ "http://localhost:8003/data" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -119,6 +197,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -143,6 +224,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.method": [ "GET" ], @@ -173,9 +257,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -185,6 +302,9 @@ "span.destination.service.name": [ "http://localhost:8000" ], + "span.destination.service.name.text": [ + "http://localhost:8000" + ], "span.destination.service.resource": [ "localhost:8000" ], @@ -200,6 +320,9 @@ "span.name": [ "GET /test/e2e/common/data.json" ], + "span.name.text": [ + "GET /test/e2e/common/data.json" + ], "span.subtype": [ "h" ], @@ -223,6 +346,39 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/common/data.json?test=hamid" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -232,6 +388,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -274,9 +433,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -292,6 +484,9 @@ "span.name": [ "OpenTracing y" ], + "span.name.text": [ + "OpenTracing y" + ], "span.type": [ "cu" ], @@ -303,6 +498,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -312,6 +540,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -336,6 +567,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.method": [ "POST" ], @@ -366,9 +600,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -381,6 +648,9 @@ "span.destination.service.name": [ "http://localhost:8003" ], + "span.destination.service.name.text": [ + "http://localhost:8003" + ], "span.destination.service.resource": [ "localhost:8003" ], @@ -396,6 +666,9 @@ "span.name": [ "POST http://localhost:8003/fetch" ], + "span.name.text": [ + "POST http://localhost:8003/fetch" + ], "span.subtype": [ "h" ], @@ -419,6 +692,39 @@ ], "url.original.text": [ "http://localhost:8003/fetch" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -428,6 +734,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -458,20 +767,53 @@ "observer.type": [ "apm-server" ], - "observer.version": [ - "dynamic" + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" ], - "parent.id": [ - "ec2e280be8345240" + "service.runtime.name": [ + "v8" ], - "processor.event": [ - "span" + "service.runtime.name.text": [ + "v8" ], - "service.environment": [ - "prod" + "service.runtime.version": [ + "8.0" ], - "service.name": [ - "apm-a-rum-test-e2e-general-usecase" + "service.version": [ + "0.0.1" ], "source.ip": [ "dynamic" @@ -488,6 +830,9 @@ "span.name": [ "Requesting and receiving the document" ], + "span.name.text": [ + "Requesting and receiving the document" + ], "span.subtype": [ "browser-timing" ], @@ -502,6 +847,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -511,6 +889,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -529,6 +910,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "labels.testTagKey": [ "testTagValue" ], @@ -553,9 +937,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -571,33 +988,8 @@ "span.name": [ "Fire \"DOMContentLoaded\" event" ], - "span.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "function": "generateError", - "line": { - "column": 9, - "number": 7662 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-a-rum-test-e2e-general-usecase service.version=0.0.1 bundle.path=http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "function": "\u003canonymous\u003e", - "line": { - "column": 3, - "number": 7666 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-a-rum-test-e2e-general-usecase service.version=0.0.1 bundle.path=http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" - } - } + "span.name.text": [ + "Fire \"DOMContentLoaded\" event" ], "span.subtype": [ "browser-timing" @@ -613,6 +1005,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -622,6 +1047,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -679,9 +1107,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -691,6 +1152,9 @@ "span.destination.service.name": [ "http://localhost:8000" ], + "span.destination.service.name.text": [ + "http://localhost:8000" + ], "span.destination.service.resource": [ "localhost:8000" ], @@ -706,6 +1170,9 @@ "span.name": [ "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" ], + "span.name.text": [ + "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" + ], "span.subtype": [ "script" ], @@ -726,6 +1193,39 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -735,6 +1235,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -777,9 +1280,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -795,6 +1331,9 @@ "span.name": [ "Parsing the document, executing sy. scripts" ], + "span.name.text": [ + "Parsing the document, executing sy. scripts" + ], "span.subtype": [ "browser-timing" ], @@ -809,6 +1348,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] }, { @@ -818,6 +1390,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -836,8 +1411,15 @@ "event.outcome": [ "success" ], - "http.request.headers.Accept": [ - "application/json" + "event.success_count": [ + 1 + ], + "http.request.headers": [ + { + "Accept": [ + "application/json" + ] + } ], "http.request.method": [ "GET" @@ -851,8 +1433,12 @@ "http.response.encoded_body_size": [ 690 ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.status_code": [ 200 @@ -890,21 +1476,33 @@ "service.framework.name": [ "angular" ], + "service.framework.name.text": [ + "angular" + ], "service.framework.version": [ "2" ], "service.language.name": [ "javascript" ], + "service.language.name.text": [ + "javascript" + ], "service.language.version": [ "6" ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], "service.runtime.name": [ "v8" ], + "service.runtime.name.text": [ + "v8" + ], "service.runtime.version": [ "8.0" ], @@ -923,11 +1521,6 @@ "trace.id": [ "286ac3ad697892c406528f13c82e0ce1" ], - "transaction.custom": [ - { - "testContext": "testContext" - } - ], "transaction.duration.us": [ 295000 ], @@ -1078,9 +1671,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json index d24f9c48dd5..deab65b210c 100644 --- a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json +++ b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -42,6 +45,12 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.0" + ], "source.ip": [ "127.0.0.1" ], @@ -57,83 +66,12 @@ "span.name": [ "transaction" ], + "span.name.text": [ + "transaction" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "span.type": [ "transaction" ], @@ -151,6 +89,27 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/general-usecase/span" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" ] } ] diff --git a/systemtest/approvals/TestRUMXForwardedFor.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json index 3ed284fcf21..89d28519fa6 100644 --- a/systemtest/approvals/TestRUMXForwardedFor.approved.json +++ b/systemtest/approvals/TestRUMXForwardedFor.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "5.5.0" ], @@ -45,6 +48,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "observer.hostname": [ "dynamic" ], @@ -60,6 +66,9 @@ "service.name": [ "rum-js-test" ], + "service.name.text": [ + "rum-js-test" + ], "source.ip": [ "220.244.41.16" ], @@ -81,15 +90,24 @@ "transaction.name": [ "GET /" ], + "transaction.name.text": [ + "GET /" + ], "transaction.type": [ "request" ], "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], @@ -107,6 +125,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "5.5.0" ], @@ -161,6 +182,9 @@ "service.name": [ "rum-js-test" ], + "service.name.text": [ + "rum-js-test" + ], "source.ip": [ "220.244.41.16" ], @@ -197,9 +221,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestServiceDestinationAggregation.approved.json b/systemtest/approvals/TestServiceDestinationAggregation.approved.json index 1ba70139ede..3f8b3010a31 100644 --- a/systemtest/approvals/TestServiceDestinationAggregation.approved.json +++ b/systemtest/approvals/TestServiceDestinationAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.10m" ], @@ -48,9 +51,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "resource" ], @@ -65,6 +74,9 @@ ], "span.name": [ "name" + ], + "span.name.text": [ + "name" ] }, { @@ -74,6 +86,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.1m" ], @@ -116,9 +131,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "resource" ], @@ -133,6 +154,9 @@ ], "span.name": [ "name" + ], + "span.name.text": [ + "name" ] }, { @@ -142,6 +166,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.60m" ], @@ -184,9 +211,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "resource" ], @@ -201,6 +234,9 @@ ], "span.name": [ "name" + ], + "span.name.text": [ + "name" ] } ] diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json index c937596cd3a..c9997c600af 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.10m" ], @@ -36,8 +39,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -47,6 +56,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.1m" ], @@ -77,8 +89,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -88,6 +106,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.60m" ], @@ -118,8 +139,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] } ] diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json index 242e01cd566..90e3d2be8ab 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json @@ -33,6 +33,9 @@ "service.name": [ "_other" ], + "service.name.text": [ + "_other" + ], "service_summary.aggregation.overflow_count": [ 2 ] @@ -71,6 +74,9 @@ "service.name": [ "_other" ], + "service.name.text": [ + "_other" + ], "service_summary.aggregation.overflow_count": [ 2 ] @@ -109,6 +115,9 @@ "service.name": [ "_other" ], + "service.name.text": [ + "_other" + ], "service_summary.aggregation.overflow_count": [ 2 ] @@ -120,6 +129,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.10m" ], @@ -153,8 +165,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -164,6 +182,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.1m" ], @@ -197,8 +218,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -208,6 +235,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.60m" ], @@ -241,8 +271,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -252,6 +288,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.10m" ], @@ -285,8 +324,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -296,6 +341,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.1m" ], @@ -329,8 +377,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -340,6 +394,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.60m" ], @@ -373,8 +430,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] } ] diff --git a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json index 70c5980a6c8..c09b5be6abb 100644 --- a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.10m" ], @@ -42,9 +45,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -72,6 +81,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.1m" ], @@ -108,9 +120,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -138,6 +156,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.60m" ], @@ -174,9 +195,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -204,6 +231,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.10m" ], @@ -240,9 +270,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -270,6 +306,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.1m" ], @@ -306,9 +345,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -336,6 +381,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.60m" ], @@ -372,9 +420,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ diff --git a/systemtest/approvals/TestTransactionAggregation.approved.json b/systemtest/approvals/TestTransactionAggregation.approved.json index 1f1c147f6f8..1c9107c47ae 100644 --- a/systemtest/approvals/TestTransactionAggregation.approved.json +++ b/systemtest/approvals/TestTransactionAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.10m" ], @@ -30,6 +33,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -54,18 +60,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -88,6 +106,9 @@ "transaction.name": [ "abc" ], + "transaction.name.text": [ + "abc" + ], "transaction.root": [ true ], @@ -102,6 +123,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.1m" ], @@ -126,6 +150,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -150,18 +177,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -184,6 +223,9 @@ "transaction.name": [ "abc" ], + "transaction.name.text": [ + "abc" + ], "transaction.root": [ true ], @@ -198,6 +240,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.60m" ], @@ -222,6 +267,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -246,18 +294,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -280,6 +340,9 @@ "transaction.name": [ "abc" ], + "transaction.name.text": [ + "abc" + ], "transaction.root": [ true ], @@ -294,6 +357,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.10m" ], @@ -318,6 +384,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -342,18 +411,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -376,6 +457,9 @@ "transaction.name": [ "def" ], + "transaction.name.text": [ + "def" + ], "transaction.root": [ true ], @@ -390,6 +474,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.1m" ], @@ -414,6 +501,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -438,18 +528,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -472,6 +574,9 @@ "transaction.name": [ "def" ], + "transaction.name.text": [ + "def" + ], "transaction.root": [ true ], @@ -486,6 +591,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.60m" ], @@ -510,6 +618,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -534,18 +645,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -568,6 +691,9 @@ "transaction.name": [ "def" ], + "transaction.name.text": [ + "def" + ], "transaction.root": [ true ], @@ -582,12 +708,18 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "cloud.account.id": [ "account_id" ], "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -600,6 +732,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -609,6 +744,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -636,12 +774,18 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "labels.tag1": [ "one" ], @@ -672,18 +816,30 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -709,6 +865,9 @@ "transaction.name": [ "faas" ], + "transaction.name.text": [ + "faas" + ], "transaction.result": [ "success" ], @@ -726,12 +885,18 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "cloud.account.id": [ "account_id" ], "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -744,6 +909,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -753,6 +921,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -780,12 +951,18 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "labels.tag1": [ "one" ], @@ -816,18 +993,30 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -853,6 +1042,9 @@ "transaction.name": [ "faas" ], + "transaction.name.text": [ + "faas" + ], "transaction.result": [ "success" ], @@ -870,12 +1062,18 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "cloud.account.id": [ "account_id" ], "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -888,6 +1086,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -897,6 +1098,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -924,12 +1128,18 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "labels.tag1": [ "one" ], @@ -960,18 +1170,30 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -997,6 +1219,9 @@ "transaction.name": [ "faas" ], + "transaction.name.text": [ + "faas" + ], "transaction.result": [ "success" ], diff --git a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json index 667edb05506..163880e72bc 100644 --- a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json +++ b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.10m" ], @@ -30,6 +33,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -54,18 +60,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -88,6 +106,9 @@ "transaction.name": [ "name" ], + "transaction.name.text": [ + "name" + ], "transaction.root": [ true ], @@ -102,6 +123,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.1m" ], @@ -126,6 +150,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -150,18 +177,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -184,6 +223,9 @@ "transaction.name": [ "name" ], + "transaction.name.text": [ + "name" + ], "transaction.root": [ true ], @@ -198,6 +240,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.60m" ], @@ -222,6 +267,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -246,18 +294,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -280,6 +340,9 @@ "transaction.name": [ "name" ], + "transaction.name.text": [ + "name" + ], "transaction.root": [ true ], diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json index 95e8c64c6d3..33382beded6 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.10m" ], @@ -39,9 +42,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "elasticsearch" ], @@ -62,6 +71,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.1m" ], @@ -95,9 +107,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "elasticsearch" ], @@ -118,6 +136,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.60m" ], @@ -151,9 +172,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "elasticsearch" ], @@ -174,6 +201,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.10m" ], @@ -207,9 +237,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "redis" ], @@ -230,6 +266,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.1m" ], @@ -263,9 +302,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "redis" ], @@ -286,6 +331,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.60m" ], @@ -319,9 +367,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "redis" ], diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json index 951a0cb2591..84bb0883fa6 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -36,6 +39,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -63,18 +69,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], diff --git a/systemtest/gencorpora/apmserver.go b/systemtest/gencorpora/apmserver.go index 18720e28786..ed9cc6fd94f 100644 --- a/systemtest/gencorpora/apmserver.go +++ b/systemtest/gencorpora/apmserver.go @@ -38,8 +38,6 @@ type APMServer struct { // using the Elasticsearch output. func NewAPMServer(ctx context.Context, esHost string) *apmservertest.Server { srv := apmservertest.NewUnstartedServer() - waitForIntegration := false - srv.Config.WaitForIntegration = &waitForIntegration srv.Config.Output.Elasticsearch.Hosts = []string{esHost} srv.Config.Kibana = nil return srv diff --git a/testing/docker/kibana/kibana.yml b/testing/docker/kibana/kibana.yml index 007497a88ad..028463de011 100644 --- a/testing/docker/kibana/kibana.yml +++ b/testing/docker/kibana/kibana.yml @@ -8,8 +8,3 @@ xpack.encryptedSavedObjects.encryptionKey: fhjskloppd678ehkdfdlliverpoolfcr # Disable the Fleet agent ID verification pipeline, # which sets Fleet-specific fields that we don't want. xpack.fleet.agentIdVerificationEnabled: false - -# Install the APM integration package. -xpack.fleet.packages: - - name: apm - version: latest diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index cbf1b99e23e..3f4b7dfd5a1 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.15.0-177234da-SNAPSHOT + version: 8.15.0-1b4d655a-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index f1a41171ed7..5716dae97b6 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.15.0-177234da-SNAPSHOT + version: 8.15.0-1b4d655a-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 8bcea73e558..984d85172e8 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.15.0-177234da-SNAPSHOT + version: 8.15.0-1b4d655a-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch diff --git a/tools/go.mod b/tools/go.mod index f215693650f..b6c72dcfdfd 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.36.1 + github.com/goreleaser/nfpm/v2 v2.37.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 @@ -43,7 +43,7 @@ require ( github.com/buger/jsonparser v1.1.1 // indirect github.com/caarlos0/go-version v0.1.1 // indirect github.com/cavaliergopher/cpio v1.0.1 // indirect - github.com/cloudflare/circl v1.3.7 // indirect + github.com/cloudflare/circl v1.3.8 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/dnephin/pflag v1.0.7 // indirect @@ -54,17 +54,17 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect - github.com/go-git/go-git/v5 v5.11.0 // indirect + github.com/go-git/go-git/v5 v5.12.0 // indirect github.com/gobuffalo/here v0.6.7 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect 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.6.0 // indirect + github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // 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 + github.com/goreleaser/chglog v0.6.1 // indirect github.com/goreleaser/fileglob v1.3.0 // indirect github.com/hashicorp/go-hclog v1.6.1 // indirect github.com/hashicorp/go-plugin v1.6.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.7 // indirect + github.com/klauspost/compress v1.17.8 // 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 @@ -106,36 +106,36 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/sergi/go-diff v1.2.0 // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/skeema/knownhosts v1.2.1 // indirect + github.com/skeema/knownhosts v1.2.2 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.18.0 // indirect + github.com/spf13/viper v1.18.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/terraform-docs/terraform-config-inspect v0.0.0-20210728164355-9c1f178932fa // indirect github.com/tidwall/gjson v1.14.4 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/sjson v1.2.5 // indirect - github.com/ulikunitz/xz v0.5.11 // indirect + github.com/ulikunitz/xz v0.5.12 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect 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.21.0 // indirect + golang.org/x/crypto v0.23.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.23.0 // indirect golang.org/x/sync v0.6.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/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/tools v0.17.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect diff --git a/tools/go.sum b/tools/go.sum index 54cf2eb4edd..f14e1823dff 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1159,6 +1159,8 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= +github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1233,8 +1235,6 @@ github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/caarlos0/go-rpmutils v0.2.1-0.20240105125627-01185134a559 h1:5TPRjT2njvPKzXUcrcg6Dt+JPzQF+M5K7xb5V1Nwteg= -github.com/caarlos0/go-rpmutils v0.2.1-0.20240105125627-01185134a559/go.mod h1:sUS7SdlihaphHRYa/Uu4haxl9zL6DLGrFjoTsurEYOw= github.com/caarlos0/go-version v0.1.1 h1:1bikKHkGGVIIxqCmufhSSs3hpBScgHGacrvsi8FuIfc= github.com/caarlos0/go-version v0.1.1/go.mod h1:Ze5Qx4TsBBi5FyrSKVg1Ibc44KGV/llAaKGp86oTwZ0= github.com/caarlos0/testfs v0.4.4 h1:3PHvzHi5Lt+g332CiShwS8ogTgS3HjrmzZxCm6JCDr8= @@ -1254,8 +1254,8 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= -github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= +github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI= +github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -1337,8 +1337,8 @@ github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmV github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= -github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= +github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= +github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= @@ -1350,8 +1350,8 @@ github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= -github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -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.6.0 h1:LoQuqlw6kHRwg25n3M0xtYrW+z2pTkR0ae1xx11hRw8= -github.com/google/rpmpack v0.6.0/go.mod h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI= +github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a h1:JJBdjSfqSy3mnDT0940ASQFghwcZ4y4cb6ttjAoXqwE= +github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a/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= @@ -1511,12 +1511,12 @@ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/goreleaser/chglog v0.5.0 h1:Sk6BMIpx8+vpAf8KyPit34OgWui8c7nKTMHhYx88jJ4= -github.com/goreleaser/chglog v0.5.0/go.mod h1:Ri46M3lrMuv76FHszs3vtABR8J8k1w9JHYAzxeeOl28= +github.com/goreleaser/chglog v0.6.1 h1:NZKiX8l0FTQPRzBgKST7knvNZmZ04f7PEGkN2wInfhE= +github.com/goreleaser/chglog v0.6.1/go.mod h1:Bnnfo07jMZkaAb0uRNASMZyOsX6ROW6X1qbXqN3guUo= 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.36.1 h1:6JmvvEJzSHddJJfNXEu+JrkLsCb9yMOvDTC6ZDhlanY= -github.com/goreleaser/nfpm/v2 v2.36.1/go.mod h1:GHvX+qQk3eRn0OeDjQS2DDBibL1TleOcu1/RB/NlxOE= +github.com/goreleaser/nfpm/v2 v2.37.1 h1:RUmeEt8OlEVeSzKRrO5Vl5qVWCtUwx4j9uivGuRo5fw= +github.com/goreleaser/nfpm/v2 v2.37.1/go.mod h1:q8+sZXFqn106/eGw+9V+I8+izFxZ/sJjrhwmEUxXhUg= 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.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/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= @@ -1783,11 +1783,13 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg= +github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= @@ -1795,12 +1797,12 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= -github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= -github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU= -github.com/smartystreets/assertions v1.13.1/go.mod h1:cXr/IwVfSo/RbCSPhoAPv73p3hlSdrBH/b3SdnW/LMY= -github.com/smartystreets/goconvey v1.8.0 h1:Oi49ha/2MURE0WexF052Z0m+BNSGirfjg5RL+JXWq3w= -github.com/smartystreets/goconvey v1.8.0/go.mod h1:EdX8jtrTIj26jmjCOVNMVSIYAtgexqXKHOXW2Dx9JLg= +github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= +github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY= +github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= +github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= +github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -1818,8 +1820,9 @@ github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0= github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -1858,8 +1861,8 @@ github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= -github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= +github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= @@ -1942,8 +1945,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.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= 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= @@ -2256,8 +2259,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.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.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 +2278,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.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= 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= @@ -2297,8 +2300,9 @@ golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/x-pack/apm-server/sampling/pubsub/pubsub.go b/x-pack/apm-server/sampling/pubsub/pubsub.go index a3cecc45d8a..a703e47441e 100644 --- a/x-pack/apm-server/sampling/pubsub/pubsub.go +++ b/x-pack/apm-server/sampling/pubsub/pubsub.go @@ -21,7 +21,7 @@ import ( "golang.org/x/sync/errgroup" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/go-docappender" + "github.com/elastic/go-docappender/v2" "github.com/elastic/go-elasticsearch/v8/esapi" "github.com/elastic/go-elasticsearch/v8/esutil"