From fbc7eee6513dc4c6f65e4b2a02f16fef7dda2ef2 Mon Sep 17 00:00:00 2001
From: jason plumb <75337021+breedx-splk@users.noreply.github.com>
Date: Wed, 18 Jan 2023 10:25:18 -0800
Subject: [PATCH] Prepare for 1.20.0 release (#1081)

* prepare for release

* skip 4.0.0 based on upstream message re: broken slf4j.version being taken literally

* fix incomplete sentence.

* Update CHANGELOG.md

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>

* update more versions

* template foo

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
---
 CHANGELOG.md                                 | 11 +++++++++++
 README.md                                    | 15 +++++----------
 dependencyManagement/build.gradle.kts        |  4 ++--
 deployments/cloudfoundry/buildpack/README.md |  2 +-
 instrumentation/hikaricp/build.gradle.kts    |  3 +++
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c95d6a5b3..0678f89e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,17 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v1.20.0 - 2023-01-18
+
+Regular maintenance release, coordinated after the upstream/vanilla release.
+
+- OpenTelemetry Java SDK updated to version 1.22.0
+- OpenTelemetry Instrumentation for Java dependencies updated to version 1.22.1.
+- Upgrade to Gradle 7.6 (#1062)
+- Upgrade to Micrometer 1.10.3 (#1065)
+- Truncate `process.command_line` resource attribute when metrics are enabled (#1057) 
+- Numerous other minor dependency upgrades. 
+
 ## v1.19.0 - 2022-12-16
 
 ### General
diff --git a/README.md b/README.md
index 1fe23f6cd..3d6f0f6e6 100644
--- 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.21.0">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.21.0-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.22.1">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.22.1-blueviolet?style=for-the-badge">
   </a>
   <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.4.0">
     <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.4.0-blueviolet?style=for-the-badge">
@@ -75,11 +75,6 @@ see [Migrate from the SignalFx Java Agent](https://docs.splunk.com/Observability
 
 <!-- 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.19.0](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.19.0/README.md).
-
----
-<!--DEV_DOCS_WARNING_END-->
 
 ## Requirements
 
@@ -162,11 +157,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.19.0<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.20.0<!--SPLUNK_VERSION--> is compatible
 with:
 
-* OpenTelemetry API version <!--OTEL_VERSION-->1.21.0<!--OTEL_VERSION-->
-* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.21.0<!--OTEL_INSTRUMENTATION_VERSION-->
+* OpenTelemetry API version <!--OTEL_VERSION-->1.22.0<!--OTEL_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.22.1<!--OTEL_INSTRUMENTATION_VERSION-->
 * Micrometer version 1.10.3
 
 ## Snapshot builds
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index bea251b11..9deb2f4cf 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 
 val otelVersion = "1.22.0"
 val otelAlphaVersion = "1.22.0-alpha"
-val otelInstrumentationVersion = "1.22.0-SNAPSHOT"
-val otelInstrumentationAlphaVersion = "1.22.0-alpha-SNAPSHOT"
+val otelInstrumentationVersion = "1.22.1"
+val otelInstrumentationAlphaVersion = "1.22.1-alpha"
 val otelContribAlphaVersion = "1.21.0-alpha"
 
 val micrometerVersion = "1.10.3"
diff --git a/deployments/cloudfoundry/buildpack/README.md b/deployments/cloudfoundry/buildpack/README.md
index 145af095e..030b7bdd7 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.19.0
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.20.0
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.
diff --git a/instrumentation/hikaricp/build.gradle.kts b/instrumentation/hikaricp/build.gradle.kts
index 71a2fbcee..0ddf9eade 100644
--- a/instrumentation/hikaricp/build.gradle.kts
+++ b/instrumentation/hikaricp/build.gradle.kts
@@ -9,6 +9,9 @@ muzzle {
     module.set("HikariCP")
     versions.set("[3.0.0,)")
     // muzzle does not detect PoolStats method references used - some of these methods were introduced in 3.0 and we can't assertInverse
+
+    // 4.0.0 uses a broken slf4j version: the "${slf4j.version}" placeholder is taken literally
+    skip("4.0.0")
   }
 }