Skip to content

Commit 80a33b7

Browse files
authored
Prepare release 2.14.0 (#2242)
1 parent e907455 commit 80a33b7

File tree

7 files changed

+64
-18
lines changed

7 files changed

+64
-18
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
88

99
## Unreleased
1010

11+
## v2.14.0 - 2025-03-19
12+
13+
### General
14+
15+
- OpenTelemetry Java SDK has been updated to version 1.48.0.
16+
- OpenTelemetry Instrumentation for Java has been updated to version 2.14.0.
17+
1118
## v2.13.1 - 2025-03-05
1219

1320
### General

README.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Existing customers should consider migrating to version 2.5.0 or higher. To lear
2525

2626
<p align="center">
2727
<img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
28-
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.13.3">
29-
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-2.13.3-blueviolet?style=for-the-badge">
28+
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.14.0">
29+
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-2.14.0-blueviolet?style=for-the-badge">
3030
</a>
3131
<a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.7.0">
3232
<img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.7.0-blueviolet?style=for-the-badge">
@@ -86,11 +86,6 @@ see [Migrate from the SignalFx Java Agent](https://quickdraw.splunk.com/redirect
8686

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

9590
## Requirements
9691

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

124119
<!-- IMPORTANT: do not change comments or break those lines below -->
125-
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.13.1<!--SPLUNK_VERSION--> is compatible
120+
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.14.0<!--SPLUNK_VERSION--> is compatible
126121
with:
127122

128-
* OpenTelemetry API version <!--OTEL_VERSION-->1.47.0<!--OTEL_VERSION-->
129-
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.13.3<!--OTEL_INSTRUMENTATION_VERSION-->
123+
* OpenTelemetry API version <!--OTEL_VERSION-->1.48.0<!--OTEL_VERSION-->
124+
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->2.14.0<!--OTEL_INSTRUMENTATION_VERSION-->
130125

131126
## Snapshot builds
132127

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
val otelVersion = "1.48.0"
66
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
7-
val otelInstrumentationVersion = "2.14.0-SNAPSHOT"
7+
val otelInstrumentationVersion = "2.14.0"
88
val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
9-
val otelContribAlphaVersion = "1.44.0-alpha"
9+
val otelContribAlphaVersion = "1.45.0-alpha"
1010

1111
val autoValueVersion = "1.11.0"
1212
val dockerJavaVersion = "3.4.2"

deployments/cloudfoundry/buildpack/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
4040
environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:
4141

4242
```sh
43-
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.13.1
43+
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.14.0
4444
```
4545

4646
By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.

licenses/licenses.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# splunk-otel-javaagent
33
## Dependency License Report
4-
_2025-03-11 19:46:56 EET_
4+
_2025-03-18 17:03:50 EET_
55
## Apache License, Version 2.0
66

77
**1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `4.12.0`
@@ -65,15 +65,15 @@ _2025-03-11 19:46:56 EET_
6565
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
6666
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
6767
68-
**16** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.44.0-alpha`
68+
**16** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-resource-providers` **Version:** `1.45.0-alpha`
6969
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)
7070
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
7171
72-
**17** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.44.0-alpha`
72+
**17** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-samplers` **Version:** `1.45.0-alpha`
7373
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)
7474
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
7575
76-
**18** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.14.0-alpha-SNAPSHOT`
76+
**18** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.14.0-alpha`
7777
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
7878
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
7979

metadata-generator/src/main/java/com/splunk/opentelemetry/tools/MetadataGenerator.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,13 @@ You can configure the agent to capture general identity attributes (enduser.id,
10651065
"false",
10661066
SettingType.BOOLEAN,
10671067
SettingCategory.INSTRUMENTATION));
1068+
settings.add(
1069+
setting(
1070+
"otel.instrumentation.http.client.experimental.redact-query-parameters",
1071+
"Redact sensitive parameter values from URL query string, see https://opentelemetry.io/docs/specs/semconv/http/http-spans.",
1072+
"true",
1073+
SettingType.BOOLEAN,
1074+
SettingCategory.INSTRUMENTATION));
10681075

10691076
// Enable only specific instrumentation
10701077
// https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/#enable-only-specific-instrumentation
@@ -1391,6 +1398,7 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
13911398
| `otel.instrumentation.aws-sdk.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. |
13921399
| `otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging` | Boolean | `false` | v2 only, inject into SNS/SQS attributes with configured propagator: See [v2 README](aws-sdk-2.2/library/README.md#trace-propagation). |
13931400
| `otel.instrumentation.aws-sdk.experimental-record-individual-http-error` | Boolean | `false` | v2 only, record errors returned by each individual HTTP request as events for the SDK span. |
1401+
| `otel.instrumentation.genai.capture-message-content` | Boolean | `false` | v2 only, record content of user and LLM messages when using Bedrock. |
13941402
*/
13951403
settings.add(
13961404
setting(
@@ -1413,6 +1421,13 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
14131421
"false",
14141422
SettingType.BOOLEAN,
14151423
SettingCategory.INSTRUMENTATION));
1424+
settings.add(
1425+
setting(
1426+
"otel.instrumentation.genai.capture-message-content",
1427+
"v2 only, record content of user and LLM messages when using Bedrock.",
1428+
"false",
1429+
SettingType.BOOLEAN,
1430+
SettingCategory.INSTRUMENTATION));
14161431

14171432
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/camel-2.20/README.md
14181433
/*
@@ -1503,10 +1518,18 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
15031518

15041519
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/grpc-1.6/README.md
15051520
/*
1521+
| `otel.instrumentation.grpc.emit-message-events` | Boolean | `true` | Determines whether to emit span event for each individual message received and sent.
15061522
| `otel.instrumentation.grpc.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental span attributes. |
15071523
| `otel.instrumentation.grpc.capture-metadata.client.request` | String | | A comma-separated list of request metadata keys. gRPC client instrumentation will capture metadata values corresponding to configured keys as span attributes. |
15081524
| `otel.instrumentation.grpc.capture-metadata.server.request` | String | | A comma-separated list of request metadata keys. gRPC server instrumentation will capture metadata values corresponding to configured keys as span attributes. |
15091525
*/
1526+
settings.add(
1527+
setting(
1528+
"otel.instrumentation.grpc.emit-message-events",
1529+
"Determines whether to emit span event for each individual message received and sent.",
1530+
"true",
1531+
SettingType.BOOLEAN,
1532+
SettingCategory.INSTRUMENTATION));
15101533
settings.add(
15111534
setting(
15121535
"otel.instrumentation.grpc.experimental-span-attributes",
@@ -2317,6 +2340,11 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
23172340
List<Map<String, Object>> instrumentations = new ArrayList<>();
23182341
root.put("instrumentations", instrumentations);
23192342

2343+
instrumentations.add(
2344+
instrumentation("activej-http")
2345+
.component("ActiveJ HTTP Server", "6.0 and higher")
2346+
.httpServerMetrics()
2347+
.build());
23202348
instrumentations.add(
23212349
instrumentation("methods").component("Additional methods tracing", null).build());
23222350
instrumentations.add(
@@ -3123,6 +3151,7 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
31233151
.component("AWS SDK 1", "1.11 and higher")
31243152
.component("AWS SDK 2", "2.2 and higher")
31253153
.dbClientMetrics()
3154+
.genAiClientMetrics()
31263155
.build());
31273156
instrumentations.add(
31283157
instrumentation("azure-core").component("Azure Core", "1.14 and higher").build());
@@ -3515,6 +3544,8 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
35153544
instrumentation("spring-jms").component("Spring JMS", "2.0 and higher").build());
35163545
instrumentations.add(
35173546
instrumentation("spring-kafka").component("Spring Kafka", "2.7 and higher").build());
3547+
instrumentations.add(
3548+
instrumentation("spring-pulsar").component("Spring Pulsar", "1.0 and higher").build());
35183549
instrumentations.add(
35193550
instrumentation("spring-rabbit").component("Spring RabbitMQ", "1.0 and higher").build());
35203551
instrumentations.add(
@@ -4142,6 +4173,19 @@ InstrumentationBuilder dbClientMetrics() {
41424173
return this;
41434174
}
41444175

4176+
InstrumentationBuilder genAiClientMetrics() {
4177+
metric(
4178+
"gen_ai.client.token.usage",
4179+
MetricInstrument.HISTOGRAM,
4180+
"Measures number of input and output tokens used.");
4181+
metric(
4182+
"gen_ai.client.operation.duration",
4183+
MetricInstrument.HISTOGRAM,
4184+
"GenAI operation duration.");
4185+
4186+
return this;
4187+
}
4188+
41454189
InstrumentationBuilder dependency(
41464190
String name, String sourceUrl, String packageUrl, String version, Stability stability) {
41474191
Map<String, Object> map = new LinkedHashMap<>();

version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// do NOT update that variable manually - it is managed by the pre/post release scripts
2-
val distroVersion = "2.14.0-SNAPSHOT"
2+
val distroVersion = "2.14.0"
33

44
allprojects {
55
version = distroVersion

0 commit comments

Comments
 (0)