fix protobuf

Author: zeitlinger

exporters/prometheus/build.gradle.kts

@@ -1,99 +1,99 @@
 plugins {
-    id("otel.java-conventions")
-    id("otel.publish-conventions")
+  id("otel.java-conventions")
+  id("otel.publish-conventions")
 }
 
 description = "OpenTelemetry Prometheus Exporter"
 otelJava.moduleName.set("io.opentelemetry.exporter.prometheus")
 
 dependencies {
-    api(project(":sdk:metrics"))
-
-    compileOnly(project(":api:incubator"))
-    implementation(project(":exporters:common"))
-    implementation(project(":sdk-extensions:autoconfigure-spi"))
-    implementation("io.prometheus:prometheus-metrics-exporter-httpserver") {
-        exclude(group = "io.prometheus", module = "prometheus-metrics-exposition-formats")
-    }
-    implementation("io.prometheus:prometheus-metrics-exposition-formats-no-protobuf")
-
-    compileOnly("com.google.auto.value:auto-value-annotations")
-
-    annotationProcessor("com.google.auto.value:auto-value")
-
-    testImplementation(project(":sdk:testing"))
-    testImplementation("io.opentelemetry.proto:opentelemetry-proto")
-    testImplementation("com.sun.net.httpserver:http")
-    testImplementation("com.google.guava:guava")
-    testImplementation("com.linecorp.armeria:armeria")
-    testImplementation("com.linecorp.armeria:armeria-junit5")
-    testImplementation("com.linecorp.armeria:armeria-grpc-protocol")
-    testImplementation("com.fasterxml.jackson.jr:jackson-jr-stree")
-    testImplementation("com.fasterxml.jackson.jr:jackson-jr-objects")
-    testImplementation("org.testcontainers:junit-jupiter")
+  api(project(":sdk:metrics"))
+
+  compileOnly(project(":api:incubator"))
+  implementation(project(":exporters:common"))
+  implementation(project(":sdk-extensions:autoconfigure-spi"))
+  implementation("io.prometheus:prometheus-metrics-exporter-httpserver") {
+    exclude(group = "io.prometheus", module = "prometheus-metrics-exposition-formats")
+  }
+  implementation("io.prometheus:prometheus-metrics-exposition-formats-no-protobuf")
+
+  compileOnly("com.google.auto.value:auto-value-annotations")
+
+  annotationProcessor("com.google.auto.value:auto-value")
+
+  testImplementation(project(":sdk:testing"))
+  testImplementation("io.opentelemetry.proto:opentelemetry-proto")
+  testImplementation("com.sun.net.httpserver:http")
+  testImplementation("com.google.guava:guava")
+  testImplementation("com.linecorp.armeria:armeria")
+  testImplementation("com.linecorp.armeria:armeria-junit5")
+  testImplementation("com.linecorp.armeria:armeria-grpc-protocol")
+  testImplementation("com.fasterxml.jackson.jr:jackson-jr-stree")
+  testImplementation("com.fasterxml.jackson.jr:jackson-jr-objects")
+  testImplementation("org.testcontainers:junit-jupiter")
 }
 
 tasks {
-    check {
-        dependsOn(testing.suites)
-    }
+  check {
+    dependsOn(testing.suites)
+  }
 }
 
 // TODO(anuraaga): Move to conventions.
 
 testing {
-    suites {
-        register<JvmTestSuite>("testJpms") {
-            targets {
-                all {
-                    testTask.configure {
-                        enabled = gradle.startParameter.projectProperties.get("testJavaVersion") != "8"
-                    }
-                }
-            }
+  suites {
+    register<JvmTestSuite>("testJpms") {
+      targets {
+        all {
+          testTask.configure {
+            enabled = gradle.startParameter.projectProperties.get("testJavaVersion") != "8"
+          }
         }
+      }
     }
+  }
 }
 
 sourceSets {
-    val module by creating
-    main {
-        output.dir(mapOf("builtBy" to "compileModuleJava"), module.java.destinationDirectory)
-    }
+  val module by creating
+  main {
+    output.dir(mapOf("builtBy" to "compileModuleJava"), module.java.destinationDirectory)
+  }
 }
 
 configurations {
-    named("moduleImplementation") {
-        extendsFrom(configurations["implementation"])
-    }
+  named("moduleImplementation") {
+    extendsFrom(configurations["implementation"])
+  }
 }
 
 tasks {
-    jar {
-        manifest.attributes.remove("Automatic-Module-Name")
+  jar {
+    manifest.attributes.remove("Automatic-Module-Name")
 
-        exclude("**/HackForJpms.class")
-    }
+    exclude("**/HackForJpms.class")
+  }
 
-    compileJava {
-        exclude("module-info.java")
-    }
+  compileJava {
+    exclude("module-info.java")
+  }
 
-    withType<Checkstyle>().configureEach {
-        exclude("module-info.java")
-    }
+  withType<Checkstyle>().configureEach {
+    exclude("module-info.java")
+  }
 
-    named<JavaCompile>("compileModuleJava") {
-        with(options) {
-            release.set(9)
-        }
+  named<JavaCompile>("compileModuleJava") {
+    with(options) {
+      release.set(9)
     }
+  }
 
-    named<JavaCompile>("compileTestJpmsJava") {
-        with(options) {
-            release.set(9)
-            compilerArgs.add("--add-modules=org.junit.jupiter.api")
-            compilerArgs.add("--add-reads=io.opentelemetry.exporters.prometheus.test=org.junit.jupiter.api")
-        }
+  named<JavaCompile>("compileTestJpmsJava") {
+    with(options) {
+      release.set(9)
+      compilerArgs.add("--add-modules=org.junit.jupiter.api")
+      compilerArgs.add("--add-reads=io.opentelemetry.exporters.prometheus.test=org.junit.jupiter.api")
     }
+  }
 }

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java

@@ -253,7 +253,8 @@ void fetchProtobuf() {
             .join();
     assertThat(response.status()).isEqualTo(HttpStatus.OK);
     assertThat(response.headers().get(HttpHeaderNames.CONTENT_TYPE))
-        .isEqualTo("application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited");
+        .isEqualTo(
+            "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited");
     // don't decode the protobuf, just verify it doesn't throw an exception
   }