Skip to content

Commit 0cdbb3b

Browse files
committed
merge main
Signed-off-by: Jay DeLuca <jaydeluca4@gmail.com>
2 parents c709cc7 + ea0c71e commit 0cdbb3b

File tree

37 files changed

+1148
-972
lines changed

37 files changed

+1148
-972
lines changed

.github/workflows/acceptance-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1616
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
1717
with:
18-
version: v2025.12.13
19-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
18+
version: v2026.1.1
19+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
2020
- name: Run acceptance tests
2121
run: mise run acceptance-test

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
persist-credentials: false
1515
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
1616
with:
17-
version: v2025.12.13
18-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
17+
version: v2026.1.1
18+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
1919
- name: Cache local Maven repository
2020
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
2121
with:

.github/workflows/github-pages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
fetch-depth: 0
4040
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
4141
with:
42-
version: v2025.12.13
43-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
42+
version: v2026.1.1
43+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
4444
cache: "false"
4545
- name: Setup Pages
4646
id: pages

.github/workflows/lint-rest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1616
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
1717
with:
18-
version: v2025.12.13
19-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
18+
version: v2026.1.1
19+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
2020
- name: Lint
2121
run: mise run lint:rest

.github/workflows/native-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1616
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
1717
with:
18-
version: v2025.12.13
19-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
18+
version: v2026.1.1
19+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
2020
working_directory: .mise/envs/native
2121
- name: Run native tests
2222
working-directory: .mise/envs/native

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626

2727
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
2828
with:
29-
version: v2025.12.13
30-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
29+
version: v2026.1.1
30+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
3131
cache: false
3232

3333
- name: Build release version

.github/workflows/test-release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
persist-credentials: false
1919
- uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
2020
with:
21-
version: v2025.12.13
22-
sha256: 2134c55725d08547cddc921f84ddac05c9de1700115c32817563435072cae5ed
21+
version: v2026.1.1
22+
sha256: 986e4630dfdfaae41d09c0317507e252c7403d72839fc66844b534c120a3dc57
2323
- name: Cache local Maven repository
2424
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
2525
with:

examples/example-exemplars-tail-sampling/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ services:
3636
- -jar
3737
- /example-greeting-service.jar
3838
collector:
39-
image: otel/opentelemetry-collector-contrib:0.142.0@sha256:38c349c3b7a2fd7ea46700cde8fa13d35b699ef2ce245bdf34dae2a413512f76
39+
image: otel/opentelemetry-collector-contrib:0.143.1@sha256:f051aff195ad50ed5ad9d95bcdd51d7258200c937def3797cf830366ed62e034
4040
network_mode: host
4141
volumes:
4242
- ./config/otelcol-config.yaml:/config.yaml
4343
command:
4444
- --config=file:/config.yaml
4545
prometheus:
46-
image: prom/prometheus:v3.8.1@sha256:2b6f734e372c1b4717008f7d0a0152316aedd4d13ae17ef1e3268dbfaf68041b
46+
image: prom/prometheus:v3.9.1@sha256:1f0f50f06acaceb0f5670d2c8a658a599affe7b0d8e78b898c1035653849a702
4747
network_mode: host
4848
volumes:
4949
- ./config/prometheus.yaml:/prometheus.yaml

examples/example-exporter-opentelemetry/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ services:
1313
#- -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
1414
- /example-exporter-opentelemetry.jar
1515
collector:
16-
image: otel/opentelemetry-collector-contrib:0.142.0@sha256:38c349c3b7a2fd7ea46700cde8fa13d35b699ef2ce245bdf34dae2a413512f76
16+
image: otel/opentelemetry-collector-contrib:0.143.1@sha256:f051aff195ad50ed5ad9d95bcdd51d7258200c937def3797cf830366ed62e034
1717
network_mode: host
1818
volumes:
1919
- ./config/otelcol-config.yaml:/config.yaml
2020
command:
2121
- --config=file:/config.yaml
2222
prometheus:
23-
image: prom/prometheus:v3.8.1@sha256:2b6f734e372c1b4717008f7d0a0152316aedd4d13ae17ef1e3268dbfaf68041b
23+
image: prom/prometheus:v3.9.1@sha256:1f0f50f06acaceb0f5670d2c8a658a599affe7b0d8e78b898c1035653849a702
2424
network_mode: host
2525
volumes:
2626
- ./config/prometheus.yaml:/prometheus.yaml

examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:25.0.1_8-jre@sha256:f6b092537e68d9836e86f676344e94102f2be325bbc652133cd9ef85b27d3ea9
1+
FROM eclipse-temurin:25.0.1_8-jre@sha256:968f1917fcfa8250e72c39c68118798a5c86923a709c174578179b318f9033e6
22

33
COPY target/example-exporter-opentelemetry.jar ./app.jar
44
# check that the resource attributes from the agent are used, epsecially the service.instance.id should be the same

0 commit comments

Comments
 (0)