diff --git a/.github/workflows/build-checker.yml b/.github/workflows/build-checker.yml
index 671e4476d2..8b1ad5c259 100644
--- a/.github/workflows/build-checker.yml
+++ b/.github/workflows/build-checker.yml
@@ -4,11 +4,12 @@ on:
pull_request:
branches:
- master
+ - v0.*
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 d63375c451..d84bc47980 100644
--- a/.github/workflows/build-gradle-examples.yml
+++ b/.github/workflows/build-gradle-examples.yml
@@ -4,11 +4,12 @@ on:
pull_request:
branches:
- master
+ - v0.*
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 ad0591438f..33dc65fab3 100644
--- a/.github/workflows/build-maven-examples.yml
+++ b/.github/workflows/build-maven-examples.yml
@@ -4,11 +4,12 @@ on:
pull_request:
branches:
- master
+ - v0.*
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 9f50e8c58d..da2af1167d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
+ - v0.*
jobs:
build:
@@ -13,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:
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]
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/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.
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/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
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/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);
}
}
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 =