Skip to content

Commit

Permalink
Merge branch '8.15' into mergify/bp/8.15/pr-13620
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jul 14, 2024
2 parents 7c05d56 + 06a75e3 commit eab1e6c
Show file tree
Hide file tree
Showing 16 changed files with 274 additions and 64 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,13 @@ smoketest/all/cleanup:
echo "-> Cleanup $${test_dir} smoke tests..."; \
$(MAKE) smoketest/cleanup TEST_DIR=$${test_dir}; \
done

.PHONY: api-docs
api-docs: ## Generate bundled OpenAPI documents
@npx @redocly/cli bundle "docs/spec/openapi/apm-openapi.yaml" --ext yaml --output "docs/spec/openapi/bundled.yaml"
@npx @redocly/cli bundle "docs/spec/openapi/apm-openapi.yaml" --ext json --output "docs/spec/openapi/bundled.json"

.PHONY: api-docs-lint
api-docs-lint: ## Run spectral API docs linter
@npx @stoplight/spectral-cli lint "docs/spec/openapi/bundled.yaml" --ruleset "docs/spec/openapi/.spectral.yaml"

28 changes: 14 additions & 14 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ these terms.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/apm-data
Version: v1.8.1
Version: v1.8.4
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.8.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.8.4/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.8.1

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20240705174358-6e97683404dd
Version: v7.0.0-alpha2.0.20240712104211-aa5ec880ee71
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240705174358-6e97683404dd/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240712104211-aa5ec880ee71/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
Expand Down Expand Up @@ -6249,11 +6249,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
Version: v0.26.0
Version: v0.27.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.26.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.27.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -6323,11 +6323,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/term
Version: v0.21.0
Version: v0.22.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.21.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.22.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -9834,11 +9834,11 @@ limitations under the License.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/opentelemetry-lib
Version: v0.7.0
Version: v0.7.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.7.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.7.2/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -16934,11 +16934,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
Version: v0.24.0
Version: v0.25.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.24.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.25.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -17008,11 +17008,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.21.0
Version: v0.22.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.21.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.22.0/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down
3 changes: 2 additions & 1 deletion changelogs/8.14.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ https://github.com/elastic/apm-server/compare/v8.14.1\...v8.14.2[View commits]

No significant changes.

=== Added
[float]
==== Added
- Optimize memory usage and disk read IO for Tail Based Sampling {pull}13464[13464]

[float]
Expand Down
4 changes: 2 additions & 2 deletions changelogs/8.15.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[[apm-release-notes-8.15.0]]
=== APM version 8.15.0

https://github.com/elastic/apm-server/compare/v8.14.2\...v8.15.0[View commits]
https://github.com/elastic/apm-server/compare/v8.14.3\...v8.15.0[View commits]

[float]
==== Bug fixes
Expand All @@ -33,6 +33,6 @@ https://github.com/elastic/apm-server/compare/v8.14.2\...v8.15.0[View commits]
- Upgraded bundled APM Java agent attacher CLI to version 1.50.0 {pull}13326[13326]
- Enable Kibana curated UIs to work with hostmetrics from OpenTelemetry's https://pkg.go.dev/go.opentelemetry.io/collector/receiver/hostmetricsreceiver[hostmetricsreceiver] {pull}13196[13196]
- Add require data stream to bulk index requests {pull}13398[13398]
- Support self-instrumentation when in managed mode by getting tracing configs via reloader {pull}13514[13514]
- Support self-instrumentation when in managed mode by getting tracing configs via reloader {pull}13514[13514] {pull}13653[13653]
- Add mapping for OpenTelemetry attribute `messaging.destination.name` to derive `service.target` correctly {pull}13472[13472]
- APM Server now automatically retries document-level 429s from Elasticsearch to avoid dropping data. `output.elasticsearch.max_retries` now controls both request-level and document-level retries, and defaults to `3`. {pull}13620[13620]
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x-logging: &default-logging
max-size: "1g"
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-474afc1d-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0-9cf398b8-SNAPSHOT
ports:
- 9200:9200
healthcheck:
Expand Down Expand Up @@ -41,7 +41,7 @@ services:
logging: *default-logging

kibana:
image: docker.elastic.co/kibana/kibana:8.15.0-474afc1d-SNAPSHOT
image: docker.elastic.co/kibana/kibana:8.15.0-9cf398b8-SNAPSHOT
ports:
- 5601:5601
healthcheck:
Expand All @@ -60,7 +60,7 @@ services:
logging: *default-logging

metricbeat:
image: docker.elastic.co/beats/metricbeat:8.15.0-474afc1d-SNAPSHOT
image: docker.elastic.co/beats/metricbeat:8.15.0-9cf398b8-SNAPSHOT
environment:
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"
Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
> * **Sample data sets** that are injected into the docs are in the [`docs/data/`](/docs/data/) directory.
> * **Specifications** that are injected into the docs are in the [`docs/spec/`](/docs/spec/) directory.
To generate the bundled files in the [`docs/spec/openapi`](/docs/spec/openapi) directory, use [redocly bundle](https://redocly.com/docs/cli/commands/bundle/). For example:
To generate the bundled files in the [`docs/spec/openapi`](/docs/spec/openapi) directory, use the following make commands:

```
npx @redocly/cli bundle apm-openapi.yaml --output bundled.yaml --ext yaml
npx @redocly/cli bundle apm-openapi.yaml --output bundled.json --ext json
make api-docs
make api-docs-lint
```

104 changes: 104 additions & 0 deletions docs/spec/openapi/.spectral.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
extends: ["spectral:oas"]
rules:
# Built-in rules
# Descriptions
oas3-parameter-description: warn
oas2-parameter-description: warn
tag-description: info
# Document info
info-contact: info
info-description: warn
info-license: warn
# Examples
oas3-valid-media-example: false
oas3-valid-schema-example: false
oas2-valid-media-example: false
# Operations
operation-operationId: false
operation-operationId-unique: false
operation-operationId-valid-in-url: false
operation-tag-defined: warn
operation-tags: warn
# Responses
operation-success-response: warn
# Schema
oas3-schema: error
oas2-schema: error
array-items: false
# Tags
openapi-tags: warn
openapi-tags-alphabetical: info
# Turn off some built-in rules
operation-description: false
operation-singular-tag: false
# Custom rules
# Descriptions
avoid-problematic-words:
description: Ban certain words from descriptions
message: "Use appropriate replacements for problematic terms"
severity: warn
given: "$..*.description"
then:
function: pattern
functionOptions:
notMatch: /(blacklist|whitelist|execute|kill)/i
# Examples
operation-success-examples:
formats: ["oas3_1"]
description: Response code 200 should have at least one example.
message: "Each response body should have a realistic example. It must not contain any sensitive or confidential data."
severity: info
given: $.paths[*].[*].responses.[200].content.[application/json]
then:
field: examples
function: defined
# Extensions
internal-extension:
description: Operations should not have x-internal extension.
message: "Do not publish x-internal operations"
severity: error
given: $.paths[*].[get,put,post,delete,options,head,patch,trace]
then:
field: x-internal
function: undefined
# Operations
operation-summary:
description: Operations should have summaries.
message: "Each operation should have a summary"
severity: error
recommended: true
given: $.paths[*].[get,put,post,delete,options,head,patch,trace]
then:
field: summary
function: defined
operation-summary-length:
description: Operation summary should be between 5 and 45 characters
given: "$.paths[*].[get,put,post,delete,options,head,patch,trace]"
then:
field: summary
function: length
functionOptions:
max: 45
min: 5
severity: warn
simple-verbs-in-summary:
given:
- "$.paths[*][*].summary"
then:
function: pattern
functionOptions:
notMatch: "Retrieve|Return|List *"
severity: warn
description: Summaries should use common verbs.
message: "Summaries should use common verbs like Get, Update, Delete whenever possible"
# NOTE: This one hiccups on acronyms so perhaps too noisy
# docs-operation-summary-sentence-case:
# description: Operation summary should be sentence cased
# given: "$.paths[*].[get,put,post,delete,options,head,patch,trace]"
# then:
# field: summary
# function: pattern
# functionOptions:
# match: /^[A-Z]+[^A-Z]+$/
# severity: warn

4 changes: 2 additions & 2 deletions docs/spec/openapi/apm-openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.1.0
info:
title: APM Server
description: OpenAPI schema for APM Server APIs
title: Observability Intake APIs
description: OpenAPI schema for Observability Intake APIs
version: '0.1'
license:
name: Elastic License 2.0
Expand Down
4 changes: 2 additions & 2 deletions docs/spec/openapi/bundled.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"openapi": "3.1.0",
"info": {
"title": "APM Server",
"description": "OpenAPI schema for APM Server APIs",
"title": "Observability Intake APIs",
"description": "OpenAPI schema for Observability Intake APIs",
"version": "0.1",
"license": {
"name": "Elastic License 2.0",
Expand Down
18 changes: 9 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/dgraph-io/badger/v2 v2.2007.4
github.com/dustin/go-humanize v1.0.1
github.com/elastic/apm-aggregation v1.0.1
github.com/elastic/apm-data v1.8.1
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240705174358-6e97683404dd
github.com/elastic/apm-data v1.8.4
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240712104211-aa5ec880ee71
github.com/elastic/elastic-agent-client/v7 v7.13.0
github.com/elastic/elastic-agent-libs v0.9.13
github.com/elastic/elastic-agent-system-metrics v0.10.3
Expand Down Expand Up @@ -50,9 +50,9 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.28.0
go.uber.org/automaxprocs v1.5.3
go.uber.org/zap v1.27.0
golang.org/x/net v0.26.0
golang.org/x/net v0.27.0
golang.org/x/sync v0.7.0
golang.org/x/term v0.21.0
golang.org/x/term v0.22.0
golang.org/x/time v0.5.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
Expand Down Expand Up @@ -90,7 +90,7 @@ require (
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/opentelemetry-lib v0.7.0 // indirect
github.com/elastic/opentelemetry-lib v0.7.2 // indirect
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/frankban/quicktest v1.14.0 // indirect
Expand Down Expand Up @@ -150,12 +150,12 @@ require (
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
Expand Down
Loading

0 comments on commit eab1e6c

Please sign in to comment.