From 2fe02742d6eaf0fee00026634939ad68e53a1267 Mon Sep 17 00:00:00 2001 From: Punya Biswal Date: Tue, 25 Jan 2022 01:59:41 +0000 Subject: [PATCH 1/7] Start 0.32.0 development cycle --- .../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 ce285b1930..599c3d46f2 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-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION + public static final String VERSION = "0.32.0-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION private OpenCensusLibraryInformation() {} } diff --git a/build.gradle b/build.gradle index 722ebb5a7e..2e79333f06 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ subprojects { } group = "io.opencensus" - version = "0.31.0-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION + version = "0.32.0-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/examples/build.gradle b/examples/build.gradle index 6c83d90233..ac437cfc8f 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -31,7 +31,7 @@ repositories { } group = "io.opencensus" -version = "0.31.0-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION +version = "0.32.0-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 8f3dbfb165..e12e8e3bac 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ io.opencensus opencensus-examples jar - 0.31.0-SNAPSHOT + 0.32.0-SNAPSHOT opencensus-examples http://maven.apache.org diff --git a/examples/spring/servlet/build.gradle b/examples/spring/servlet/build.gradle index bb07aa8e00..c993f27940 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-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION +version = "0.32.0-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-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION + version = "0.32.0-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 72307d5062..ef157eb01e 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-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION + static final String OC_AGENT_EXPORTER_VERSION = "0.32.0-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 a989e7c6d3..f4b028aa4b 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-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION + static final String OC_AGENT_EXPORTER_VERSION = "0.32.0-SNAPSHOT"; // CURRENT_OPENCENSUS_VERSION @Nullable private static final io.opencensus.resource.Resource AUTO_DETECTED_RESOURCE = From 05a25dabe3809d5f33c1e6a9ce6c0bef853b23fc Mon Sep 17 00:00:00 2001 From: Mackenzie Starr Date: Wed, 16 Feb 2022 14:00:14 -0500 Subject: [PATCH 2/7] Fix retry stat measures to match those in grpc-java exactly (#2097) * update descriptions of retry measures to match those in grpc-java exactly * change GRPC_CLIENT_RETRY_DELAY_PER_CALL from MeasureLong to MeasureDouble --- .../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 215e4de795..54047d34fc 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 a6ec0416fd0c33a5cb04083b58bacab20b2dea98 Mon Sep 17 00:00:00 2001 From: Punya Biswal Date: Mon, 4 Apr 2022 14:02:59 -0400 Subject: [PATCH 3/7] Github workflows should act on release branches (#2101) --- .github/workflows/build-checker.yml | 1 + .github/workflows/build-gradle-examples.yml | 1 + .github/workflows/build-maven-examples.yml | 1 + .github/workflows/build.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/build-checker.yml b/.github/workflows/build-checker.yml index 671e4476d2..614848b016 100644 --- a/.github/workflows/build-checker.yml +++ b/.github/workflows/build-checker.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - v0.* jobs: build: diff --git a/.github/workflows/build-gradle-examples.yml b/.github/workflows/build-gradle-examples.yml index d63375c451..7fb5c4b567 100644 --- a/.github/workflows/build-gradle-examples.yml +++ b/.github/workflows/build-gradle-examples.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - v0.* jobs: build: diff --git a/.github/workflows/build-maven-examples.yml b/.github/workflows/build-maven-examples.yml index ad0591438f..c1df25b1eb 100644 --- a/.github/workflows/build-maven-examples.yml +++ b/.github/workflows/build-maven-examples.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - v0.* jobs: build: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f50e8c58d..13449dc24a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - v0.* jobs: build: From f9c76ae17eaaae7e53795b460ec3ae4369aae9cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Apr 2022 14:08:11 +0530 Subject: [PATCH 4/7] Bump spring-boot-starter-web in /examples/spring/servlet (#2099) Bumps [spring-boot-starter-web](https://github.com/spring-projects/spring-boot) from 2.0.5.RELEASE to 2.5.12. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.0.5.RELEASE...v2.5.12) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/spring/servlet/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/spring/servlet/pom.xml b/examples/spring/servlet/pom.xml index 5e6b28d052..0c3e102845 100644 --- a/examples/spring/servlet/pom.xml +++ b/examples/spring/servlet/pom.xml @@ -15,7 +15,7 @@ 4.1.4 0.26.0 0.6.0 - 2.0.5.RELEASE + 2.5.12 1.8 From a37129e50172f713f68a58b22027c5147925a526 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Thu, 15 Sep 2022 13:20:07 -0400 Subject: [PATCH 5/7] Stackdriver exporter: add workload.googleapis.com as a supported external domain (#2106) This allows metric descriptors to be created for metrics in that domain --- .../stats/stackdriver/CreateMetricDescriptorExporter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/CreateMetricDescriptorExporter.java b/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/CreateMetricDescriptorExporter.java index f247a6f479..fc39591a9d 100644 --- a/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/CreateMetricDescriptorExporter.java +++ b/exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/CreateMetricDescriptorExporter.java @@ -44,7 +44,8 @@ final class CreateMetricDescriptorExporter extends MetricExporter { private static final Logger logger = Logger.getLogger(CreateMetricDescriptorExporter.class.getName()); private static final ImmutableSet SUPPORTED_EXTERNAL_DOMAINS = - ImmutableSet.of("custom.googleapis.com", "external.googleapis.com"); + ImmutableSet.of( + "custom.googleapis.com", "external.googleapis.com", "workload.googleapis.com"); private static final String GOOGLE_APIS_DOMAIN_SUFFIX = "googleapis.com"; private final String projectId; @@ -166,8 +167,8 @@ private static boolean isBuiltInMetric(String metricName) { if (!metricDomain.endsWith(GOOGLE_APIS_DOMAIN_SUFFIX)) { return false; // domains like "my.org" are not Stackdriver built-in metrics. } - // All googleapis.com domains except "custom.googleapis.com" or "external.googleapis.com" - // are built-in metrics. + // All googleapis.com domains except "custom.googleapis.com", "external.googleapis.com", + // or "workload.googleapis.com" are built-in metrics. return !SUPPORTED_EXTERNAL_DOMAINS.contains(metricDomain); } } From 9e0260c87019a46348cfca904159ad52e246aca0 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Wed, 3 May 2023 13:29:21 -0400 Subject: [PATCH 6/7] Upgrade ubuntu runner to latest (#2112) 18.04 runner is deprecated https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/ --- .github/workflows/build-checker.yml | 2 +- .github/workflows/build-gradle-examples.yml | 2 +- .github/workflows/build-maven-examples.yml | 2 +- .github/workflows/build.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-checker.yml b/.github/workflows/build-checker.yml index 614848b016..8b1ad5c259 100644 --- a/.github/workflows/build-checker.yml +++ b/.github/workflows/build-checker.yml @@ -9,7 +9,7 @@ on: jobs: build: name: Build Checker - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 with: diff --git a/.github/workflows/build-gradle-examples.yml b/.github/workflows/build-gradle-examples.yml index 7fb5c4b567..d84bc47980 100644 --- a/.github/workflows/build-gradle-examples.yml +++ b/.github/workflows/build-gradle-examples.yml @@ -9,7 +9,7 @@ on: jobs: build: name: Build Gradle Examples Ubuntu - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 with: diff --git a/.github/workflows/build-maven-examples.yml b/.github/workflows/build-maven-examples.yml index c1df25b1eb..33dc65fab3 100644 --- a/.github/workflows/build-maven-examples.yml +++ b/.github/workflows/build-maven-examples.yml @@ -9,7 +9,7 @@ on: jobs: build: name: Build Maven Examples Ubuntu - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13449dc24a..da2af1167d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,12 +14,12 @@ jobs: matrix: os: - macos-latest - - ubuntu-18.04 + - ubuntu-latest java: - 8 # TODO: Java 11 build doesn't work due to Java7 target. include: - - os: ubuntu-18.04 + - os: ubuntu-latest java: 8 coverage: true steps: From baa68680b19040ff7739e314a2422a25cf41e27a Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Wed, 3 May 2023 13:57:14 -0400 Subject: [PATCH 7/7] Update README with OpenCensus sunset notice (#2111) --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index a133ff3b15..e9276e536d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +> **Warning** +> +> OpenCensus and OpenTracing have merged to form [OpenTelemetry](https://opentelemetry.io), which serves as the next major version of OpenCensus and OpenTracing. +> +> OpenTelemetry has now reached feature parity with OpenCensus, with tracing and metrics SDKs available in .NET, Golang, Java, NodeJS, and Python. **All OpenCensus Github repositories, except [census-instrumentation/opencensus-python](https://github.com/census-instrumentation/opencensus-python), will be archived on July 31st, 2023**. We encourage users to migrate to OpenTelemetry by this date. +> +> To help you gradually migrate your instrumentation to OpenTelemetry, bridges are available in Java, Go, Python, and JS. [**Read the full blog post to learn more**](https://opentelemetry.io/blog/2023/sunsetting-opencensus/). + # OpenCensus - A stats collection and distributed tracing framework [![Gitter chat][gitter-image]][gitter-url] [![Maven Central][maven-image]][maven-url]