Merge pull request #177 from grafana/chore/bump-protobuf

chore: bump com.google.protobuf:protobuf-java to 4.29.2
grafana · Jan 9, 2025 · 05f5dde · 05f5dde
2 parents c65300b + 866fe43
commit 05f5dde
Show file tree

Hide file tree

Showing 7 changed files with 446 additions and 539 deletions.
diff --git a/agent/build.gradle b/agent/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'signing'
 
     // https://github.com/johnrengelman/shadow
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -21,7 +21,7 @@ dependencies {
     api project(":async-profiler-context")
     implementation('com.squareup.okhttp3:okhttp:4.12.0')
     implementation("com.squareup.moshi:moshi:1.14.0")
-    api 'com.google.protobuf:protobuf-java:4.28.1'
+    api 'com.google.protobuf:protobuf-java:4.29.2'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.2'
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.10.0'

diff --git a/agent/src/main/java/io/pyroscope/javaagent/Snapshot.java b/agent/src/main/java/io/pyroscope/javaagent/Snapshot.java
@@ -11,9 +11,9 @@ public final class Snapshot {
     public final Instant started;
     public final Instant ended;
     public final byte[] data;
-    public final JfrLabels.Snapshot labels;
+    public final JfrLabels.LabelsSnapshot labels;
 
-    Snapshot(Format format, final EventType eventType, final Instant started, final Instant ended,final byte[] data, JfrLabels.Snapshot labels) {
+    Snapshot(Format format, final EventType eventType, final Instant started, final Instant ended,final byte[] data, JfrLabels.LabelsSnapshot labels) {
         this.format = format;
         this.eventType = eventType;
         this.started = started;

diff --git a/async-profiler-context/build.gradle b/async-profiler-context/build.gradle
@@ -25,7 +25,7 @@ def asyncProfilerVersion = project.properties['async_profiler_version']
 def pyroscopeVersion = project.properties['pyroscope_version']
 dependencies {
     api files("$buildDir/async-profiler/async-profiler.jar")
-    implementation 'com.google.protobuf:protobuf-java:3.21.1'
+    implementation 'com.google.protobuf:protobuf-java:4.29.2'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.2'
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.10.0'
@@ -201,3 +201,14 @@ afterEvaluate {
         }
     }
 }
+
+tasks.register('generate-proto-classes') {
+    doLast {
+        exec {
+            commandLine 'protoc',
+                '-I', '.',
+                '--java_out', 'src/main/java',
+                'jfr_labels.proto'
+        }
+    }
+}
diff --git a/...rofiler-context/src/main/jfr_labels.proto → async-profiler-context/jfr_labels.proto b/...rofiler-context/src/main/jfr_labels.proto → async-profiler-context/jfr_labels.proto
diff --git a/async-profiler-context/src/main/java/io/pyroscope/labels/Pyroscope.java b/async-profiler-context/src/main/java/io/pyroscope/labels/Pyroscope.java
@@ -28,8 +28,8 @@ public static void run(LabelsSet labels, Runnable c) {
             }
         }
 
-        public static JfrLabels.Snapshot dump() {
-            JfrLabels.Snapshot.Builder sb = JfrLabels.Snapshot.newBuilder();
+        public static JfrLabels.LabelsSnapshot dump() {
+            JfrLabels.LabelsSnapshot.Builder sb = JfrLabels.LabelsSnapshot.newBuilder();
 
             for (Ref<String> it : RefCounted.strings.valueToRef.values()) {
                 sb.putStrings(it.id, it.val);