Skip to content

Commit e8d041d

Browse files
committed
Merge branch 'main' into issue-8245
2 parents 79adac4 + b87fa99 commit e8d041d

129 files changed

Lines changed: 1589 additions & 744 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/config/flint.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[checks.lychee]
2+
check_all_local = true
3+
4+
[settings]
5+
setup_migration_version = 2

.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/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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
if: github.event_name == 'pull_request'
2121
env:
2222
GITHUB_TOKEN: ${{ github.token }}
23-
GITHUB_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
23+
GITHUB_REPOSITORY: ${{ github.repository }}
24+
GITHUB_BASE_REF: ${{ github.base_ref }}
25+
GITHUB_HEAD_REF: ${{ github.head_ref }}
2426
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
2527
run: mise run lint:links
2628

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ The OpenTelemetry SDK for managing telemetry producing by the API.
9898
| [Log SDK](./sdk/logs) | OpenTelemetry log SDK | `opentelemetry-sdk-logs` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-logs.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-logs) |
9999
| [SDK Common](./sdk/common) | Shared SDK components | `opentelemetry-sdk-common` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-common.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-common) |
100100
| [SDK Testing](./sdk/testing) | Components for testing OpenTelemetry instrumentation | `opentelemetry-sdk-testing` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-testing.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-testing) |
101+
| [Profiles SDK](./sdk/profiles) | OpenTelemetry profiles SDK | `opentelemetry-sdk-profiles` | TODO: add after first release | TODO: add after first release |
101102
</details>
102103

103104
<details>
@@ -113,6 +114,7 @@ SDK exporters for shipping traces, metrics, and logs out of process.
113114
| [Logging Exporter](./exporters/logging) | Logging exporters, including metrics, traces, and logs | `opentelemetry-exporter-logging` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-logging.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-logging) |
114115
| [Zipkin Exporter](./exporters/zipkin) | Zipkin trace exporter | `opentelemetry-exporter-zipkin` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-zipkin.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-zipkin) |
115116
| [Prometheus Exporter](./exporters/prometheus) | Prometheus metric exporter | `opentelemetry-exporter-prometheus` | <!--VERSION_UNSTABLE-->1.61.0-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-prometheus.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-prometheus) |
117+
| [OTLP Profiles Exporter](./exporters/otlp/profiles) | OTLP profiles exporter | `opentelemetry-exporter-otlp-profiles` | TODO: add after first release | TODO: add after first release |
116118
| [Exporter Common](./exporters/common) | Shared exporter components (internal) | `opentelemetry-exporter-common` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-common.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-common) |
117119
| [OkHttp Sender](./exporters/sender/okhttp) | OkHttp implementation of HttpSender (internal) | `opentelemetry-exporter-sender-okhttp` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-okhttp.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-okhttp) |
118120
| [JDK Sender](./exporters/sender/jdk) | Java 11+ native HttpClient implementation of HttpSender (internal) | `opentelemetry-exporter-sender-jdk` | <!--VERSION_STABLE-->1.61.0<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-sender-jdk.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-sender-jdk) | |

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class NoSharedInternalCodeTest {
4242
"opentelemetry-sdk-common",
4343
"opentelemetry-sdk-logs",
4444
"opentelemetry-sdk-metrics",
45+
"opentelemetry-sdk-profiles",
4546
"opentelemetry-sdk-testing",
4647
"opentelemetry-sdk-trace",
4748
"opentelemetry-sdk-extension-autoconfigure",
@@ -51,6 +52,7 @@ class NoSharedInternalCodeTest {
5152
"opentelemetry-sdk-extension-jaeger-remote-sampler",
5253
"opentelemetry-exporter-otlp",
5354
"opentelemetry-exporter-otlp-common",
55+
"opentelemetry-exporter-otlp-profiles",
5456
"opentelemetry-exporter-sender-grpc-managed-channel",
5557
"opentelemetry-exporter-sender-jdk",
5658
"opentelemetry-exporter-sender-okhttp");

0 commit comments

Comments
 (0)