Merge pull request #166 in OP/openkit-java from feature/ONE-50587-pre…

…pare-openkit-java-release-2.1 to release/2.1 * commit '26261475d092bd98657298aad94c87bc4e18af2d': Fix Travis CI and coveralls badges in README Prepare OpenKit Java release 2.1 GitOrigin-RevId: 88f9e9578ab8fe2a72c36dc08c3e59c28adafc81
Dynatrace · Nov 16, 2020 · d4e6dc2 · d4e6dc2
1 parent 3d2613e
commit d4e6dc2
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
 # OpenKit Java Changelog
 
-## [Unreleased](https://github.com/Dynatrace/openkit-java/compare/v2.0.0...HEAD)
+## [Unreleased](https://github.com/Dynatrace/openkit-java/compare/v2.1.0...HEAD)
+
+## 2.1.0 [Release date: 2020-11-16]
+[GitHub Releases](https://github.com/Dynatrace/openkit-java/releases/tag/v2.1.0)
 
 ### Added
-- Support for reporting `long` values.
-- Convenience method reporting a `Throwable` as crash.
+- Overloaded `Action.reportValue(String, long`) method for reporting 64-bit integer values.
+- Overloaded `Session.reportCrash(Throwable)` as convenience method for reporting a `Throwable` as crash.
 - Overloaded `Action.reportError(String, int)` method for reporting an integer error code without description.  
   The old `Action.reportError(String, int, String)` has been deprecated in favor of the new one.
 - Overloaded `Action.reportError(String, Throwable)` for reporting caught exceptions as error.

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Dynatrace OpenKit - Java Reference Implementation
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Build Status](https://travis-ci.org/Dynatrace/openkit-java.svg?branch=main)](https://travis-ci.org/Dynatrace/openkit-java)
-[![Coverage Status](https://coveralls.io/repos/github/Dynatrace/openkit-java/badge.svg)](https://coveralls.io/github/Dynatrace/openkit-java)
+[![Build Status](https://travis-ci.org/Dynatrace/openkit-java.svg?branch=release%2F2.1)](https://travis-ci.org/Dynatrace/openkit-java)
+[![Coverage Status](https://coveralls.io/repos/github/Dynatrace/openkit-java/badge.svg?branch=release%2F2.1)](https://coveralls.io/github/Dynatrace/openkit-java?branch=release%2F2.1)
 
 :information_source: We changed the default branch name to `main`. You can find the necessary steps to update your local clone on [Scott Hanselman's Blog](https://www.hanselman.com/blog/EasilyRenameYourGitDefaultBranchFromMasterToMain.aspx).  
 We encourage you to rename the default branch in your forks too.

diff --git a/docs/supported_versions.md b/docs/supported_versions.md
@@ -9,6 +9,7 @@ Example: Version `1.4.3` supersedes `1.4.2` and therefore only `1.4.3` will be m
 ## Active maintenance
 | Version | Bug fixes          | Security fixes     | Remarks          |
 |---------|:------------------:|:------------------:|------------------|
+| 2.1.X   | :heavy_check_mark: | :heavy_check_mark: |                  | 
 | 2.0.X   | :heavy_check_mark: | :heavy_check_mark: |                  | 
 | 1.4.X   | :heavy_check_mark: | :heavy_check_mark: |                  | 
 | 1.3.X   |        :x:         |        :x:         | Upgrade to 1.4.X |

diff --git a/docs/upgrade_guide.md b/docs/upgrade_guide.md
@@ -1,5 +1,14 @@
 # Upgrade guide for OpenKit Java
 
+## OpenKit Java 2.0 to 2.1
+There are no breaking API changes and upgrading is straightforward, by [updating][update] the library
+to the latest 2.1 release.
+
+### Deprecated API
+* ` Action#reportError(String errorName, int errorCode, String reason)`
+  Use ` Action#reportError(String errorName, int errorCode)` without `String reason` argument, as
+  `reason` is unhandled in Dynatrace.
+
 ## OpenKit Java 1.4 to 2.0
 There are no breaking API changes and upgrading is straightforward, by [updating][update] the library
 to the latest 2.0 release.
@@ -9,6 +18,8 @@ to the latest 2.0 release.
   Use `WebRequestTracer#stop(int responseCode)` instead as replacement.
 * `DynatraceOpenKitBuilder#withApplicationName(String applicationName)`  
   The application name is configured in Dynatrace Web UI.
+* `AbstractOpenKitBuilder#enableVerbose()`
+  Use `AbstractOpenKitBuilder#withLogLevel(LogLevel.DEBUG)` instead.
 
 ## OpenKit Java 1.3 and below to 1.4
 There are no breaking API changes and upgrading is straightforward, by [updating][update] the library

diff --git a/src/main/java/com/dynatrace/openkit/api/Action.java b/src/main/java/com/dynatrace/openkit/api/Action.java
@@ -101,7 +101,7 @@ public interface Action extends Closeable {
      * @param reason    reason for this error
      * @return this Action (for usage as fluent API)
      *
-     * @deprecated Prefer {@link #reportError(String, int)}, since reason is unhandled.
+     * @deprecated with version 2.1.0 Prefer {@link #reportError(String, int)}, since {@code reason} is unhandled.
      */
     @Deprecated
     Action reportError(String errorName, int errorCode, String reason);

diff --git a/src/main/java/com/dynatrace/openkit/protocol/ProtocolConstants.java b/src/main/java/com/dynatrace/openkit/protocol/ProtocolConstants.java
@@ -19,7 +19,7 @@
 public class ProtocolConstants {
 
     // version constants
-    public static final String OPENKIT_VERSION = "8.198.20100";
+    public static final String OPENKIT_VERSION = "8.208.20100";
     public static final int PROTOCOL_VERSION = 3;
     public static final int PLATFORM_TYPE_OPENKIT = 1;
     public static final String AGENT_TECHNOLOGY_TYPE = "okjava";

diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-version=2.1.0-SNAPSHOT
+version=2.1.0