Skip to content

Commit

Permalink
Prepare 1.29.1 patch release (#1517)
Browse files Browse the repository at this point in the history
* fix: Check mxBean compatibility (#1508)

* Prepare 1.29.1 patch release

* Fix smoke test collector conf (#1503)

---------

Co-authored-by: Akash Suresh <akashsb15@gmail.com>
  • Loading branch information
laurit and asuresh4 authored Nov 7, 2023
1 parent 8ce7ef9 commit 670d5c8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
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

## v1.29.1 - 2023-11-07

### 🛠️ Bug fixes

- Check for mxBean compatibility before attempting cast (#1508)

## v1.29.0 - 2023-10-13

### General
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ 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-->1.29.0<!--SPLUNK_VERSION--> is compatible
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.29.1<!--SPLUNK_VERSION--> is compatible
with:

* OpenTelemetry API version <!--OTEL_VERSION-->1.31.0<!--OTEL_VERSION-->
Expand Down
2 changes: 1 addition & 1 deletion deployments/cloudfoundry/buildpack/README.md
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 1.29.0
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.29.1
```

By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public long getCumulativeAllocationTotal() {
}

private AllocationTracker createAllocationTracker() {
if (hasComSunThreadMXBean() && isThreadAllocatedMemoryEnabled() && mxBeanTypeIsCompatible()) {
if (hasComSunThreadMXBean() && mxBeanTypeIsCompatible() && isThreadAllocatedMemoryEnabled()) {
return new AllocationTracker();
}
return null;
Expand Down
1 change: 0 additions & 1 deletion smoke-tests/src/test/resources/otel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ exporters:
token: "00000000-0000-0000-0000-000000000000"
endpoint: http://hec-backend:1080/services/collector/event
sourcetype: "test"
max_connections: 20
timeout: 10s
tls:
insecure_skip_verify: true
Expand Down
2 changes: 1 addition & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// do NOT update that variable manually - it is managed by the pre/post release scripts
val distroVersion = "1.29.0"
val distroVersion = "1.29.1"

allprojects {
version = distroVersion
Expand Down

0 comments on commit 670d5c8

Please sign in to comment.