Skip to content

Commit 2bff1f1

Browse files
lauritlaurit
authored
Prepare release 2.15.0 (#2271)
1 parent b6e6ca1 commit 2bff1f1

File tree

7 files changed

+112
-17
lines changed

7 files changed

+112
-17
lines changed

‎CHANGELOG.md

+7
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.15.0 - 2025-04-16
12+
13+
### General
14+
15+
- OpenTelemetry Java SDK has been updated to version 1.49.0.
16+
- OpenTelemetry Instrumentation for Java has been updated to version 2.15.0.
17+
1118
## v2.14.0 - 2025-03-19
1219

1320
### General

‎README.md

+5-10
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.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">
28+
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.15.0">
29+
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-2.15.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.14.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v2.14.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.14.0<!--SPLUNK_VERSION--> is compatible
120+
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->2.15.0<!--SPLUNK_VERSION--> is compatible
126121
with:
127122

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

131126
## Snapshot builds
132127

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
val otelVersion = "1.49.0"
66
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
7-
val otelInstrumentationVersion = "2.15.0-SNAPSHOT"
7+
val otelInstrumentationVersion = "2.15.0"
88
val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
99
val otelContribAlphaVersion = "1.45.0-alpha"
1010

‎deployments/cloudfoundry/buildpack/README.md

+1-1
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.14.0
43+
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 2.15.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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# splunk-otel-javaagent
33
## Dependency License Report
4-
_2025-04-06 14:05:07 EEST_
4+
_2025-04-15 16:59:45 EEST_
55
## Apache License, Version 2.0
66

77
**1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `4.12.0`
@@ -73,7 +73,7 @@ _2025-04-06 14:05:07 EEST_
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.15.0-alpha-SNAPSHOT`
76+
**18** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `2.15.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

+95-2
Original file line numberDiff line numberDiff line change
@@ -3932,6 +3932,99 @@ Some instrumentations (e.g. Spring Web MVC instrumentation) produce SpanKind.Int
39323932
otelJavaContribAlphaVersion,
39333933
Stability.EXPERIMENTAL)
39343934
.build());
3935+
// OpenTelemetry Azure Resource Providers
3936+
resourceProviders.add(
3937+
resourceProvider(
3938+
"io.opentelemetry.contrib.azure.resource.AzureAksResourceProvider",
3939+
"AKS detector.",
3940+
List.of("cloud.platform", "cloud.provider", "k8s.cluster.name"))
3941+
.dependency(
3942+
"OpenTelemetry Azure Resource Providers",
3943+
"https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/azure-resources",
3944+
"https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-azure-resources",
3945+
otelJavaContribAlphaVersion,
3946+
Stability.EXPERIMENTAL)
3947+
.build());
3948+
resourceProviders.add(
3949+
resourceProvider(
3950+
"io.opentelemetry.contrib.azure.resource.AzureAppServiceResourceProvider",
3951+
"App service detector.",
3952+
List.of(
3953+
"cloud.platform",
3954+
"cloud.provider",
3955+
"service.name",
3956+
"cloud.region",
3957+
"cloud.resource_id",
3958+
"deployment.environment.name",
3959+
"host.id",
3960+
"service.instance.id",
3961+
"azure.app.service.stamp"))
3962+
.dependency(
3963+
"OpenTelemetry Azure Resource Providers",
3964+
"https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/azure-resources",
3965+
"https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-azure-resources",
3966+
otelJavaContribAlphaVersion,
3967+
Stability.EXPERIMENTAL)
3968+
.build());
3969+
resourceProviders.add(
3970+
resourceProvider(
3971+
"io.opentelemetry.contrib.azure.resource.AzureContainersResourceProvider",
3972+
"Container detector.",
3973+
List.of(
3974+
"cloud.platform",
3975+
"cloud.provider",
3976+
"service.name",
3977+
"service.instance.id",
3978+
"service.version"))
3979+
.dependency(
3980+
"OpenTelemetry Azure Resource Providers",
3981+
"https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/azure-resources",
3982+
"https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-azure-resources",
3983+
otelJavaContribAlphaVersion,
3984+
Stability.EXPERIMENTAL)
3985+
.build());
3986+
resourceProviders.add(
3987+
resourceProvider(
3988+
"io.opentelemetry.contrib.azure.resource.AzureFunctionsResourceProvider",
3989+
"Function detector.",
3990+
List.of(
3991+
"cloud.platform",
3992+
"cloud.provider",
3993+
"faas.max_memory",
3994+
"cloud.region",
3995+
"faas.name",
3996+
"faas.version",
3997+
"faas.instance"))
3998+
.dependency(
3999+
"OpenTelemetry Azure Resource Providers",
4000+
"https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/azure-resources",
4001+
"https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-azure-resources",
4002+
otelJavaContribAlphaVersion,
4003+
Stability.EXPERIMENTAL)
4004+
.build());
4005+
resourceProviders.add(
4006+
resourceProvider(
4007+
"io.opentelemetry.contrib.azure.resource.AzureVmResourceProvider",
4008+
"Vm detector.",
4009+
List.of(
4010+
"cloud.platform",
4011+
"cloud.provider",
4012+
"cloud.region",
4013+
"cloud.resource_id",
4014+
"host.id",
4015+
"host.name",
4016+
"host.type",
4017+
"os.type",
4018+
"os.version",
4019+
"azure.vm.scaleset.name",
4020+
"azure.vm.sku"))
4021+
.dependency(
4022+
"OpenTelemetry Azure Resource Providers",
4023+
"https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/azure-resources",
4024+
"https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-azure-resources",
4025+
otelJavaContribAlphaVersion,
4026+
Stability.EXPERIMENTAL)
4027+
.build());
39354028

39364029
DumperOptions options = new DumperOptions();
39374030
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
@@ -4119,7 +4212,7 @@ InstrumentationBuilder rpcClientMetrics() {
41194212
metric(
41204213
"rpc.client.duration",
41214214
MetricInstrument.HISTOGRAM,
4122-
"Measures the duration of outbound RPC.");
4215+
"The duration of an outbound RPC invocation.");
41234216

41244217
return this;
41254218
}
@@ -4128,7 +4221,7 @@ InstrumentationBuilder rpcServerMetrics() {
41284221
metric(
41294222
"rpc.server.duration",
41304223
MetricInstrument.HISTOGRAM,
4131-
"Measures the duration of inbound RPC.");
4224+
"The duration of an inbound RPC invocation.");
41324225

41334226
return this;
41344227
}

‎version.gradle.kts

+1-1
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.15.0-SNAPSHOT"
2+
val distroVersion = "2.15.0"
33

44
allprojects {
55
version = distroVersion

0 commit comments

Comments
 (0)