Rename prometheus-collector to prometheus-client-bridge and prepare 1.22.0 change log (#689)

.github/scripts/draft-change-log-entries.sh

@@ -34,6 +34,7 @@ component_names["jmx-metrics/"]="JMX metrics"
 component_names["maven-extension/"]="Maven extension"
 component_names["micrometer-meter-provider/"]="Micrometer MeterProvider"
 component_names["noop-api/"]="No-op API"
+component_names["prometheus-client-bridge/"]="Prometheus client bridge"
 component_names["runtime-attach/"]="Runtime attach"
 component_names["resource-providers/"]="Resource providers"
 component_names["samplers/"]="Samplers"

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+### JFR streaming
+
+- Add buffer handlers and implement buffer metrics
+  ([#650](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/650))
+- Implement GC duration metric
+  ([#653](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/653))
+
+### Prometheus client bridge - New 🌟
+
+This module can be used to bridge OpenTelemetry metrics into the `prometheus-simpleclient` library.
+
 ## Version 1.21.0 (2022-12-15)
 
 ### JFR streaming

prometheus-client-bridge/README.md

@@ -0,0 +1,19 @@
+# Prometheus client bridge
+
+This module can be used to bridge OpenTelemetry metrics into the `prometheus-simpleclient` library.
+
+Currently only registers with the CollectorRegistry's `defaultRegistry`.
+
+* Build it with `./gradlew :prometheus-simpleclient-bridge:build`
+
+## Usage
+
+```
+sdkMeterProvider.registerMetricReader(PrometheusCollector.create());
+```
+
+## Component owners
+
+- [John Watson](https://github.com/jkwatson), Verta.ai
+
+Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).

prometheus-client-bridge/build.gradle.kts

@@ -3,11 +3,12 @@ plugins {
   id("otel.publish-conventions")
 }
 
-description = "Prometheus Collector - exposes OTel metrics to a Prometheus registry"
+description = "Prometheus client bridge"
 
 dependencies {
   api("io.opentelemetry:opentelemetry-sdk-metrics")
-  implementation("io.prometheus:simpleclient_httpserver")
+  implementation("io.prometheus:simpleclient")
 
   testImplementation("com.google.guava:guava")
+  testImplementation("io.prometheus:simpleclient_httpserver")
 }

prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.prometheus;
+package io.opentelemetry.contrib.metrics.prometheus.clientbridge;
 
 import static io.prometheus.client.Collector.doubleToGoString;
 

prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/NameSanitizer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.prometheus;
+package io.opentelemetry.contrib.metrics.prometheus.clientbridge;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollector.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.prometheus;
+package io.opentelemetry.contrib.metrics.prometheus.clientbridge;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.metrics.InstrumentType;

prometheus-client-bridge/src/main/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/Serializer.java

@@ -19,7 +19,7 @@
  * Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/).
  */
 
-package io.opentelemetry.contrib.prometheus;
+package io.opentelemetry.contrib.metrics.prometheus.clientbridge;
 
 import io.opentelemetry.sdk.metrics.data.HistogramPointData;
 import io.opentelemetry.sdk.metrics.data.MetricData;

prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.prometheus;
+package io.opentelemetry.contrib.metrics.prometheus.clientbridge;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static org.assertj.core.api.Assertions.assertThat;

prometheus-client-bridge/src/test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/PrometheusCollectorTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.prometheus;
+package io.opentelemetry.contrib.metrics.prometheus.clientbridge;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static org.assertj.core.api.Assertions.assertThat;

prometheus-collector/README.md

@@ -1,19 +0,0 @@
-# Prometheus Collector
-
-This module is useful for exposing OpenTelemetry metrics to a Prometheus registry.
-
-Currently only registers with the Prometheus `defaultRegistry`.
-
-* Build it with `./gradlew :prometheus-collector:build`
-
-## Usage
-
-```
-sdkMeterProvider.registerMetricReader(PrometheusCollector.create());
-```
-
-## Component owners
-
-- [John Watson](https://github.com/jkwatson), Verta.ai
-
-Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).

settings.gradle.kts

@@ -50,7 +50,7 @@ include(":jmx-metrics")
 include(":maven-extension")
 include(":micrometer-meter-provider")
 include(":noop-api")
-include(":prometheus-collector")
+include(":prometheus-client-bridge")
 include(":resource-providers")
 include(":runtime-attach:runtime-attach")
 include(":runtime-attach:runtime-attach-core")