From 3342f59e9d49723684e15a2bcb64fc737d18450f Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <carl@carlmastrangelo.com>
Date: Sat, 26 Feb 2022 16:32:37 -0800
Subject: [PATCH 1/2] all: bump PerfMark to 0.25.0

---
 build.gradle     | 2 +-
 repositories.bzl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index bece9d03bad..22ba6e6e972 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,7 +169,7 @@ subprojects {
             opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
             opencensus_proto: "io.opencensus:opencensus-proto:0.2.0",
             instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
-            perfmark: 'io.perfmark:perfmark-api:0.23.0',
+            perfmark: 'io.perfmark:perfmark-api:0.25.0',
             protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
             protobuf_lite: "com.google.protobuf:protobuf-javalite:${protobufVersion}",
             protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}",
diff --git a/repositories.bzl b/repositories.bzl
index 8ad5f109e6f..6e081754550 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -39,7 +39,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "io.netty:netty-transport:4.1.72.Final",
     "io.opencensus:opencensus-api:0.24.0",
     "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
-    "io.perfmark:perfmark-api:0.23.0",
+    "io.perfmark:perfmark-api:0.25.0",
     "junit:junit:4.12",
     "org.apache.tomcat:annotations-api:6.0.53",
     "org.codehaus.mojo:animal-sniffer-annotations:1.19",

From 196a5d00e066e28e11f06ed5357532d87ce96ba8 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Mon, 28 Mar 2022 10:52:08 -0700
Subject: [PATCH 2/2] re-define perfmark in observability to bump
 cloud-logging's version

---
 observability/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/observability/build.gradle b/observability/build.gradle
index 137e5f6978a..aaa68c79c62 100644
--- a/observability/build.gradle
+++ b/observability/build.gradle
@@ -15,6 +15,7 @@ dependencies {
 
     implementation project(':grpc-protobuf'),
             project(':grpc-stub'),
+            libraries.perfmark,
             ('com.google.guava:guava:31.0.1-jre'),
             ('com.google.errorprone:error_prone_annotations:2.11.0'),
             ('com.google.auth:google-auth-library-credentials:1.4.0'),