diff --git a/CHANGELOG.md b/CHANGELOG.md index 86b806fc3..dd54110a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/README.md b/README.md index 9a666f8b4..a5e7a41fc 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java, you have to use a compatible API version. -The Splunk Distribution of OpenTelemetry Java version 1.29.0 is compatible +The Splunk Distribution of OpenTelemetry Java version 1.29.1 is compatible with: * OpenTelemetry API version 1.31.0 diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md index ea5535879..b787561c9 100644 --- a/deployments/cloudfoundry/buildpack/README.md +++ b/deployments/cloudfoundry/buildpack/README.md @@ -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. diff --git a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/AllocatedMemoryMetrics.java b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/AllocatedMemoryMetrics.java index 9b9fbbf00..ba8f8c3d0 100644 --- a/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/AllocatedMemoryMetrics.java +++ b/instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/AllocatedMemoryMetrics.java @@ -36,7 +36,7 @@ public long getCumulativeAllocationTotal() { } private AllocationTracker createAllocationTracker() { - if (hasComSunThreadMXBean() && isThreadAllocatedMemoryEnabled() && mxBeanTypeIsCompatible()) { + if (hasComSunThreadMXBean() && mxBeanTypeIsCompatible() && isThreadAllocatedMemoryEnabled()) { return new AllocationTracker(); } return null; diff --git a/smoke-tests/src/test/resources/otel.yaml b/smoke-tests/src/test/resources/otel.yaml index 00d986685..7aa1624c1 100644 --- a/smoke-tests/src/test/resources/otel.yaml +++ b/smoke-tests/src/test/resources/otel.yaml @@ -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 diff --git a/version.gradle.kts b/version.gradle.kts index 103402208..3281e71f0 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -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