Skip to content

Commit

Permalink
Prepare release 2.12.0 (#2166)
Browse files Browse the repository at this point in the history 
* Prepare release 2.12.0

* update changelog
  • Loading branch information
@laurit
laurit authored Jan 22, 2025
1 parent ef90f25 commit 9fe6f5f
Show file tree
Hide file tree
Showing 8 changed files with 115 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
--label bug \
--label area:build \
--label automated \
--assignee agoallikmaa,breedx-splk,laurit \
--assignee agoallikmaa,breedx-splk,laurit,robsunday \
--body-file body.txt
shellcheck:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.

## Unreleased

## v2.12.0 - 2025-01-22

### General

- OpenTelemetry Java SDK has been updated to version 1.46.0.
- OpenTelemetry Instrumentation for Java has been updated to version 2.12.0.
- Rename `splunk.distro.version` to `telemetry.distro.version`.
- Declare compatibility with GDI spec 1.7.0
[#2148](https://github.com/signalfx/splunk-otel-java/issues/2148)
Expand Down
17 changes: 6 additions & 11 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ Existing customers should consider migrating to version 2.5.0 or higher. To lear

<p align="center">
<img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.11.0">
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-2.11.0-blueviolet?style=for-the-badge">
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.12.0">
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-2.12.0-blueviolet?style=for-the-badge">
</a>
<a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.6.0">
<a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.7.0">
<img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.7.0-blueviolet?style=for-the-badge">
</a>
<a href="https://github.com/signalfx/splunk-otel-java/releases">
Expand Down Expand Up @@ -86,11 +86,6 @@ see [Migrate from the SignalFx Java Agent](https://quickdraw.splunk.com/redirect

<!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
<!--DEV_DOCS_WARNING-->
<!--DEV_DOCS_WARNING_START-->
The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v2.11.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.11.0/README.md).

---
<!--DEV_DOCS_WARNING_END-->

## Requirements

Expand Down Expand Up @@ -122,11 +117,11 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
you have to use a compatible API version.

<!-- IMPORTANT: do not change comments or break those lines below -->
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.11.0<!--SPLUNK_VERSION--> is compatible
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.12.0<!--SPLUNK_VERSION--> is compatible
with:

* OpenTelemetry API version <!--OTEL_VERSION-->1.45.0<!--OTEL_VERSION-->
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.11.0<!--OTEL_INSTRUMENTATION_VERSION-->
* OpenTelemetry API version <!--OTEL_VERSION-->1.46.0<!--OTEL_VERSION-->
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.12.0<!--OTEL_INSTRUMENTATION_VERSION-->

## Snapshot builds

Expand Down
6 changes: 3 additions & 3 deletions dependencyManagement/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ plugins {
`java-platform`
}

val otelVersion = "1.45.0"
val otelVersion = "1.46.0"
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
val otelInstrumentationVersion = "2.11.0"
val otelInstrumentationVersion = "2.12.0"
val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
val otelContribAlphaVersion = "1.42.0-alpha"
val otelContribAlphaVersion = "1.43.0-alpha"

val autoValueVersion = "1.11.0"
val dockerJavaVersion = "3.4.1"
Expand Down
2 changes: 1 addition & 1 deletion deployments/cloudfoundry/buildpack/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:

```sh
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.11.0
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.12.0
```

By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.
Expand Down
34 changes: 17 additions & 17 deletions licenses/licenses.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# splunk-otel-javaagent
## Dependency License Report
_2025-01-09 13:19:24 EET_
_2025-01-22 10:18:51 EET_
## Apache License, Version 2.0

**1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `4.12.0`
Expand All @@ -17,67 +17,67 @@ _2025-01-09 13:19:24 EET_
> - **POM Project URL**: [https://github.com/square/okio/](https://github.com/square/okio/)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**4** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.45.0`
**4** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**5** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.45.0-alpha`
**5** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.46.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**6** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.45.0`
**6** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**7** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.45.0`
**7** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**8** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.45.0`
**8** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**9** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.45.0`
**9** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**10** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.45.0`
**10** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.45.0`
**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.45.0`
**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.45.0`
**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.45.0`
**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.45.0`
**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.45.0`
**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.46.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**17** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.42.0-alpha`
**17** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.43.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**18** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.42.0-alpha`
**18** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.43.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**19** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.11.0-alpha`
**19** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.12.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
Expand Down
Loading

0 comments on commit 9fe6f5f

Please sign in to comment.