make exceptions more specific, undo unrelated changes to pom and generate script

Signed-off-by: Jay DeLuca <jaydeluca4@gmail.com>

Author: jaydeluca

prometheus-metrics-exposition-formats-shaded/pom.xml

@@ -23,13 +23,6 @@
   </properties>
 
   <dependencies>
-    <!-- Ensures reactor builds exposition-formats first so generated protobuf sources exist before copy -->
-    <dependency>
-      <groupId>io.prometheus</groupId>
-      <artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exposition-textformats</artifactId>
@@ -76,26 +69,22 @@
         <executions>
           <execution>
             <id>copy-metrics-exposition-formats-main</id>
-            <phase>generate-sources</phase>
+            <phase>validate</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
             <configuration>
               <outputDirectory>target/metrics-exposition-formats/src/main</outputDirectory>
-              <overwrite>true</overwrite>
               <resources>
                 <resource>
                   <directory>../prometheus-metrics-exposition-formats/src/main</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
                 </resource>
               </resources>
             </configuration>
           </execution>
           <execution>
             <id>copy-metrics-exposition-formats-test</id>
-            <phase>generate-sources</phase>
+            <phase>validate</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>

prometheus-metrics-exposition-formats/generate-protobuf.sh

@@ -6,24 +6,6 @@ set -euo pipefail
 # I could not figure out how to use a protoc Maven plugin to use the shaded module,
 # so I ran this command to generate the sources manually.
 
-# Use gsed on macOS (requires: brew install gnu-sed) for in-place edits
-# BSD sed requires -i '' for in-place with no backup; GNU sed uses -i alone.
-if [[ "$OSTYPE" == "darwin"* ]] && command -v gsed >/dev/null 2>&1; then
-	SED='gsed'
-	SED_I=(-i)
-else
-	SED='sed'
-	# BSD sed: -i requires backup extension; '' = no backup
-	[[ "$OSTYPE" == "darwin"* ]] && SED_I=(-i '') || SED_I=(-i)
-fi
-
-# Use mise-provided protoc if available
-if command -v mise >/dev/null 2>&1; then
-	PROTOC="mise exec -- protoc"
-else
-	PROTOC='protoc'
-fi
-
 TARGET_DIR=$1
 PROTO_DIR=src/main/protobuf
 PROTOBUF_VERSION_STRING=$2
@@ -36,23 +18,22 @@ mkdir -p "$TARGET_DIR"
 rm -rf $PROTO_DIR || true
 mkdir -p $PROTO_DIR
 
-OLD_PACKAGE=$($SED -nE 's/import (io.prometheus.metrics.expositionformats.generated.*).Metrics;/\1/p' src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java)
+OLD_PACKAGE=$(sed -nE 's/import (io.prometheus.metrics.expositionformats.generated.*).Metrics;/\1/p' src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java)
 PACKAGE="io.prometheus.metrics.expositionformats.generated.com_google_protobuf_${PROTOBUF_VERSION_STRING}"
 
 if [[ $OLD_PACKAGE != "$PACKAGE" ]]; then
 	echo "Replacing package $OLD_PACKAGE with $PACKAGE in all java files"
-	find .. -type f -name "*.java" -exec "${SED}" "${SED_I[@]}" "s/$OLD_PACKAGE/$PACKAGE/g" {} +
+	find .. -type f -name "*.java" -exec sed -i "s/$OLD_PACKAGE/$PACKAGE/g" {} +
 fi
 
 curl -sL https://raw.githubusercontent.com/prometheus/client_model/master/io/prometheus/client/metrics.proto -o $PROTO_DIR/metrics.proto
 
-"${SED}" "${SED_I[@]}" "s/java_package = \"io.prometheus.client\"/java_package = \"$PACKAGE\"/" $PROTO_DIR/metrics.proto
-$PROTOC --java_out "$TARGET_DIR" $PROTO_DIR/metrics.proto
-find src/main/generated/io -type f -exec "${SED}" "${SED_I[@]}" '1 i\
-//CHECKSTYLE:OFF: checkstyle' {} \;
-find src/main/generated/io -type f -exec "${SED}" "${SED_I[@]}" -e $'$a\\\n//CHECKSTYLE:ON: checkstyle' {} \;
+sed -i "s/java_package = \"io.prometheus.client\"/java_package = \"$PACKAGE\"/" $PROTO_DIR/metrics.proto
+protoc --java_out "$TARGET_DIR" $PROTO_DIR/metrics.proto
+sed -i '1 i\//CHECKSTYLE:OFF: checkstyle' "$(find src/main/generated/io -type f)"
+sed -i -e $'$a\\\n//CHECKSTYLE:ON: checkstyle' "$(find src/main/generated/io -type f)"
 
-GENERATED_WITH=$($SED -n 's/.*\/\/ Protobuf Java Version: \(.*\)/\1/p' "$TARGET_DIR/${PACKAGE//\.//}"/Metrics.java)
+GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACKAGE//\.//}"/Metrics.java)
 
 function help() {
 	echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java

@@ -211,7 +211,8 @@ public void register(Collector collector) {
         collectorMetadata.put(
             collector, new CollectorRegistration(prometheusName, normalizedLabels));
       }
-    } catch (Exception e) {
+
+    } catch (RuntimeException e) {
       collectors.remove(collector);
       CollectorRegistration reg = collectorMetadata.remove(collector);
       if (reg != null && reg.prometheusName != null) {
@@ -243,7 +244,7 @@ public void register(MultiCollector collector) {
       }
 
       multiCollectorMetadata.put(collector, registrations);
-    } catch (Exception e) {
+    } catch (RuntimeException e) {
       multiCollectors.remove(collector);
       for (MultiCollectorRegistration registration : registrations) {
         unregisterLabelSchema(registration.prometheusName, registration.labelNames);