Skip to content

Commit 8ce7ef9

Browse files
author
Mateusz Rzeszutek
authored
Prepare release 1.29.0 (#1473)
* Prepare release 1.29.0 * add sonatype releases repo, fix build * generateLicenseReport
1 parent 8e6abe9 commit 8ce7ef9

File tree

8 files changed

+48
-38
lines changed

8 files changed

+48
-38
lines changed

‎CHANGELOG.md

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

99
## Unreleased
1010

11-
- tbd
11+
## v1.29.0 - 2023-10-13
12+
13+
### General
14+
15+
- OpenTelemetry Java SDK has been updated to version 1.31.0.
16+
- OpenTelemetry Instrumentation for Java has been updated to version 1.31.0.
17+
- Micrometer dependency has been updated to version 1.11.5.
18+
19+
### 🛠️ Bug fixes
20+
21+
- Silence profiler warnings on JDK 21 (#1470)
1222

1323
## v1.28.0 - 2023-09-15
1424

‎README.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
<p align="center">
1414
<img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
15-
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.30.0">
16-
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.30.0-blueviolet?style=for-the-badge">
15+
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.31.0">
16+
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.31.0-blueviolet?style=for-the-badge">
1717
</a>
1818
<a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.6.0">
1919
<img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.6.0-blueviolet?style=for-the-badge">
@@ -73,11 +73,6 @@ see [Migrate from the SignalFx Java Agent](https://quickdraw.splunk.com/redirect
7373

7474
<!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
7575
<!--DEV_DOCS_WARNING-->
76-
<!--DEV_DOCS_WARNING_START-->
77-
The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v1.28.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.28.0/README.md).
78-
79-
---
80-
<!--DEV_DOCS_WARNING_END-->
8176

8277
## Requirements
8378

@@ -109,11 +104,11 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
109104
you have to use a compatible API version.
110105

111106
<!-- IMPORTANT: do not change comments or break those lines below -->
112-
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.28.0<!--SPLUNK_VERSION--> is compatible
107+
The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.29.0<!--SPLUNK_VERSION--> is compatible
113108
with:
114109

115-
* OpenTelemetry API version <!--OTEL_VERSION-->1.30.1<!--OTEL_VERSION-->
116-
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.30.0<!--OTEL_INSTRUMENTATION_VERSION-->
110+
* OpenTelemetry API version <!--OTEL_VERSION-->1.31.0<!--OTEL_VERSION-->
111+
* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.31.0<!--OTEL_INSTRUMENTATION_VERSION-->
117112
* Micrometer version 1.11.0
118113

119114
## Snapshot builds

‎buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ plugins {
55
repositories {
66
mavenCentral()
77
maven {
8+
name = "sonatypeReleases"
9+
url = uri("https://oss.sonatype.org/content/repositories/releases/")
10+
}
11+
maven {
12+
name = "sonatypeSnapshots"
813
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
914
}
1015
}

‎dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ plugins {
22
`java-platform`
33
}
44

5-
val otelVersion = "1.30.1"
5+
val otelVersion = "1.31.0"
66
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
7-
val otelInstrumentationVersion = "1.30.0"
7+
val otelInstrumentationVersion = "1.31.0"
88
val otelInstrumentationAlphaVersion = otelInstrumentationVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
99
val otelContribAlphaVersion = "1.30.0-alpha"
1010

@@ -43,7 +43,7 @@ dependencies {
4343
api("com.google.auto.service:auto-service:1.1.1")
4444
api("org.assertj:assertj-core:3.24.2")
4545
api("org.awaitility:awaitility:4.2.0")
46-
api("com.signalfx.public:signalfx-metrics:1.0.35")
46+
api("com.signalfx.public:signalfx-metrics:1.0.36")
4747

4848
api("com.github.docker-java:docker-java-core:$dockerJavaVersion")
4949
api("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")

‎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 1.28.0
43+
$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.29.0
4444
```
4545

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

‎instrumentation/khttp-0.1/src/main/java/com/splunk/opentelemetry/instrumentation/khttp/KHttpSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class KHttpSingletons {
4949
.build())
5050
.addAttributesExtractor(
5151
PeerServiceAttributesExtractor.create(
52-
httpAttributesGetter, CommonConfig.get().getPeerServiceMapping()))
52+
httpAttributesGetter, CommonConfig.get().getPeerServiceResolver()))
5353
.addOperationMetrics(HttpClientMetrics.get())
5454
.buildClientInstrumenter(KHttpHttpHeaderSetter.INSTANCE);
5555
}

‎licenses/licenses.md

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

22
# splunk-otel-javaagent
33
## Dependency License Report
4-
_2023-10-10 18:56:45 EEST_
4+
_2023-10-13 10:15:49 CEST_
55
## Apache License, Version 2.0
66

77
**1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.15.2`
@@ -18,23 +18,23 @@ _2023-10-10 18:56:45 EEST_
1818
> - **Embedded license files**: [jackson-jr-objects-2.15.2.jar/META-INF/LICENSE](jackson-jr-objects-2.15.2.jar/META-INF/LICENSE)
1919
- [jackson-jr-objects-2.15.2.jar/META-INF/NOTICE](jackson-jr-objects-2.15.2.jar/META-INF/NOTICE)
2020

21-
**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.35`
21+
**3** **Group:** `com.signalfx.public` **Name:** `signalfx-commons-protoc-java` **Version:** `1.0.36`
2222
> - **POM Project URL**: [http://www.signalfx.com](http://www.signalfx.com)
2323
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
2424
25-
**4** **Group:** `com.signalfx.public` **Name:** `signalfx-connection` **Version:** `1.0.35`
25+
**4** **Group:** `com.signalfx.public` **Name:** `signalfx-connection` **Version:** `1.0.36`
2626
> - **POM Project URL**: [https://www.splunk.com](https://www.splunk.com)
2727
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
2828
29-
**5** **Group:** `com.signalfx.public` **Name:** `signalfx-endpoint` **Version:** `1.0.35`
29+
**5** **Group:** `com.signalfx.public` **Name:** `signalfx-endpoint` **Version:** `1.0.36`
3030
> - **POM Project URL**: [http://www.splunk.com](http://www.splunk.com)
3131
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
3232
33-
**6** **Group:** `com.signalfx.public` **Name:** `signalfx-metrics` **Version:** `1.0.35`
33+
**6** **Group:** `com.signalfx.public` **Name:** `signalfx-metrics` **Version:** `1.0.36`
3434
> - **POM Project URL**: [http://www.signalfx.com](http://www.signalfx.com)
3535
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
3636
37-
**7** **Group:** `com.signalfx.public` **Name:** `signalfx-protoc` **Version:** `1.0.35`
37+
**7** **Group:** `com.signalfx.public` **Name:** `signalfx-protoc` **Version:** `1.0.36`
3838
> - **POM Project URL**: [http://www.signalfx.com](http://www.signalfx.com)
3939
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
4040
@@ -82,59 +82,59 @@ _2023-10-10 18:56:45 EEST_
8282
> - **Embedded license files**: [micrometer-registry-signalfx-1.11.5.jar/META-INF/LICENSE](micrometer-registry-signalfx-1.11.5.jar/META-INF/LICENSE)
8383
- [micrometer-registry-signalfx-1.11.5.jar/META-INF/NOTICE](micrometer-registry-signalfx-1.11.5.jar/META-INF/NOTICE)
8484

85-
**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.30.1`
85+
**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.31.0`
8686
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
8787
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
8888
89-
**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.30.1-alpha`
89+
**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.31.0-alpha`
9090
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
9191
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
9292
93-
**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.30.1`
93+
**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.31.0`
9494
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
9595
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
9696
97-
**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.30.1`
97+
**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.31.0`
9898
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
9999
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
100100
101-
**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.30.1`
101+
**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.31.0`
102102
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
103103
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
104104
105-
**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.30.1`
105+
**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.31.0`
106106
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
107107
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
108108
109-
**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.30.1`
109+
**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-sender-okhttp` **Version:** `1.31.0`
110110
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
111111
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
112112
113-
**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.30.1-alpha`
113+
**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-incubator` **Version:** `1.31.0-alpha`
114114
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
115115
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
116116
117-
**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.30.1`
117+
**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.31.0`
118118
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
119119
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
120120
121-
**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.30.1`
121+
**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.31.0`
122122
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
123123
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
124124
125-
**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.30.1`
125+
**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.31.0`
126126
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
127127
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
128128
129-
**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.30.1`
129+
**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.31.0`
130130
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
131131
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
132132
133-
**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.30.1`
133+
**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.31.0`
134134
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
135135
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
136136
137-
**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.30.1`
137+
**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.31.0`
138138
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
139139
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
140140
@@ -276,6 +276,6 @@ _2023-10-10 18:56:45 EEST_
276276
277277
## Unknown
278278

279-
**54** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `1.30.0-alpha`
279+
**54** **Group:** `io.opentelemetry.instrumentation` **Name:** `opentelemetry-instrumentation-bom-alpha` **Version:** `1.31.0-alpha`
280280

281281

‎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 = "1.29.0-SNAPSHOT"
2+
val distroVersion = "1.29.0"
33

44
allprojects {
55
version = distroVersion

0 commit comments

Comments
 (0)