Skip to content

Commit 9281a36

Browse files
committed
Merge remote-tracking branch 'origin/main' into lane-a/opentelemetry-8315
# Conflicts: # mise.toml
2 parents 803ff57 + df8063b commit 9281a36

170 files changed

Lines changed: 1440 additions & 827 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/benchmark-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Benchmark SDK
1414
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1515
container:
16-
image: ubuntu:24.04@sha256:84e77dee7d1bc93fb029a45e3c6cb9d8aa4831ccfcc7103d36e876938d28895b
16+
image: ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
1717
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
1818
strategy:
1919
fail-fast: false

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Benchmark SDK
1616
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1717
container:
18-
image: ubuntu:24.04@sha256:84e77dee7d1bc93fb029a45e3c6cb9d8aa4831ccfcc7103d36e876938d28895b
18+
image: ubuntu:26.04@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
1919
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
2020
steps:
2121
- name: Install Git

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ jobs:
127127
echo "JAVA_HOME: $JAVA_HOME"
128128
java --version
129129
native-image --version
130-
./gradlew nativeTest
130+
# Both flags required due to https://github.com/graalvm/native-build-tools/issues/477:
131+
# --no-parallel prevents a race where the plugin's shared build service creates project-scoped
132+
# detached configurations that are concurrently accessed during task fingerprinting.
133+
# --no-configuration-cache prevents the cache store phase from adding additional concurrency.
134+
./gradlew nativeTest --no-configuration-cache --no-parallel
131135
env:
132136
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
133137

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
48+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
4949
with:
5050
languages: ${{ matrix.language }}
5151
# using "linked" helps to keep up with the latest Kotlin support
@@ -62,6 +62,6 @@ jobs:
6262
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6363

6464
- name: Perform CodeQL analysis
65-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
65+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
6666
with:
6767
category: "/language:${{matrix.language}}"

.github/workflows/detect-api-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Detect API surface area changes
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
20+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
2121
id: otelbot-token
2222
with:
2323
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
46+
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
4747
with:
4848
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
## Unreleased
44

5+
### SDK
6+
7+
#### Testing
8+
9+
* Add `hasValueSatisfying` to `LongPointAssert` and `DoublePointAssert` for fuzzy value matching
10+
* Add `containsPointsSatisfying` to metric data asserts for "each given assertion must be
11+
satisfied by at least one point, extras allowed" checks on sum, gauge, histogram, exponential
12+
histogram, and summary data
13+
514
## Version 1.61.0 (2026-04-10)
615

716
### API

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ Extensions to the OpenTelemetry SDK.
128128
|-------------------------------------------------------------------------------|------------------------------------------------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
129129
| [SDK Autoconfigure](./sdk-extensions/autoconfigure) | Autoconfigure OpenTelemetry SDK from env vars, system properties, and SPI | `opentelemetry-sdk-extension-autoconfigure` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure) |
130130
| [SDK Autoconfigure SPI](./sdk-extensions/autoconfigure-spi) | Service Provider Interface (SPI) definitions for autoconfigure | `opentelemetry-sdk-extension-autoconfigure-spi` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure-spi.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure-spi) |
131+
| [SDK Declarative Config](./sdk-extensions/declarative-config) | Declarative config implementation for YAML-based SDK configuration | `opentelemetry-sdk-extension-declarative-config` | TODO: add after first release | TODO: add after first release |
131132
| [SDK Jaeger Remote Sampler Extension](./sdk-extensions/jaeger-remote-sampler) | Sampler which obtains sampling configuration from remote Jaeger server | `opentelemetry-sdk-extension-jaeger-remote-sampler` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-jaeger-remote-sampler.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-jaeger-remote-sampler) |
132133
| [SDK Incubator](./sdk-extensions/incubator) | SDK incubator, including YAML based view configuration, LeakDetectingSpanProcessor | `opentelemetry-sdk-extension-incubator` | <!--VERSION_UNSTABLE-->1.61.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-incubator.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-incubator) |
133134
</details>

all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class NoSharedInternalCodeTest {
4646
"opentelemetry-sdk-trace",
4747
"opentelemetry-sdk-extension-autoconfigure",
4848
"opentelemetry-sdk-extension-autoconfigure-spi",
49+
"opentelemetry-sdk-extension-declarative-config",
4950
"opentelemetry-sdk-extension-incubator",
5051
"opentelemetry-sdk-extension-jaeger-remote-sampler",
5152
"opentelemetry-exporter-otlp",

animal-sniffer-signature/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ val generatedSignature = configurations.create("generatedSignature") {
2424
}
2525

2626
dependencies {
27-
signature("com.toasttab.android:gummy-bears-api-23:0.13.0@signature")
27+
signature("com.toasttab.android:gummy-bears-api-23:0.14.0@signature")
2828
signatureJar("com.android.tools:desugar_jdk_libs")
2929
}
3030

0 commit comments

Comments
 (0)