Skip to content

Commit b74edca

Browse files
authored
Merge branch 'main' into support-ruby-3.4
2 parents 90f4887 + b40bcd7 commit b74edca

File tree

7 files changed

+22
-499
lines changed

7 files changed

+22
-499
lines changed

.github/workflows/updatecli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
"pull_requests": "write"
3030
}
3131
32-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
32+
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
3333
with:
3434
registry: ghcr.io
3535
username: ${{ github.actor }}

docs/docset.yml

Lines changed: 0 additions & 480 deletions
Large diffs are not rendered by default.

docs/reference/api-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ Arguments:
300300
Returns the set `value`.
301301

302302
::::{warning}
303-
Be aware that labels are indexed in Elasticsearch. Using too many unique keys will result in **https://www.elastic.co/blog/found-crash-elasticsearch#mapping-explosion[Mapping explosion]**.
303+
Be aware that labels are indexed in Elasticsearch. Using too many unique keys will result in **[Mapping explosion](https://www.elastic.co/blog/found-crash-elasticsearch#mapping-explosion)**.
304304
::::
305305

306306

docs/reference/configuration.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ Options are applied in the following order (last one wins):
2323
2. Arguments to `ElasticAPM.start` / `Config.new`
2424
3. Config file, e.g., `config/elastic_apm.yml`
2525
4. Environment variables
26-
5. [Central configuration](docs-content://solutions/observability/apps/apm-agent-central-configuration.md) (supported options are marked with [![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration))
26+
5. [Central configuration](docs-content://solutions/observability/apps/apm-agent-central-configuration.md) (supported options are marked with [![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration))
2727

2828

2929
## Dynamic configuration [dynamic-configuration]
3030

31-
Configuration options marked with the ![dynamic config](../images/dynamic-config.svg "") badge can be changed at runtime when set from a supported source.
31+
Configuration options marked with the ![dynamic config](images/dynamic-config.svg "") badge can be changed at runtime when set from a supported source.
3232

3333
The Agent supports [Central configuration](docs-content://solutions/observability/apps/apm-agent-central-configuration.md), which allows you to fine-tune certain configurations via the APM app. This feature is enabled in the Agent by default, with [`central_config`](#config-central-config).
3434

@@ -65,7 +65,7 @@ ElasticAPM::Sinatra.start(
6565
)
6666
```
6767

68-
See [Getting started with Rack](/reference/getting-started-rack.md).
68+
See [Getting started with Rack](getting-started-rack.md).
6969

7070

7171
## Grape and Rack [_grape_and_rack]
@@ -80,7 +80,7 @@ ElasticAPM::Grape.start(
8080
)
8181
```
8282

83-
See [Getting started with Rack](/reference/getting-started-rack.md).
83+
See [Getting started with Rack](getting-started-rack.md).
8484

8585

8686
## Options [_options]
@@ -154,7 +154,7 @@ If you hit the limit, consider increasing the agent’s [worker pool size](#conf
154154

155155
### `api_request_size` [config-api-request-size]
156156

157-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
157+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
158158

159159
| | | |
160160
| --- | --- | --- |
@@ -168,7 +168,7 @@ This must be provided in **[size format](#config-format-size)**.
168168

169169
### `api_request_time` [config-api-request-time]
170170

171-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
171+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
172172

173173
| | | |
174174
| --- | --- | --- |
@@ -197,7 +197,7 @@ This feature requires APM Server and Kibana >= 7.3.
197197

198198
### `capture_body` [config-capture-body]
199199

200-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
200+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
201201

202202
| | | | |
203203
| --- | --- | --- | --- |
@@ -218,7 +218,7 @@ Request bodies often contain sensitive values like passwords and credit card num
218218

219219
### `capture_headers` [config-capture-headers]
220220

221-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
221+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
222222

223223
| | | |
224224
| --- | --- | --- |
@@ -404,7 +404,7 @@ The host name to use when sending error and transaction data to the APM server.
404404

405405
Use this option to ignore certain URL patterns such as healthchecks or admin sections.
406406

407-
*Ignoring* in this context means *don’t wrap in a [Transaction](/reference/api-reference.md#api-transaction)*. Errors will still be reported.
407+
*Ignoring* in this context means *don’t wrap in a [Transaction](api-reference.md#api-transaction)*. Errors will still be reported.
408408

409409
Use a comma separated string when setting this option via `ENV`. Eg. `ELASTIC_APM_IGNORE_URL_PATTERNS="a,b" # => [/a/, /b/]`
410410

@@ -444,7 +444,7 @@ Note that if you’re using Rails, the agent will ignore this option and use the
444444

445445
### `log_level` [config-log-level]
446446

447-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
447+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
448448

449449
| Environment | `Config` key | Default |
450450
| --- | --- | --- |
@@ -526,7 +526,7 @@ See [Http.rb’s docs](https://github.com/httprb/http/wiki/Proxy-Support).
526526

527527
### `recording` [config-recording]
528528

529-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
529+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
530530

531531
| Environment | `Config` key | Default |
532532
| --- | --- | --- |
@@ -619,7 +619,7 @@ Especially for spans, collecting source code can have a large impact on storage
619619
620620
### `span_frames_min_duration` [config-span-frames-min-duration-ms]
621621
622-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
622+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
623623
624624
| | | |
625625
| --- | --- | --- |
@@ -655,7 +655,7 @@ The maximum number of stack trace lines per span/error.
655655
656656
### `transaction_max_spans` [config-transaction-max-spans]
657657
658-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
658+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
659659
660660
| | | |
661661
| --- | --- | --- |
@@ -667,7 +667,7 @@ Limits the amount of spans that are recorded per transaction. This is helpful in
667667
668668
### `transaction_sample_rate` [config-transaction-sample-rate]
669669
670-
[![dynamic config](../images/dynamic-config.svg "") ](#dynamic-configuration)
670+
[![dynamic config](images/dynamic-config.svg "") ](#dynamic-configuration)
671671
672672
| | | |
673673
| --- | --- | --- |

docs/reference/logs.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
mapped_pages:
3-
- https://www.elastic.co/guide/en/apm/agent/ruby/master/logs.html
43
- https://www.elastic.co/guide/en/apm/agent/ruby/current/log-correlation.html
54
---
65

docs/release-notes/known-issues.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
---
2-
navigation_title: "Elastic APM Ruby Agent"
2+
navigation_title: "Known issues"
33

44
---
55

66
# Elastic APM Ruby Agent known issues [elastic-apm-ruby-agent-known-issues]
77

8+
Known issues are significant defects or limitations that may impact your implementation. These issues are actively being worked on and will be addressed in a future release. Review the Elastic APM Ruby Agent known issues to help you make informed decisions, such as upgrading to a new version.
9+
810
% Use the following template to add entries to this page.
911

1012
% :::{dropdown} Title of known issue
@@ -17,4 +19,6 @@ navigation_title: "Elastic APM Ruby Agent"
1719
% **Resolved**
1820
% On [Month/Day/Year], this issue was resolved.
1921

20-
:::
22+
:::
23+
24+
_No known issues_

0 commit comments

Comments
 (0)