Skip to content

Commit 36d84c6

Browse files
committed
Merge branch 'feature/workflow-build-images' into test/workflow-build-images
* feature/workflow-build-images: Revert "enable docker buildx" enable docker buildx github container registry Use github container registry Update .ci/docker/README.md publihs run manually docs run pr github-actions: build images build(deps): bump certifi from 2025.1.31 to 2025.4.26 in /dev-utils (#2282) build(deps): bump wolfi/chainguard-base from `1c7f5aa` to `67d82bc` (#2280) build(deps): bump docker/build-push-action (#2281) chore: deps(updatecli): Bump updatecli version to v0.98.0 (#2276) fix image paths for docs-assembler (#2274) [DOCS] Specifies no known issues (#2272) tests: skip client verify_server_cert disabling tests in fips mode (#2270) build(deps): bump wolfi/chainguard-base from `c56628d` to `1c7f5aa` (#2271) update apm links (#2268)
2 parents c5f09f5 + d192428 commit 36d84c6

File tree

14 files changed

+68
-58
lines changed

14 files changed

+68
-58
lines changed

.github/workflows/build-images.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,32 @@ on:
77
- test/workflow-build-images
88
workflow_dispatch: ~
99

10-
env:
11-
DOCKER_BUILDKIT: 1
12-
1310
permissions:
1411
contents: read
1512

1613
jobs:
1714

18-
build-test-push:
15+
build-push:
1916
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
packages: write
20+
env:
21+
REGISTRY: ghcr.io
22+
IMAGE_NAME: ${{ github.repository }}/apm-agent-python-testing
2023
steps:
2124

2225
- uses: actions/checkout@v4
2326

24-
- name: Login to dockerhub
27+
- name: Login to ghcr.io
2528
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
2629
with:
27-
registry: ${{ secrets.DOCKERHUB_REGISTRY }}
28-
username: ${{ secrets.DOCKERHUB_USERNAME }}
29-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
30+
registry: ${{ env.REGISTRY }}
31+
username: ${{ github.actor }}
32+
password: ${{ secrets.GITHUB_TOKEN }}
3033

31-
- run: ./util.sh --action build --registry "elasticobservability"
34+
- run: ./util.sh --action build --registry ${{ env.REGISTRY }} --image-name ${{ env.IMAGE_NAME }}
3235
working-directory: .ci/docker
3336

34-
- run: docker images
35-
36-
- run: ./util.sh --action push --registry "elasticobservability"
37+
- run: ./util.sh --action push --registry ${{ env.REGISTRY }} --image-name ${{ env.IMAGE_NAME }}
3738
working-directory: .ci/docker

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
147147
- name: Build and push image
148148
id: docker-push
149-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
149+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
150150
with:
151151
context: .
152152
platforms: linux/amd64,linux/arm64

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
updatecli v0.97.0
1+
updatecli v0.98.0

Dockerfile.wolfi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:c56628d8102cc34eeb4aaaf6279e88d2b23775569f9deeacc915b52f28163b8f
1+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:67d82bc56a9c34572abe331c14f5e4b23a284d94a5bc1ea3be64f991ced51892
22
ARG AGENT_DIR
33
COPY ${AGENT_DIR} /opt/python

dev-utils/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# These are the pinned requirements for the lambda layer/docker image
2-
certifi==2025.1.31
2+
certifi==2025.4.26
33
urllib3==1.26.20
44
wrapt==1.14.1

docs/reference/api-reference.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ except ValueError:
6464

6565
* `exc_info`: A `(type, value, traceback)` tuple as returned by [`sys.exc_info()`](https://docs.python.org/3/library/sys.html#sys.exc_info). If not provided, it will be captured automatically.
6666
* `date`: A `datetime.datetime` object representing the occurrence time of the error. If left empty, it defaults to `datetime.datetime.utcnow()`.
67-
* `context`: A dictionary with contextual information. This dictionary must follow the [Context](docs-content://solutions/observability/apps/elastic-apm-events-intake-api.md#apm-api-error) schema definition.
67+
* `context`: A dictionary with contextual information. This dictionary must follow the [Context](docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md#apm-api-error) schema definition.
6868
* `custom`: A dictionary of custom data you want to attach to the event.
6969
* `handled`: A boolean to indicate if this exception was handled or not.
7070

@@ -94,7 +94,7 @@ client.capture_message('Billing process succeeded.')
9494
* `stack`: If set to `True` (the default), a stacktrace from the call site will be captured.
9595
* `exc_info`: A `(type, value, traceback)` tuple as returned by [`sys.exc_info()`](https://docs.python.org/3/library/sys.html#sys.exc_info). If not provided, it will be captured automatically, if `capture_message()` was called in an `except` block.
9696
* `date`: A `datetime.datetime` object representing the occurrence time of the error. If left empty, it defaults to `datetime.datetime.utcnow()`.
97-
* `context`: A dictionary with contextual information. This dictionary must follow the [Context](docs-content://solutions/observability/apps/elastic-apm-events-intake-api.md#apm-api-error) schema definition.
97+
* `context`: A dictionary with contextual information. This dictionary must follow the [Context](docs-content://solutions/observability/apm/elastic-apm-events-intake-api.md#apm-api-error) schema definition.
9898
* `custom`: A dictionary of custom data you want to attach to the event.
9999

100100
Returns the id of the message as a string.
@@ -321,7 +321,7 @@ Added in v2.0.0.
321321
Attach custom contextual data to the current transaction and errors. Supported frameworks will automatically attach information about the HTTP request and the logged in user. You can attach further data using this function.
322322

323323
::::{tip}
324-
Before using custom context, ensure you understand the different types of [metadata](docs-content://solutions/observability/apps/metadata.md) that are available.
324+
Before using custom context, ensure you understand the different types of [metadata](docs-content://solutions/observability/apm/metadata.md) that are available.
325325
::::
326326

327327

@@ -440,7 +440,7 @@ Added in v5.0.0.
440440
Attach labels to the the current transaction and errors.
441441

442442
::::{tip}
443-
Before using custom labels, ensure you understand the different types of [metadata](docs-content://solutions/observability/apps/metadata.md) that are available.
443+
Before using custom labels, ensure you understand the different types of [metadata](docs-content://solutions/observability/apm/metadata.md) that are available.
444444
::::
445445

446446

docs/reference/azure-functions-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mapped_pages:
88

99
## Prerequisites [_prerequisites_2]
1010

11-
You need an APM Server to which you can send APM data. Follow the [APM Quick start](docs-content://solutions/observability/apps/fleet-managed-apm-server.md) if you have not set one up yet. For the best-possible performance, we recommend setting up APM on {{ecloud}} in the same Azure region as your Azure Functions app.
11+
You need an APM Server to which you can send APM data. Follow the [APM Quick start](docs-content://solutions/observability/apm/get-started-fleet-managed-apm-server.md) if you have not set one up yet. For the best-possible performance, we recommend setting up APM on {{ecloud}} in the same Azure region as your Azure Functions app.
1212

1313
::::{note}
1414
Currently, only HTTP and timer triggers are supported. Other trigger types may be captured as well, but the amount of captured contextual data may differ.
@@ -40,7 +40,7 @@ You need to add `elastic-apm` as a dependency for your Functions app. Simply add
4040

4141
The APM Python agent is configured through [App Settings](https://learn.microsoft.com/en-us/azure/azure-functions/functions-how-to-use-azure-function-app-settings?tabs=portal#settings). These are then picked up by the agent as environment variables.
4242

43-
For the minimal configuration, you will need the [`ELASTIC_APM_SERVER_URL`](/reference/configuration.md#config-server-url) to set the destination for APM data and a [`ELASTIC_APM_SECRET_TOKEN`](/reference/configuration.md#config-secret-token). If you prefer to use an [APM API key](docs-content://solutions/observability/apps/api-keys.md) instead of the APM secret token, use the [`ELASTIC_APM_API_KEY`](/reference/configuration.md#config-api-key) environment variable instead of `ELASTIC_APM_SECRET_TOKEN` in the following example configuration.
43+
For the minimal configuration, you will need the [`ELASTIC_APM_SERVER_URL`](/reference/configuration.md#config-server-url) to set the destination for APM data and a [`ELASTIC_APM_SECRET_TOKEN`](/reference/configuration.md#config-secret-token). If you prefer to use an [APM API key](docs-content://solutions/observability/apm/api-keys.md) instead of the APM secret token, use the [`ELASTIC_APM_API_KEY`](/reference/configuration.md#config-api-key) environment variable instead of `ELASTIC_APM_SECRET_TOKEN` in the following example configuration.
4444

4545
```bash
4646
$ az functionapp config appsettings set --settings ELASTIC_APM_SERVER_URL=https://example.apm.northeurope.azure.elastic-cloud.com:443

0 commit comments

Comments
 (0)