From d24539e81103e7daa93b90c35bf4f59d3fc72b00 Mon Sep 17 00:00:00 2001 From: Punya Biswal Date: Tue, 25 Jan 2022 18:56:36 +0000 Subject: [PATCH 1/3] Bump version to 0.31.1-SNAPSHOT --- .../io/opencensus/common/OpenCensusLibraryInformation.java | 2 +- build.gradle | 2 +- examples/build.gradle | 2 +- examples/pom.xml | 2 +- examples/spring/servlet/build.gradle | 4 ++-- .../opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java | 2 +- .../opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java b/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java index 234e6d19a..3e248948e 100644 --- a/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java +++ b/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java @@ -29,7 +29,7 @@ public final class OpenCensusLibraryInformation { * * @since 0.8 */ - public static final String VERSION = "0.29.0"; // CURRENT_OPENCENSUS_VERSION + public static final String VERSION = "0.31.1-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION private OpenCensusLibraryInformation() {} } diff --git a/build.gradle b/build.gradle index 5bfef1e13..516f70417 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ subprojects { } group = "io.opencensus" - version = "0.31.0" // CURRENT_OPENCENSUS_VERSION + version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/examples/build.gradle b/examples/build.gradle index c1010bb21..0c073de26 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -31,7 +31,7 @@ repositories { } group = "io.opencensus" -version = "0.31.0" // CURRENT_OPENCENSUS_VERSION +version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION def opencensusVersion = "0.30.0" // LATEST_OPENCENSUS_RELEASE_VERSION def grpcVersion = "1.32.2" // CURRENT_GRPC_VERSION diff --git a/examples/pom.xml b/examples/pom.xml index 2aab89989..819b500b0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ io.opencensus opencensus-examples jar - 0.31.0 + 0.31.1-SNAPSHOT opencensus-examples http://maven.apache.org diff --git a/examples/spring/servlet/build.gradle b/examples/spring/servlet/build.gradle index d5e6723e3..b4effff65 100644 --- a/examples/spring/servlet/build.gradle +++ b/examples/spring/servlet/build.gradle @@ -30,7 +30,7 @@ repositories { } group = "io.opencensus" -version = "0.30.0" // CURRENT_OPENCENSUS_VERSION +version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION def opencensusVersion = "0.26.0" // LATEST_OPENCENSUS_RELEASE_VERSION def prometheusVersion = "0.6.0" @@ -85,7 +85,7 @@ apply plugin: 'io.spring.dependency-management' bootJar { mainClassName = 'com.baeldung.Application' baseName = 'opencensus-examples-spring-servlet' - version = "0.31.0" // CURRENT_OPENCENSUS_VERSION + version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION } sourceCompatibility = 1.8 diff --git a/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java b/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java index 6c2099450..0206915d5 100644 --- a/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java +++ b/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java @@ -39,7 +39,7 @@ final class OcAgentNodeUtils { // The current version of the OpenCensus OC-Agent Exporter. @VisibleForTesting - static final String OC_AGENT_EXPORTER_VERSION = "0.31.0"; // CURRENT_OPENCENSUS_VERSION + static final String OC_AGENT_EXPORTER_VERSION = "0.31.1-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION @Nullable private static final io.opencensus.resource.Resource AUTO_DETECTED_RESOURCE = diff --git a/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java b/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java index 7ffd3629a..b57f94198 100644 --- a/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java +++ b/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java @@ -38,7 +38,7 @@ final class OcAgentNodeUtils { // The current version of the OpenCensus OC-Agent Exporter. @VisibleForTesting - static final String OC_AGENT_EXPORTER_VERSION = "0.31.0"; // CURRENT_OPENCENSUS_VERSION + static final String OC_AGENT_EXPORTER_VERSION = "0.31.1-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION @Nullable private static final io.opencensus.resource.Resource AUTO_DETECTED_RESOURCE = From 602b56ca522c30fa0556a3dde6b02c3ba69a654b Mon Sep 17 00:00:00 2001 From: Punya Biswal Date: Tue, 5 Apr 2022 09:10:13 -0400 Subject: [PATCH 2/3] Fix retry stat measures to match those in grpc-java exactly (#2097) (#2102) * update descriptions of retry measures to match those in grpc-java exactly * change GRPC_CLIENT_RETRY_DELAY_PER_CALL from MeasureLong to MeasureDouble Co-authored-by: Mackenzie Starr --- .../contrib/grpc/metrics/RpcMeasureConstants.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/contrib/grpc_metrics/src/main/java/io/opencensus/contrib/grpc/metrics/RpcMeasureConstants.java b/contrib/grpc_metrics/src/main/java/io/opencensus/contrib/grpc/metrics/RpcMeasureConstants.java index 215e4de79..54047d34f 100644 --- a/contrib/grpc_metrics/src/main/java/io/opencensus/contrib/grpc/metrics/RpcMeasureConstants.java +++ b/contrib/grpc_metrics/src/main/java/io/opencensus/contrib/grpc/metrics/RpcMeasureConstants.java @@ -235,7 +235,7 @@ public final class RpcMeasureConstants { */ public static final MeasureLong GRPC_CLIENT_RETRIES_PER_CALL = Measure.MeasureLong.create( - "grpc.io/client/retries_per_call", "Number of retries per call.", COUNT); + "grpc.io/client/retries_per_call", "Number of retries per call", COUNT); /** * {@link Measure} for total number of transparent retries made during the client call. @@ -244,9 +244,7 @@ public final class RpcMeasureConstants { */ public static final MeasureLong GRPC_CLIENT_TRANSPARENT_RETRIES_PER_CALL = Measure.MeasureLong.create( - "grpc.io/client/transparent_retries_per_call", - "Number of transparent retries per call.", - COUNT); + "grpc.io/client/transparent_retries_per_call", "Transparent retries per call", COUNT); /** * {@link Measure} for total time of delay while there is no active attempt during the client @@ -254,9 +252,9 @@ public final class RpcMeasureConstants { * * @since 0.28 */ - public static final MeasureLong GRPC_CLIENT_RETRY_DELAY_PER_CALL = - Measure.MeasureLong.create( - "grpc.io/client/retry_delay_per_call", "Retry delay per call.", MILLISECOND); + public static final MeasureDouble GRPC_CLIENT_RETRY_DELAY_PER_CALL = + Measure.MeasureDouble.create( + "grpc.io/client/retry_delay_per_call", "Retry delay per call", MILLISECOND); /** * {@link Measure} for gRPC client error counts. From 21bbcb8455296e6209099f118b5ada8c0b737c88 Mon Sep 17 00:00:00 2001 From: Punya Biswal Date: Tue, 5 Apr 2022 10:19:12 -0400 Subject: [PATCH 3/3] Bump version to 0.31.1 --- .../io/opencensus/common/OpenCensusLibraryInformation.java | 2 +- build.gradle | 2 +- examples/build.gradle | 2 +- examples/pom.xml | 2 +- examples/spring/servlet/build.gradle | 4 ++-- .../opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java | 2 +- .../opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java b/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java index 3e248948e..1019def9d 100644 --- a/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java +++ b/api/src/main/java/io/opencensus/common/OpenCensusLibraryInformation.java @@ -29,7 +29,7 @@ public final class OpenCensusLibraryInformation { * * @since 0.8 */ - public static final String VERSION = "0.31.1-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION + public static final String VERSION = "0.31.1"; // CURRENT_OPENCENSUS_VERSION private OpenCensusLibraryInformation() {} } diff --git a/build.gradle b/build.gradle index 516f70417..09d45fd55 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ subprojects { } group = "io.opencensus" - version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION + version = "0.31.1" // CURRENT_OPENCENSUS_VERSION sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/examples/build.gradle b/examples/build.gradle index 0c073de26..729b402fc 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -31,7 +31,7 @@ repositories { } group = "io.opencensus" -version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION +version = "0.31.1" // CURRENT_OPENCENSUS_VERSION def opencensusVersion = "0.30.0" // LATEST_OPENCENSUS_RELEASE_VERSION def grpcVersion = "1.32.2" // CURRENT_GRPC_VERSION diff --git a/examples/pom.xml b/examples/pom.xml index 819b500b0..879073e78 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ io.opencensus opencensus-examples jar - 0.31.1-SNAPSHOT + 0.31.1 opencensus-examples http://maven.apache.org diff --git a/examples/spring/servlet/build.gradle b/examples/spring/servlet/build.gradle index b4effff65..908ffd970 100644 --- a/examples/spring/servlet/build.gradle +++ b/examples/spring/servlet/build.gradle @@ -30,7 +30,7 @@ repositories { } group = "io.opencensus" -version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION +version = "0.31.1" // CURRENT_OPENCENSUS_VERSION def opencensusVersion = "0.26.0" // LATEST_OPENCENSUS_RELEASE_VERSION def prometheusVersion = "0.6.0" @@ -85,7 +85,7 @@ apply plugin: 'io.spring.dependency-management' bootJar { mainClassName = 'com.baeldung.Application' baseName = 'opencensus-examples-spring-servlet' - version = "0.31.1-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION + version = "0.31.1" // CURRENT_OPENCENSUS_VERSION } sourceCompatibility = 1.8 diff --git a/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java b/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java index 0206915d5..fe1ebabb2 100644 --- a/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java +++ b/exporters/metrics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/OcAgentNodeUtils.java @@ -39,7 +39,7 @@ final class OcAgentNodeUtils { // The current version of the OpenCensus OC-Agent Exporter. @VisibleForTesting - static final String OC_AGENT_EXPORTER_VERSION = "0.31.1-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION + static final String OC_AGENT_EXPORTER_VERSION = "0.31.1"; // CURRENT_OPENCENSUS_VERSION @Nullable private static final io.opencensus.resource.Resource AUTO_DETECTED_RESOURCE = diff --git a/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java b/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java index b57f94198..c1e556d98 100644 --- a/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java +++ b/exporters/trace/ocagent/src/main/java/io/opencensus/exporter/trace/ocagent/OcAgentNodeUtils.java @@ -38,7 +38,7 @@ final class OcAgentNodeUtils { // The current version of the OpenCensus OC-Agent Exporter. @VisibleForTesting - static final String OC_AGENT_EXPORTER_VERSION = "0.31.1-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION + static final String OC_AGENT_EXPORTER_VERSION = "0.31.1"; // CURRENT_OPENCENSUS_VERSION @Nullable private static final io.opencensus.resource.Resource AUTO_DETECTED_RESOURCE =