Skip to content

Commit 9cd5957

Browse files
robsundayrobsunday
committed
Merge branch 'main' into 2689_Unsatisfactory_behavior_of_snapshot_selector
# Conflicts: # profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingConfigurationCustomizerProviderTest.java # profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotVolumePropagatorComponentProviderTest.java
2 parents f2a1392 + 1d124c7 commit 9cd5957

File tree

33 files changed

+437
-187
lines changed

33 files changed

+437
-187
lines changed

.lychee.toml renamed to .github/config/lychee.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Lychee configuration file
2+
# See https://lychee.cli.rs/guides/config/
3+
14
timeout = 30
25
retry_wait_time = 5
36
max_retries = 6

‎.github/workflows/ci.yaml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,9 @@ on:
1313

1414
jobs:
1515
check-links:
16-
runs-on: ubuntu-24.04
17-
steps:
18-
- uses: actions/checkout@v6.0.2
19-
20-
- name: Check all links in *.md files
21-
id: lychee
22-
uses: lycheeverse/lychee-action@v2.8.0
23-
with:
24-
lycheeVersion: v0.18.1
25-
args: >-
26-
-v -n "*.md" "**/*.md"
27-
--config .lychee.toml
28-
--github-token ${{ github.token }}
16+
# release branches are excluded
17+
if: "!startsWith(github.ref_name, 'release/')"
18+
uses: ./.github/workflows/reusable-link-check.yml
2919

3020
build:
3121
runs-on: ubuntu-24.04
@@ -39,7 +29,7 @@ jobs:
3929
java-version: 17
4030

4131
- name: Cache Gradle Wrapper
42-
uses: actions/cache@v5.0.3
32+
uses: actions/cache@v5.0.4
4333
with:
4434
path: ~/.gradle/wrapper
4535
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -63,7 +53,7 @@ jobs:
6353
java-version: 17
6454

6555
- name: Cache Gradle Wrapper
66-
uses: actions/cache@v5.0.3
56+
uses: actions/cache@v5.0.4
6757
with:
6858
path: ~/.gradle/wrapper
6959
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -90,7 +80,7 @@ jobs:
9080
java-version: 17
9181

9282
- name: Cache Gradle Wrapper
93-
uses: actions/cache@v5.0.3
83+
uses: actions/cache@v5.0.4
9484
with:
9585
path: ~/.gradle/wrapper
9686
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -115,7 +105,7 @@ jobs:
115105
java-version: 17
116106

117107
- name: Cache Gradle Wrapper
118-
uses: actions/cache@v5.0.3
108+
uses: actions/cache@v5.0.4
119109
with:
120110
path: ~/.gradle/wrapper
121111
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -156,7 +146,7 @@ jobs:
156146
java-version: 17
157147

158148
- name: Cache Gradle Wrapper
159-
uses: actions/cache@v5.0.3
149+
uses: actions/cache@v5.0.4
160150
with:
161151
path: ~/.gradle/wrapper
162152
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

‎.github/workflows/nightly.yaml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,9 @@ on:
77

88
jobs:
99
check-links:
10-
runs-on: ubuntu-24.04
11-
steps:
12-
- uses: actions/checkout@v6.0.2
13-
14-
- name: Check all links in *.md files
15-
id: lychee
16-
uses: lycheeverse/lychee-action@v2.8.0
17-
with:
18-
lycheeVersion: v0.18.1
19-
args: >-
20-
-v -n "*.md" "**/*.md"
21-
--config .lychee.toml
22-
--github-token ${{ github.token }}
10+
# release branches are excluded
11+
if: "!startsWith(github.ref_name, 'release/')"
12+
uses: ./.github/workflows/reusable-link-check.yml
2313

2414
build:
2515
runs-on: ubuntu-24.04
@@ -33,7 +23,7 @@ jobs:
3323
java-version: 17
3424

3525
- name: Cache Gradle Wrapper
36-
uses: actions/cache@v5.0.3
26+
uses: actions/cache@v5.0.4
3727
with:
3828
path: ~/.gradle/wrapper
3929
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -57,7 +47,7 @@ jobs:
5747
java-version: 17
5848

5949
- name: Cache Gradle Wrapper
60-
uses: actions/cache@v5.0.3
50+
uses: actions/cache@v5.0.4
6151
with:
6252
path: ~/.gradle/wrapper
6353
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -84,7 +74,7 @@ jobs:
8474
java-version: 17
8575

8676
- name: Cache Gradle Wrapper
87-
uses: actions/cache@v5.0.3
77+
uses: actions/cache@v5.0.4
8878
with:
8979
path: ~/.gradle/wrapper
9080
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -109,7 +99,7 @@ jobs:
10999
java-version: 17
110100

111101
- name: Cache Gradle Wrapper
112-
uses: actions/cache@v5.0.3
102+
uses: actions/cache@v5.0.4
113103
with:
114104
path: ~/.gradle/wrapper
115105
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -150,7 +140,7 @@ jobs:
150140
java-version: 17
151141

152142
- name: Cache Gradle Wrapper
153-
uses: actions/cache@v5.0.3
143+
uses: actions/cache@v5.0.4
154144
with:
155145
path: ~/.gradle/wrapper
156146
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

‎.github/workflows/pr.yaml‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,9 @@ on:
99

1010
jobs:
1111
check-links:
12-
runs-on: ubuntu-24.04
13-
steps:
14-
- uses: actions/checkout@v6.0.2
15-
16-
- name: Check all links in *.md files
17-
id: lychee
18-
uses: lycheeverse/lychee-action@v2.8.0
19-
with:
20-
lycheeVersion: v0.18.1
21-
args: >-
22-
-v -n "*.md" "**/*.md"
23-
--config .lychee.toml
12+
# release branches are excluded
13+
if: "!startsWith(github.ref_name, 'release/')"
14+
uses: ./.github/workflows/reusable-link-check.yml
2415

2516
build:
2617
runs-on: ubuntu-24.04
@@ -34,7 +25,7 @@ jobs:
3425
java-version: 17
3526

3627
- name: Cache Gradle Wrapper
37-
uses: actions/cache@v5.0.3
28+
uses: actions/cache@v5.0.4
3829
with:
3930
path: ~/.gradle/wrapper
4031
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -58,7 +49,7 @@ jobs:
5849
java-version: 17
5950

6051
- name: Cache Gradle Wrapper
61-
uses: actions/cache@v5.0.3
52+
uses: actions/cache@v5.0.4
6253
with:
6354
path: ~/.gradle/wrapper
6455
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -85,7 +76,7 @@ jobs:
8576
java-version: 17
8677

8778
- name: Cache Gradle Wrapper
88-
uses: actions/cache@v5.0.3
79+
uses: actions/cache@v5.0.4
8980
with:
9081
path: ~/.gradle/wrapper
9182
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -110,7 +101,7 @@ jobs:
110101
java-version: 17
111102

112103
- name: Cache Gradle Wrapper
113-
uses: actions/cache@v5.0.3
104+
uses: actions/cache@v5.0.4
114105
with:
115106
path: ~/.gradle/wrapper
116107
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -152,7 +143,7 @@ jobs:
152143
java-version: 17
153144

154145
- name: Cache Gradle Wrapper
155-
uses: actions/cache@v5.0.3
146+
uses: actions/cache@v5.0.4
156147
with:
157148
path: ~/.gradle/wrapper
158149
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -201,7 +192,7 @@ jobs:
201192
java-version: 17
202193

203194
- name: Cache Gradle Wrapper
204-
uses: actions/cache@v5.0.3
195+
uses: actions/cache@v5.0.4
205196
with:
206197
path: ~/.gradle/wrapper
207198
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
@@ -238,7 +229,7 @@ jobs:
238229
java-version: 17
239230

240231
- name: Cache Gradle Wrapper
241-
uses: actions/cache@v5.0.3
232+
uses: actions/cache@v5.0.4
242233
with:
243234
path: ~/.gradle/wrapper
244235
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}

‎.github/workflows/reusable-link-check.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Reusable - Link check
2+
3+
on:
4+
workflow_call:
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
link-check:
11+
runs-on: ubuntu-24.04
12+
steps:
13+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
14+
with:
15+
fetch-depth: 0 # needed for merge-base used in modified-files mode
16+
17+
- uses: jdx/mise-action@c1ecc8f748cd28cdeabf76dab3cccde4ce692fe4 # v4.0.0
18+
19+
- name: Link check for pull requests
20+
if: github.event_name == 'pull_request'
21+
env:
22+
GITHUB_TOKEN: ${{ github.token }}
23+
GITHUB_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
24+
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
25+
run: mise run lint:links
26+
27+
- name: Link check for pushes and scheduled workflows
28+
if: github.event_name != 'pull_request'
29+
env:
30+
GITHUB_TOKEN: ${{ github.token }}
31+
run: mise run lint:links --full

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
88

99
## Unreleased
1010

11+
## v2.26.0 - 2026-03-18
12+
13+
- OpenTelemetry Java SDK has been updated to version 1.60.1.
14+
- OpenTelemetry Instrumentation for Java has been updated to version 2.26.0.
15+
1116
## v2.25.1 - 2026-02-26
1217

1318
- Update CSA to version 26.2.1-1436.

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Splunk Distribution of OpenTelemetry Java
22

33
![Stable](https://img.shields.io/badge/status-stable-informational)
4-
[![OpenTelemetry Instrumentation for Java Version](https://img.shields.io/badge/otel-2.25.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.25.0)
4+
[![OpenTelemetry Instrumentation for Java Version](https://img.shields.io/badge/otel-2.26.0-blueviolet)](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.26.0)
55
[![Splunk GDI specification](https://img.shields.io/badge/GDI-1.8.0-blueviolet)](https://github.com/signalfx/gdi-specification/releases/tag/v1.8.0)
66
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/signalfx/splunk-otel-java?include_prereleases)](https://github.com/signalfx/splunk-otel-java/releases)
77
[![Maven Central](https://img.shields.io/maven-central/v/com.splunk/splunk-otel-javaagent)](https://central.sonatype.com/artifact/com.splunk/splunk-otel-javaagent)
@@ -44,7 +44,7 @@ see [Migrate from the SignalFx Java Agent](https://help.splunk.com/en/splunk-obs
4444
<!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
4545
<!--DEV_DOCS_WARNING-->
4646
<!--DEV_DOCS_WARNING_START-->
47-
The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.25.1](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.25.1/README.md).
47+
The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.26.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.26.0/README.md).
4848

4949
---
5050
<!--DEV_DOCS_WARNING_END-->
@@ -79,15 +79,15 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
7979
you have to use a compatible API version.
8080

8181
<!-- IMPORTANT: do not change comments or break those lines below -->
82-
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.25.1<!--SPLUNK_VERSION--> is compatible
82+
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.26.0<!--SPLUNK_VERSION--> is compatible
8383
with:
8484

85-
* OpenTelemetry API version <!--OTEL_VERSION-->1.57.0<!--OTEL_VERSION-->
86-
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.25.0<!--OTEL_INSTRUMENTATION_VERSION-->
85+
* OpenTelemetry API version <!--OTEL_VERSION-->1.60.1<!--OTEL_VERSION-->
86+
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.26.0<!--OTEL_INSTRUMENTATION_VERSION-->
8787

8888
## Snapshot builds
8989

90-
We publish [snapshot builds](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/com/splunk/splunk-otel-javaagent/2.26.0-SNAPSHOT/)
90+
We publish [snapshot builds](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/com/splunk/splunk-otel-javaagent/2.27.0-SNAPSHOT/)
9191
with every merge to the `main` branch. Snapshots are primarily intended to test new functionality and are not recommended
9292
for production use.
9393

‎agent/license-overrides.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
# opentelemetry-sdk-trace jar includes META-INF/maven/org.jctools/jctools-core Hopefully this will get removed in the next release and we won't need these overrides
2-
io.opentelemetry:opentelemetry-sdk-trace:1.59.0|https://github.com/open-telemetry/opentelemetry-java|Apache License, Version 2.0|https://www.apache.org/licenses/LICENSE-2.0

‎buildSrc/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`kotlin-dsl`
33

44
// When updating, update below in dependencies too
5-
id("com.diffplug.spotless") version "8.3.0"
5+
id("com.diffplug.spotless") version "8.4.0"
66
}
77

88
spotless {
@@ -40,9 +40,9 @@ repositories {
4040
dependencies {
4141
implementation(gradleApi())
4242

43-
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.3.0")
44-
implementation("io.opentelemetry.instrumentation:gradle-plugins:2.25.0-alpha")
43+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.4.0")
44+
implementation("io.opentelemetry.instrumentation:gradle-plugins:2.26.0-alpha")
4545

4646
// keep these versions in sync with settings.gradle.kts
47-
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.3.2")
47+
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.0")
4848
}

0 commit comments

Comments
 (0)