elastic-apm 4.7.2 → 4.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.ci/updatecli/updatecli.d/update-gherkin-specs.yml +84 -0
- data/.ci/updatecli/updatecli.d/update-json-specs.yml +84 -0
- data/.ci/updatecli/updatecli.d/update-specs.yml +86 -0
- data/.ci/updatecli/values.yml +14 -0
- data/.github/workflows/addToProject.yml +3 -0
- data/.github/workflows/labeler.yml +5 -0
- data/.github/workflows/opentelemetry.yml +6 -11
- data/.github/workflows/run-matrix.yml +3 -0
- data/.github/workflows/updatecli.yml +2 -1
- data/CHANGELOG.asciidoc +7 -0
- data/lib/elastic_apm/context_builder.rb +6 -4
- data/lib/elastic_apm/version.rb +1 -1
- metadata +6 -5
- data/.ci/updatecli.d/update-gherkin-specs.yml +0 -126
- data/.ci/updatecli.d/update-json-specs.yml +0 -130
- data/.ci/updatecli.d/update-specs.yml +0 -118
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0fb7f8389ec374ccb57a8496ba24e365006ce44590d4ab064763133c8129cdf4
|
|
4
|
+
data.tar.gz: 4010d4aeaea7c13d15cfd6a0fce757ab1d7477b5be7a72d350012a07a6b473a6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5e0a026ec99b9ccd90c2f17ce4929cc583dc331582a9ad5e64b71410c0099da6f8478d3306c72d8cd9031d8c728f86d663325fdafe16381dd15a0302317fd747
|
|
7
|
+
data.tar.gz: 3df0f2d41ab038328f30ddbf7e88e2a3c0708004b64de06df165bfb073dde2bf37a546cf4b6a3c3f7c5971ff27698094cf48f480df96dff2c639b3b6986d47af
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
name: update-gherkin-specs
|
|
2
|
+
pipelineid: update-gherkin-specs
|
|
3
|
+
|
|
4
|
+
scms:
|
|
5
|
+
default:
|
|
6
|
+
kind: github
|
|
7
|
+
spec:
|
|
8
|
+
user: '{{ requiredEnv "GIT_USER" }}'
|
|
9
|
+
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
10
|
+
owner: "{{ .github.owner }}"
|
|
11
|
+
repository: "{{ .github.repository }}"
|
|
12
|
+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
13
|
+
username: '{{ requiredEnv "GIT_USER" }}'
|
|
14
|
+
branch: "{{ .github.branch }}"
|
|
15
|
+
apm:
|
|
16
|
+
kind: github
|
|
17
|
+
spec:
|
|
18
|
+
user: '{{ requiredEnv "GIT_USER" }}'
|
|
19
|
+
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
20
|
+
owner: "{{ .github.owner }}"
|
|
21
|
+
repository: "{{ .github.apm_repository }}"
|
|
22
|
+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
23
|
+
username: '{{ requiredEnv "GIT_USER" }}'
|
|
24
|
+
branch: "{{ .github.branch }}"
|
|
25
|
+
|
|
26
|
+
sources:
|
|
27
|
+
sha:
|
|
28
|
+
kind: file
|
|
29
|
+
spec:
|
|
30
|
+
file: 'https://github.com/{{ .github.owner }}/{{ .github.apm_repository }}/commit/{{ .github.branch }}.patch'
|
|
31
|
+
matchpattern: "^From\\s([0-9a-f]{40})\\s"
|
|
32
|
+
transformers:
|
|
33
|
+
- findsubmatch:
|
|
34
|
+
pattern: "[0-9a-f]{40}"
|
|
35
|
+
pull_request:
|
|
36
|
+
kind: shell
|
|
37
|
+
dependson:
|
|
38
|
+
- sha
|
|
39
|
+
spec:
|
|
40
|
+
command: gh api /repos/{{ .github.owner }}/{{ .github.apm_repository }}/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
|
|
41
|
+
environments:
|
|
42
|
+
- name: GITHUB_TOKEN
|
|
43
|
+
- name: PATH
|
|
44
|
+
agents-gherkin-specs-tarball:
|
|
45
|
+
kind: shell
|
|
46
|
+
scmid: apm
|
|
47
|
+
dependson:
|
|
48
|
+
- sha
|
|
49
|
+
spec:
|
|
50
|
+
command: tar cvzf {{ requiredEnv "GITHUB_WORKSPACE" }}/gherkin-specs.tgz .
|
|
51
|
+
environments:
|
|
52
|
+
- name: PATH
|
|
53
|
+
workdir: "{{ .specs.apm_gherkin_path }}"
|
|
54
|
+
|
|
55
|
+
actions:
|
|
56
|
+
pr:
|
|
57
|
+
kind: "github/pullrequest"
|
|
58
|
+
scmid: default
|
|
59
|
+
spec:
|
|
60
|
+
automerge: false
|
|
61
|
+
draft: false
|
|
62
|
+
labels:
|
|
63
|
+
- "automation"
|
|
64
|
+
description: |-
|
|
65
|
+
### What
|
|
66
|
+
APM agent Gherkin specs automatic sync
|
|
67
|
+
|
|
68
|
+
### Why
|
|
69
|
+
*Changeset*
|
|
70
|
+
* {{ source "pull_request" }}
|
|
71
|
+
* https://github.com/elastic/apm/commit/{{ source "sha" }}
|
|
72
|
+
title: '[Automation] Update Gherkin specs'
|
|
73
|
+
|
|
74
|
+
targets:
|
|
75
|
+
agent-gherkin-specs:
|
|
76
|
+
name: APM agent gherkin specs {{ source "sha" }}
|
|
77
|
+
scmid: default
|
|
78
|
+
disablesourceinput: true
|
|
79
|
+
kind: shell
|
|
80
|
+
spec:
|
|
81
|
+
# git diff helps to print what it changed, If it is empty, then updatecli report a success with no changes applied.
|
|
82
|
+
# See https://www.updatecli.io/docs/plugins/resource/shell/#_shell_target
|
|
83
|
+
command: 'tar -xzf {{ requiredEnv "GITHUB_WORKSPACE" }}/gherkin-specs.tgz && git --no-pager diff'
|
|
84
|
+
workdir: "{{ .apm_agent.gherkin_specs_path }}"
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
name: update-json-specs
|
|
2
|
+
pipelineid: update-json-specs
|
|
3
|
+
|
|
4
|
+
scms:
|
|
5
|
+
default:
|
|
6
|
+
kind: github
|
|
7
|
+
spec:
|
|
8
|
+
user: '{{ requiredEnv "GIT_USER" }}'
|
|
9
|
+
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
10
|
+
owner: "{{ .github.owner }}"
|
|
11
|
+
repository: "{{ .github.repository }}"
|
|
12
|
+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
13
|
+
username: '{{ requiredEnv "GIT_USER" }}'
|
|
14
|
+
branch: "{{ .github.branch }}"
|
|
15
|
+
apm:
|
|
16
|
+
kind: github
|
|
17
|
+
spec:
|
|
18
|
+
user: '{{ requiredEnv "GIT_USER" }}'
|
|
19
|
+
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
20
|
+
owner: "{{ .github.owner }}"
|
|
21
|
+
repository: "{{ .github.apm_repository }}"
|
|
22
|
+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
23
|
+
username: '{{ requiredEnv "GIT_USER" }}'
|
|
24
|
+
branch: "{{ .github.branch }}"
|
|
25
|
+
|
|
26
|
+
sources:
|
|
27
|
+
sha:
|
|
28
|
+
kind: file
|
|
29
|
+
spec:
|
|
30
|
+
file: 'https://github.com/{{ .github.owner }}/{{ .github.apm_repository }}/commit/{{ .github.branch }}.patch'
|
|
31
|
+
matchpattern: "^From\\s([0-9a-f]{40})\\s"
|
|
32
|
+
transformers:
|
|
33
|
+
- findsubmatch:
|
|
34
|
+
pattern: "[0-9a-f]{40}"
|
|
35
|
+
pull_request:
|
|
36
|
+
kind: shell
|
|
37
|
+
dependson:
|
|
38
|
+
- sha
|
|
39
|
+
spec:
|
|
40
|
+
command: gh api /repos/{{ .github.owner }}/{{ .github.apm_repository }}/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
|
|
41
|
+
environments:
|
|
42
|
+
- name: GITHUB_TOKEN
|
|
43
|
+
- name: PATH
|
|
44
|
+
agents-json-specs-tarball:
|
|
45
|
+
kind: shell
|
|
46
|
+
scmid: apm
|
|
47
|
+
dependson:
|
|
48
|
+
- sha
|
|
49
|
+
spec:
|
|
50
|
+
command: tar cvzf {{ requiredEnv "GITHUB_WORKSPACE" }}/json-specs.tgz .
|
|
51
|
+
environments:
|
|
52
|
+
- name: PATH
|
|
53
|
+
workdir: "{{ .specs.apm_json_path }}"
|
|
54
|
+
|
|
55
|
+
actions:
|
|
56
|
+
pr:
|
|
57
|
+
kind: "github/pullrequest"
|
|
58
|
+
scmid: default
|
|
59
|
+
spec:
|
|
60
|
+
automerge: false
|
|
61
|
+
draft: false
|
|
62
|
+
labels:
|
|
63
|
+
- "automation"
|
|
64
|
+
description: |-
|
|
65
|
+
### What
|
|
66
|
+
APM agent specs automatic sync
|
|
67
|
+
|
|
68
|
+
### Why
|
|
69
|
+
*Changeset*
|
|
70
|
+
* {{ source "pull_request" }}
|
|
71
|
+
* https://github.com/{{ .github.owner }}/{{ .github.apm_repository }}/commit/{{ source "sha" }}
|
|
72
|
+
title: '[Automation] Update JSON specs'
|
|
73
|
+
|
|
74
|
+
targets:
|
|
75
|
+
agent-json-specs:
|
|
76
|
+
name: APM agent json specs {{ source "sha" }}
|
|
77
|
+
scmid: default
|
|
78
|
+
disablesourceinput: true
|
|
79
|
+
kind: shell
|
|
80
|
+
spec:
|
|
81
|
+
# git diff helps to print what it changed, If it is empty, then updatecli report a success with no changes applied.
|
|
82
|
+
# See https://www.updatecli.io/docs/plugins/resource/shell/#_shell_target
|
|
83
|
+
command: 'tar -xzf {{ requiredEnv "GITHUB_WORKSPACE" }}/json-specs.tgz && git --no-pager diff'
|
|
84
|
+
workdir: "{{ .apm_agent.json_specs_path }}"
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
name: update-specs
|
|
2
|
+
pipelineid: update-schema-specs
|
|
3
|
+
|
|
4
|
+
scms:
|
|
5
|
+
default:
|
|
6
|
+
kind: github
|
|
7
|
+
spec:
|
|
8
|
+
user: '{{ requiredEnv "GIT_USER" }}'
|
|
9
|
+
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
10
|
+
owner: "{{ .github.owner }}"
|
|
11
|
+
repository: "{{ .github.repository }}"
|
|
12
|
+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
13
|
+
username: '{{ requiredEnv "GIT_USER" }}'
|
|
14
|
+
branch: "{{ .github.branch }}"
|
|
15
|
+
|
|
16
|
+
apm-data:
|
|
17
|
+
kind: github
|
|
18
|
+
spec:
|
|
19
|
+
user: '{{ requiredEnv "GIT_USER" }}'
|
|
20
|
+
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
21
|
+
owner: "{{ .github.owner }}"
|
|
22
|
+
repository: "{{ .github.apm_data_repository }}"
|
|
23
|
+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
24
|
+
username: '{{ requiredEnv "GIT_USER" }}'
|
|
25
|
+
branch: "{{ .github.branch }}"
|
|
26
|
+
|
|
27
|
+
sources:
|
|
28
|
+
sha:
|
|
29
|
+
kind: file
|
|
30
|
+
spec:
|
|
31
|
+
file: 'https://github.com/{{ .github.owner }}/{{ .github.apm_data_repository }}/commit/{{ .github.branch }}.patch'
|
|
32
|
+
matchpattern: "^From\\s([0-9a-f]{40})\\s"
|
|
33
|
+
transformers:
|
|
34
|
+
- findsubmatch:
|
|
35
|
+
pattern: "[0-9a-f]{40}"
|
|
36
|
+
pull_request:
|
|
37
|
+
kind: shell
|
|
38
|
+
dependson:
|
|
39
|
+
- sha
|
|
40
|
+
spec:
|
|
41
|
+
command: gh api /repos/{{ .github.owner }}/{{ .github.apm_data_repository }}/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
|
|
42
|
+
environments:
|
|
43
|
+
- name: GITHUB_TOKEN
|
|
44
|
+
- name: PATH
|
|
45
|
+
agent-specs-tarball:
|
|
46
|
+
kind: shell
|
|
47
|
+
scmid: apm-data
|
|
48
|
+
dependson:
|
|
49
|
+
- sha
|
|
50
|
+
spec:
|
|
51
|
+
command: tar cvzf {{ requiredEnv "GITHUB_WORKSPACE" }}/json-schema.tgz .
|
|
52
|
+
environments:
|
|
53
|
+
- name: PATH
|
|
54
|
+
workdir: "{{ .specs.apm_data_path }}"
|
|
55
|
+
|
|
56
|
+
actions:
|
|
57
|
+
pr:
|
|
58
|
+
kind: "github/pullrequest"
|
|
59
|
+
scmid: default
|
|
60
|
+
sourceid: sha
|
|
61
|
+
spec:
|
|
62
|
+
automerge: false
|
|
63
|
+
draft: false
|
|
64
|
+
labels:
|
|
65
|
+
- "automation"
|
|
66
|
+
description: |-
|
|
67
|
+
### What
|
|
68
|
+
APM agent json server schema automatic sync
|
|
69
|
+
|
|
70
|
+
### Why
|
|
71
|
+
*Changeset*
|
|
72
|
+
* {{ source "pull_request" }}
|
|
73
|
+
* https://github.com/{{ .github.owner }}/{{ .github.apm_data_repository }}/commit/{{ source "sha" }}
|
|
74
|
+
title: '[Automation] Update JSON server schema specs'
|
|
75
|
+
|
|
76
|
+
targets:
|
|
77
|
+
agent-json-schema:
|
|
78
|
+
name: APM agent json server schema {{ source "sha" }}
|
|
79
|
+
scmid: default
|
|
80
|
+
disablesourceinput: true
|
|
81
|
+
kind: shell
|
|
82
|
+
spec:
|
|
83
|
+
# git diff helps to print what it changed, If it is empty, then updatecli report a success with no changes applied.
|
|
84
|
+
# See https://www.updatecli.io/docs/plugins/resource/shell/#_shell_target
|
|
85
|
+
command: 'tar -xzf {{ requiredEnv "GITHUB_WORKSPACE" }}/json-schema.tgz && git --no-pager diff'
|
|
86
|
+
workdir: "{{ .apm_agent.server_schema_specs_path }}"
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
github:
|
|
2
|
+
owner: "elastic"
|
|
3
|
+
repository: "apm-agent-ruby"
|
|
4
|
+
apm_repository: "apm"
|
|
5
|
+
apm_data_repository: "apm-data"
|
|
6
|
+
branch: "main"
|
|
7
|
+
specs:
|
|
8
|
+
apm_data_path: "input/elasticapm/docs/spec/v2"
|
|
9
|
+
apm_json_path: "tests/agents/json-specs"
|
|
10
|
+
apm_gherkin_path: "tests/agents/gherkin-specs"
|
|
11
|
+
apm_agent:
|
|
12
|
+
gherkin_specs_path: "features"
|
|
13
|
+
json_specs_path: "spec/fixtures"
|
|
14
|
+
server_schema_specs_path: "spec/fixtures"
|
|
@@ -1,21 +1,16 @@
|
|
|
1
1
|
---
|
|
2
|
+
# Look up results at https://ela.st/oblt-ci-cd-stats.
|
|
3
|
+
# There will be one service per GitHub repository, including the org name, and one Transaction per Workflow.
|
|
2
4
|
name: OpenTelemetry Export Trace
|
|
3
5
|
|
|
4
6
|
on:
|
|
5
7
|
workflow_run:
|
|
6
|
-
workflows:
|
|
7
|
-
- Auto Assign to Project(s)
|
|
8
|
-
- Issue Labeler
|
|
9
|
-
- ci
|
|
10
|
-
- coverage-reporter
|
|
11
|
-
- microbenchmark
|
|
12
|
-
- release
|
|
13
|
-
- run-matrix
|
|
14
|
-
- snapshoty
|
|
15
|
-
- test-reporter
|
|
16
|
-
- updatecli
|
|
8
|
+
workflows: [ "*" ]
|
|
17
9
|
types: [completed]
|
|
18
10
|
|
|
11
|
+
permissions:
|
|
12
|
+
contents: read
|
|
13
|
+
|
|
19
14
|
jobs:
|
|
20
15
|
otel-export-trace:
|
|
21
16
|
runs-on: ubuntu-latest
|
|
@@ -18,7 +18,8 @@ jobs:
|
|
|
18
18
|
vaultUrl: ${{ secrets.VAULT_ADDR }}
|
|
19
19
|
vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
|
|
20
20
|
vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
|
|
21
|
-
pipeline: .ci/updatecli.d
|
|
21
|
+
pipeline: .ci/updatecli/updatecli.d
|
|
22
|
+
values: .ci/updatecli/values.yml
|
|
22
23
|
- if: failure()
|
|
23
24
|
uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
|
|
24
25
|
with:
|
data/CHANGELOG.asciidoc
CHANGED
|
@@ -34,6 +34,13 @@ endif::[]
|
|
|
34
34
|
[[release-notes-4.x]]
|
|
35
35
|
=== Ruby Agent version 4.x
|
|
36
36
|
|
|
37
|
+
[[release-notes-4.7.3]
|
|
38
|
+
==== 4.7.3
|
|
39
|
+
|
|
40
|
+
[float]
|
|
41
|
+
===== Fixed
|
|
42
|
+
- Address a bug where if `capture_headers` is false, `ContextBuilder` will raise `"undefined method 'has_key?' for nil:NilClass"` {pull}1449[#1449]
|
|
43
|
+
|
|
37
44
|
[[release-notes-4.7.2]
|
|
38
45
|
==== 4.7.2
|
|
39
46
|
|
|
@@ -51,12 +51,14 @@ module ElasticAPM
|
|
|
51
51
|
request.body = should_capture_body?(for_type) ? get_body(req) : SKIPPED
|
|
52
52
|
|
|
53
53
|
headers, env = get_headers_and_env(rack_env)
|
|
54
|
-
request.headers = headers if config.capture_headers?
|
|
55
54
|
request.env = env if config.capture_env?
|
|
56
|
-
|
|
57
55
|
request.cookies = req.cookies.dup
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
|
|
57
|
+
if config.capture_headers?
|
|
58
|
+
request.headers = headers
|
|
59
|
+
unless request.cookies.empty?
|
|
60
|
+
request.headers['Cookie'] = SKIPPED if request.headers.has_key?('Cookie')
|
|
61
|
+
end
|
|
60
62
|
end
|
|
61
63
|
|
|
62
64
|
context
|
data/lib/elastic_apm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: elastic-apm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.7.
|
|
4
|
+
version: 4.7.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mikkel Malmberg
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2024-
|
|
12
|
+
date: 2024-04-08 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: concurrent-ruby
|
|
@@ -76,9 +76,10 @@ files:
|
|
|
76
76
|
- ".ci/scripts/bench.sh"
|
|
77
77
|
- ".ci/scripts/install-build-system.sh"
|
|
78
78
|
- ".ci/snapshoty.yml"
|
|
79
|
-
- ".ci/updatecli.d/update-gherkin-specs.yml"
|
|
80
|
-
- ".ci/updatecli.d/update-json-specs.yml"
|
|
81
|
-
- ".ci/updatecli.d/update-specs.yml"
|
|
79
|
+
- ".ci/updatecli/updatecli.d/update-gherkin-specs.yml"
|
|
80
|
+
- ".ci/updatecli/updatecli.d/update-json-specs.yml"
|
|
81
|
+
- ".ci/updatecli/updatecli.d/update-specs.yml"
|
|
82
|
+
- ".ci/updatecli/values.yml"
|
|
82
83
|
- ".github/ISSUE_TEMPLATE/Bug_report.md"
|
|
83
84
|
- ".github/ISSUE_TEMPLATE/Feature_request.md"
|
|
84
85
|
- ".github/PULL_REQUEST_TEMPLATE.md"
|
|
@@ -1,126 +0,0 @@
|
|
|
1
|
-
name: update-gherkin-specs
|
|
2
|
-
pipelineid: update-gherkin-specs
|
|
3
|
-
title: synchronize gherkin specs
|
|
4
|
-
|
|
5
|
-
scms:
|
|
6
|
-
default:
|
|
7
|
-
kind: github
|
|
8
|
-
spec:
|
|
9
|
-
user: '{{ requiredEnv "GIT_USER" }}'
|
|
10
|
-
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
11
|
-
owner: elastic
|
|
12
|
-
repository: apm-agent-ruby
|
|
13
|
-
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
14
|
-
username: '{{ requiredEnv "GIT_USER" }}'
|
|
15
|
-
branch: main
|
|
16
|
-
|
|
17
|
-
sources:
|
|
18
|
-
sha:
|
|
19
|
-
kind: file
|
|
20
|
-
spec:
|
|
21
|
-
file: 'https://github.com/elastic/apm/commit/main.patch'
|
|
22
|
-
matchpattern: "^From\\s([0-9a-f]{40})\\s"
|
|
23
|
-
transformers:
|
|
24
|
-
- findsubmatch:
|
|
25
|
-
pattern: "[0-9a-f]{40}"
|
|
26
|
-
pull_request:
|
|
27
|
-
kind: shell
|
|
28
|
-
dependson:
|
|
29
|
-
- sha
|
|
30
|
-
spec:
|
|
31
|
-
command: gh api /repos/elastic/apm/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
|
|
32
|
-
environments:
|
|
33
|
-
- name: GITHUB_TOKEN
|
|
34
|
-
- name: PATH
|
|
35
|
-
api_key.feature:
|
|
36
|
-
kind: file
|
|
37
|
-
spec:
|
|
38
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/gherkin-specs/api_key.feature
|
|
39
|
-
azure_app_service_metadata.feature:
|
|
40
|
-
kind: file
|
|
41
|
-
spec:
|
|
42
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/gherkin-specs/azure_app_service_metadata.feature
|
|
43
|
-
azure_functions_metadata.feature:
|
|
44
|
-
kind: file
|
|
45
|
-
spec:
|
|
46
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/gherkin-specs/azure_functions_metadata.feature
|
|
47
|
-
otel_bridge.feature:
|
|
48
|
-
kind: file
|
|
49
|
-
spec:
|
|
50
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/gherkin-specs/otel_bridge.feature
|
|
51
|
-
outcome.feature:
|
|
52
|
-
kind: file
|
|
53
|
-
spec:
|
|
54
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/gherkin-specs/outcome.feature
|
|
55
|
-
user_agent.feature:
|
|
56
|
-
kind: file
|
|
57
|
-
spec:
|
|
58
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/gherkin-specs/user_agent.feature
|
|
59
|
-
|
|
60
|
-
actions:
|
|
61
|
-
pr:
|
|
62
|
-
kind: "github/pullrequest"
|
|
63
|
-
scmid: default
|
|
64
|
-
title: '[Automation] Update Gherkin specs'
|
|
65
|
-
spec:
|
|
66
|
-
automerge: false
|
|
67
|
-
draft: false
|
|
68
|
-
labels:
|
|
69
|
-
- "automation"
|
|
70
|
-
description: |-
|
|
71
|
-
### What
|
|
72
|
-
APM agent Gherkin specs automatic sync
|
|
73
|
-
### Why
|
|
74
|
-
*Changeset*
|
|
75
|
-
* https://github.com/elastic/apm/commit/{{ source "sha" }}
|
|
76
|
-
* {{ source "pull_request" }}
|
|
77
|
-
|
|
78
|
-
targets:
|
|
79
|
-
api_key.feature:
|
|
80
|
-
name: api_key.feature
|
|
81
|
-
scmid: default
|
|
82
|
-
sourceid: api_key.feature
|
|
83
|
-
kind: file
|
|
84
|
-
spec:
|
|
85
|
-
file: features/api_key.feature
|
|
86
|
-
forcecreate: true
|
|
87
|
-
azure_app_service_metadata.feature:
|
|
88
|
-
name: azure_app_service_metadata.feature
|
|
89
|
-
scmid: default
|
|
90
|
-
sourceid: azure_app_service_metadata.feature
|
|
91
|
-
kind: file
|
|
92
|
-
spec:
|
|
93
|
-
file: features/azure_app_service_metadata.feature
|
|
94
|
-
forcecreate: true
|
|
95
|
-
azure_functions_metadata.feature:
|
|
96
|
-
name: azure_functions_metadata.feature
|
|
97
|
-
scmid: default
|
|
98
|
-
sourceid: azure_functions_metadata.feature
|
|
99
|
-
kind: file
|
|
100
|
-
spec:
|
|
101
|
-
file: features/azure_functions_metadata.feature
|
|
102
|
-
forcecreate: true
|
|
103
|
-
otel_bridge.feature:
|
|
104
|
-
name: otel_bridge.feature
|
|
105
|
-
scmid: default
|
|
106
|
-
sourceid: otel_bridge.feature
|
|
107
|
-
kind: file
|
|
108
|
-
spec:
|
|
109
|
-
file: features/otel_bridge.feature
|
|
110
|
-
forcecreate: true
|
|
111
|
-
outcome.feature:
|
|
112
|
-
name: outcome.feature
|
|
113
|
-
scmid: default
|
|
114
|
-
sourceid: outcome.feature
|
|
115
|
-
kind: file
|
|
116
|
-
spec:
|
|
117
|
-
file: features/outcome.feature
|
|
118
|
-
forcecreate: true
|
|
119
|
-
user_agent.feature:
|
|
120
|
-
name: user_agent.feature
|
|
121
|
-
scmid: default
|
|
122
|
-
sourceid: user_agent.feature
|
|
123
|
-
kind: file
|
|
124
|
-
spec:
|
|
125
|
-
file: features/user_agent.feature
|
|
126
|
-
forcecreate: true
|
|
@@ -1,130 +0,0 @@
|
|
|
1
|
-
name: update-json-specs
|
|
2
|
-
pipelineid: update-json-specs
|
|
3
|
-
title: synchronize json specs
|
|
4
|
-
|
|
5
|
-
scms:
|
|
6
|
-
default:
|
|
7
|
-
kind: github
|
|
8
|
-
spec:
|
|
9
|
-
user: '{{ requiredEnv "GIT_USER" }}'
|
|
10
|
-
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
11
|
-
owner: elastic
|
|
12
|
-
repository: apm-agent-ruby
|
|
13
|
-
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
14
|
-
username: '{{ requiredEnv "GIT_USER" }}'
|
|
15
|
-
branch: main
|
|
16
|
-
|
|
17
|
-
sources:
|
|
18
|
-
sha:
|
|
19
|
-
kind: file
|
|
20
|
-
spec:
|
|
21
|
-
file: 'https://github.com/elastic/apm/commit/main.patch'
|
|
22
|
-
matchpattern: "^From\\s([0-9a-f]{40})\\s"
|
|
23
|
-
transformers:
|
|
24
|
-
- findsubmatch:
|
|
25
|
-
pattern: "[0-9a-f]{40}"
|
|
26
|
-
pull_request:
|
|
27
|
-
kind: shell
|
|
28
|
-
dependson:
|
|
29
|
-
- sha
|
|
30
|
-
spec:
|
|
31
|
-
command: gh api /repos/elastic/apm/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
|
|
32
|
-
environments:
|
|
33
|
-
- name: GITHUB_TOKEN
|
|
34
|
-
- name: PATH
|
|
35
|
-
container_metadata_discovery.json:
|
|
36
|
-
kind: file
|
|
37
|
-
spec:
|
|
38
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/container_metadata_discovery.json
|
|
39
|
-
service_resource_inference.json:
|
|
40
|
-
kind: file
|
|
41
|
-
spec:
|
|
42
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/service_resource_inference.json
|
|
43
|
-
span_types.json:
|
|
44
|
-
kind: file
|
|
45
|
-
spec:
|
|
46
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/span_types.json
|
|
47
|
-
sql_signature_examples.json:
|
|
48
|
-
kind: file
|
|
49
|
-
spec:
|
|
50
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/sql_signature_examples.json
|
|
51
|
-
sql_token_examples.json:
|
|
52
|
-
kind: file
|
|
53
|
-
spec:
|
|
54
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/sql_token_examples.json
|
|
55
|
-
w3c_distributed_tracing.json:
|
|
56
|
-
kind: file
|
|
57
|
-
spec:
|
|
58
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/w3c_distributed_tracing.json
|
|
59
|
-
wildcard_matcher_tests.json:
|
|
60
|
-
kind: file
|
|
61
|
-
spec:
|
|
62
|
-
file: https://raw.githubusercontent.com/elastic/apm/main/tests/agents/json-specs/wildcard_matcher_tests.json
|
|
63
|
-
actions:
|
|
64
|
-
pr:
|
|
65
|
-
kind: "github/pullrequest"
|
|
66
|
-
scmid: default
|
|
67
|
-
title: '[Automation] Update JSON specs'
|
|
68
|
-
spec:
|
|
69
|
-
automerge: false
|
|
70
|
-
draft: false
|
|
71
|
-
labels:
|
|
72
|
-
- "automation"
|
|
73
|
-
description: |-
|
|
74
|
-
### What
|
|
75
|
-
APM agent specs automatic sync
|
|
76
|
-
### Why
|
|
77
|
-
*Changeset*
|
|
78
|
-
* https://github.com/elastic/apm/commit/{{ source "sha" }}
|
|
79
|
-
* {{ source "pull_request" }}
|
|
80
|
-
|
|
81
|
-
targets:
|
|
82
|
-
container_metadata_discovery.json:
|
|
83
|
-
name: container_metadata_discovery.json
|
|
84
|
-
scmid: default
|
|
85
|
-
sourceid: container_metadata_discovery.json
|
|
86
|
-
kind: file
|
|
87
|
-
spec:
|
|
88
|
-
file: spec/fixtures/container_metadata_discovery.json
|
|
89
|
-
service_resource_inference.json:
|
|
90
|
-
name: service_resource_inference.json
|
|
91
|
-
scmid: default
|
|
92
|
-
sourceid: service_resource_inference.json
|
|
93
|
-
kind: file
|
|
94
|
-
spec:
|
|
95
|
-
file: spec/fixtures/service_resource_inference.json
|
|
96
|
-
span_types.json:
|
|
97
|
-
name: span_types.json
|
|
98
|
-
scmid: default
|
|
99
|
-
sourceid: span_types.json
|
|
100
|
-
kind: file
|
|
101
|
-
spec:
|
|
102
|
-
file: spec/fixtures/span_types.json
|
|
103
|
-
sql_signature_examples.json:
|
|
104
|
-
name: sql_signature_examples.json
|
|
105
|
-
scmid: default
|
|
106
|
-
sourceid: sql_signature_examples.json
|
|
107
|
-
kind: file
|
|
108
|
-
spec:
|
|
109
|
-
file: spec/fixtures/sql_signature_examples.json
|
|
110
|
-
sql_token_examples.json:
|
|
111
|
-
name: sql_token_examples.json
|
|
112
|
-
scmid: default
|
|
113
|
-
sourceid: sql_token_examples.json
|
|
114
|
-
kind: file
|
|
115
|
-
spec:
|
|
116
|
-
file: spec/fixtures/sql_token_examples.json
|
|
117
|
-
w3c_distributed_tracing.json:
|
|
118
|
-
name: w3c_distributed_tracing.json
|
|
119
|
-
scmid: default
|
|
120
|
-
sourceid: w3c_distributed_tracing.json
|
|
121
|
-
kind: file
|
|
122
|
-
spec:
|
|
123
|
-
file: spec/fixtures/w3c_distributed_tracing.json
|
|
124
|
-
wildcard_matcher_tests.json:
|
|
125
|
-
name: wildcard_matcher_tests.json
|
|
126
|
-
scmid: default
|
|
127
|
-
sourceid: wildcard_matcher_tests.json
|
|
128
|
-
kind: file
|
|
129
|
-
spec:
|
|
130
|
-
file: spec/fixtures/wildcard_matcher_tests.json
|
|
@@ -1,118 +0,0 @@
|
|
|
1
|
-
name: update-specs
|
|
2
|
-
|
|
3
|
-
title: synchronize schema specs
|
|
4
|
-
|
|
5
|
-
scms:
|
|
6
|
-
default:
|
|
7
|
-
kind: github
|
|
8
|
-
spec:
|
|
9
|
-
user: '{{ requiredEnv "GIT_USER" }}'
|
|
10
|
-
email: '{{ requiredEnv "GIT_EMAIL" }}'
|
|
11
|
-
owner: elastic
|
|
12
|
-
repository: apm-agent-ruby
|
|
13
|
-
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
|
|
14
|
-
username: '{{ requiredEnv "GIT_USER" }}'
|
|
15
|
-
branch: main
|
|
16
|
-
|
|
17
|
-
sources:
|
|
18
|
-
sha:
|
|
19
|
-
kind: file
|
|
20
|
-
spec:
|
|
21
|
-
file: 'https://github.com/elastic/apm-data/commit/main.patch'
|
|
22
|
-
matchpattern: "^From\\s([0-9a-f]{40})\\s"
|
|
23
|
-
transformers:
|
|
24
|
-
- findsubmatch:
|
|
25
|
-
pattern: "[0-9a-f]{40}"
|
|
26
|
-
pull_request:
|
|
27
|
-
kind: shell
|
|
28
|
-
dependson:
|
|
29
|
-
- sha
|
|
30
|
-
spec:
|
|
31
|
-
command: gh api /repos/elastic/apm-data/commits/{{ source "sha" }}/pulls --jq '.[].html_url'
|
|
32
|
-
environments:
|
|
33
|
-
- name: GITHUB_TOKEN
|
|
34
|
-
- name: PATH
|
|
35
|
-
error.json:
|
|
36
|
-
kind: file
|
|
37
|
-
spec:
|
|
38
|
-
file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/error.json
|
|
39
|
-
metadata.json:
|
|
40
|
-
kind: file
|
|
41
|
-
spec:
|
|
42
|
-
file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/metadata.json
|
|
43
|
-
metricset.json:
|
|
44
|
-
kind: file
|
|
45
|
-
spec:
|
|
46
|
-
file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/metricset.json
|
|
47
|
-
span.json:
|
|
48
|
-
kind: file
|
|
49
|
-
spec:
|
|
50
|
-
file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/span.json
|
|
51
|
-
transaction.json:
|
|
52
|
-
kind: file
|
|
53
|
-
spec:
|
|
54
|
-
file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/transaction.json
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
actions:
|
|
61
|
-
pr:
|
|
62
|
-
kind: "github/pullrequest"
|
|
63
|
-
scmid: default
|
|
64
|
-
sourceid: sha
|
|
65
|
-
spec:
|
|
66
|
-
automerge: false
|
|
67
|
-
draft: false
|
|
68
|
-
labels:
|
|
69
|
-
- "automation"
|
|
70
|
-
description: |-
|
|
71
|
-
### What
|
|
72
|
-
APM agent json schema automatic sync
|
|
73
|
-
### Why
|
|
74
|
-
*Changeset*
|
|
75
|
-
* https://github.com/elastic/apm-data/commit/{{ source "sha" }}
|
|
76
|
-
* {{ source "pull_request" }}
|
|
77
|
-
|
|
78
|
-
targets:
|
|
79
|
-
error.json:
|
|
80
|
-
name: error.json
|
|
81
|
-
scmid: default
|
|
82
|
-
sourceid: error.json
|
|
83
|
-
kind: file
|
|
84
|
-
spec:
|
|
85
|
-
file: spec/fixtures/error.json
|
|
86
|
-
forcecreate: true
|
|
87
|
-
metadata.json:
|
|
88
|
-
name: metadata.json
|
|
89
|
-
scmid: default
|
|
90
|
-
sourceid: metadata.json
|
|
91
|
-
kind: file
|
|
92
|
-
spec:
|
|
93
|
-
file: spec/fixtures/metadata.json
|
|
94
|
-
forcecreate: true
|
|
95
|
-
metricset.json:
|
|
96
|
-
name: metricset.json
|
|
97
|
-
scmid: default
|
|
98
|
-
sourceid: metricset.json
|
|
99
|
-
kind: file
|
|
100
|
-
spec:
|
|
101
|
-
file: spec/fixtures/metricset.json
|
|
102
|
-
forcecreate: true
|
|
103
|
-
span.json:
|
|
104
|
-
name: span.json
|
|
105
|
-
scmid: default
|
|
106
|
-
sourceid: span.json
|
|
107
|
-
kind: file
|
|
108
|
-
spec:
|
|
109
|
-
file: spec/fixtures/span.json
|
|
110
|
-
forcecreate: true
|
|
111
|
-
transaction.json:
|
|
112
|
-
name: transaction.json
|
|
113
|
-
scmid: default
|
|
114
|
-
sourceid: transaction.json
|
|
115
|
-
kind: file
|
|
116
|
-
spec:
|
|
117
|
-
file: spec/fixtures/transaction.json
|
|
118
|
-
forcecreate: true
|