Prepare for release 1.25 (#1325)

* re-add profiling.data.format (#1278) * Prepare for release 1.25 --------- Co-authored-by: jason plumb <[email protected]>
signalfx · Jun 15, 2023 · 276eb69 · 276eb69
1 parent df148dd
commit 276eb69
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,25 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v1.25.0 - 2023-06-15
+
+### General
+
+- OpenTelemetry Java SDK has been updated to version 1.27.0.
+- OpenTelemetry Instrumentation for Java has been updated to version 1.27.0.
+- Micrometer dependency has been updated to version 1.11.1.
+- Jackson dependencies have been updated to 2.15.2.
+
+### Enhancements
+
+- Enable logging instrumentations when `otel.logs.exporter` is set (#1266)
+- Replace `signalfx-java` with much lighter `signalfx-metrics` (#1308)
+
+## v1.24.1 - 2023-05-17
+
+### Bugfixes
+- Include `profiling.data.format` attribute in profiling data for GDI spec compliance (#1278)
+
 ## v1.24.0 - 2023-05-11
 
 ### General

diff --git a/README.md b/README.md
@@ -12,8 +12,8 @@
 
 <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/v1.26.0">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.26.0-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.27.0">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.27.0-blueviolet?style=for-the-badge">
   </a>
   <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.5.0">
     <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.5.0-blueviolet?style=for-the-badge">
@@ -73,11 +73,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 ([v1.24.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.24.0/README.md).
-
----
-<!--DEV_DOCS_WARNING_END-->
 
 ## Requirements
 
@@ -109,11 +104,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-->1.24.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.25.0<!--SPLUNK_VERSION--> is compatible
 with:
 
-* OpenTelemetry API version <!--OTEL_VERSION-->1.26.0<!--OTEL_VERSION-->
-* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.26.0<!--OTEL_INSTRUMENTATION_VERSION-->
+* OpenTelemetry API version <!--OTEL_VERSION-->1.27.0<!--OTEL_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.27.0<!--OTEL_INSTRUMENTATION_VERSION-->
 * Micrometer version 1.11.0
 
 ## Snapshot builds

diff --git 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.24.0
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.25.0
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.

diff --git a/deployments/cloudfoundry/index.yml b/deployments/cloudfoundry/index.yml
@@ -11,3 +11,4 @@
 1.22.0: https://github.com/signalfx/splunk-otel-java/releases/download/v1.22.0/splunk-otel-javaagent.jar
 1.23.0: https://github.com/signalfx/splunk-otel-java/releases/download/v1.23.0/splunk-otel-javaagent.jar
 1.24.0: https://github.com/signalfx/splunk-otel-java/releases/download/v1.24.0/splunk-otel-javaagent.jar
+1.24.1: https://github.com/signalfx/splunk-otel-java/releases/download/v1.24.1/splunk-otel-javaagent.jar
diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/ProfilingSemanticAttributes.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/ProfilingSemanticAttributes.java
@@ -36,6 +36,8 @@ public class ProfilingSemanticAttributes {
   public static final AttributeKey<Long> SOURCE_EVENT_TIME = longKey("source.event.time");
 
   public static final AttributeKey<String> DATA_TYPE = stringKey("profiling.data.type");
+  public static final AttributeKey<String> DATA_FORMAT = stringKey("profiling.data.format");
+  public static final String PPROF_GZIP_BASE64 = "pprof-gzip-base64";
   public static final AttributeKey<Long> FRAME_COUNT = longKey("profiling.data.total.frame.count");
 
   public static final AttributeKey<Long> THREAD_ID = longKey("thread.id");

diff --git a/profiler/src/main/java/com/splunk/opentelemetry/profiler/exporter/PprofLogDataExporter.java b/profiler/src/main/java/com/splunk/opentelemetry/profiler/exporter/PprofLogDataExporter.java
@@ -16,8 +16,10 @@
 
 package com.splunk.opentelemetry.profiler.exporter;
 
+import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.DATA_FORMAT;
 import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.DATA_TYPE;
 import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.FRAME_COUNT;
+import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.PPROF_GZIP_BASE64;
 import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.PROFILING_SOURCE;
 import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.SOURCE_TYPE;
 import static java.util.logging.Level.FINE;
@@ -42,6 +44,7 @@ public PprofLogDataExporter(Logger otelLogger, ProfilingDataType dataType) {
         Attributes.builder()
             .put(SOURCE_TYPE, PROFILING_SOURCE)
             .put(DATA_TYPE, dataType.value())
+            .put(DATA_FORMAT, PPROF_GZIP_BASE64)
             .build();
   }
 

diff --git a/smoke-tests/src/test/java/com/splunk/opentelemetry/ProfilerSmokeTest.java b/smoke-tests/src/test/java/com/splunk/opentelemetry/ProfilerSmokeTest.java
@@ -18,7 +18,9 @@
 
 import static com.splunk.opentelemetry.LogsInspector.getStringAttr;
 import static com.splunk.opentelemetry.LogsInspector.hasThreadName;
+import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.DATA_FORMAT;
 import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.FRAME_COUNT;
+import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.PPROF_GZIP_BASE64;
 import static com.splunk.opentelemetry.profiler.ProfilingSemanticAttributes.SOURCE_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -136,7 +138,8 @@ void verifyIngestedLogContent() throws Exception {
     LogsInspector logs = telemetryRetriever.waitForLogs();
 
     assertThat(logs.getLogStream())
-        .allMatch(log -> "otel.profiling".equals(getStringAttr(log, SOURCE_TYPE)));
+        .allMatch(log -> "otel.profiling".equals(getStringAttr(log, SOURCE_TYPE)))
+        .allMatch(log -> PPROF_GZIP_BASE64.equals(getStringAttr(log, DATA_FORMAT)));
 
     assertThat(logs.getLogStream())
         .allMatch(log -> LogsInspector.getLongAttr(log, FRAME_COUNT) > 0);