diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml index 1b20a0470..e4c898ef2 100644 --- a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml +++ b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml @@ -50,7 +50,7 @@ org.apache.tomcat.embed tomcat-embed-core - 10.1.19 + 10.1.24 diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml index 5baa99dd8..346417583 100644 --- a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml +++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml @@ -50,7 +50,7 @@ org.apache.tomcat.embed tomcat-embed-core - 10.1.19 + 10.1.24 diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml index bf6598e6f..a78cfd229 100644 --- a/examples/example-exporter-servlet-tomcat/pom.xml +++ b/examples/example-exporter-servlet-tomcat/pom.xml @@ -50,7 +50,7 @@ org.apache.tomcat.embed tomcat-embed-core - 10.1.19 + 10.1.24 diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml index a17fcb2c7..28bb7c1d8 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml +++ b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml @@ -45,12 +45,12 @@ org.eclipse.jetty jetty-server - 11.0.20 + 11.0.21 org.eclipse.jetty jetty-servlet - 11.0.20 + 11.0.21 diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml index 016433ec2..78914a7ea 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml +++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml @@ -45,7 +45,7 @@ org.apache.tomcat.embed tomcat-embed-core - 10.1.19 + 10.1.24 diff --git a/integration-tests/it-exporter/it-exporter-test/pom.xml b/integration-tests/it-exporter/it-exporter-test/pom.xml index def7ff0ca..9de44493a 100644 --- a/integration-tests/it-exporter/it-exporter-test/pom.xml +++ b/integration-tests/it-exporter/it-exporter-test/pom.xml @@ -51,7 +51,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 test diff --git a/integration-tests/it-pushgateway/pom.xml b/integration-tests/it-pushgateway/pom.xml index d8b81a303..85c49d2b2 100644 --- a/integration-tests/it-pushgateway/pom.xml +++ b/integration-tests/it-pushgateway/pom.xml @@ -65,7 +65,7 @@ com.jayway.jsonpath json-path - 2.8.0 + 2.9.0 test diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 9bac492fb..b51829120 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -55,7 +55,7 @@ org.testcontainers testcontainers - 1.19.7 + 1.19.8 test diff --git a/pom.xml b/pom.xml index b79891eb9..f9b64b7e7 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ prometheus-metrics-instrumentation-jvm prometheus-metrics-instrumentation-dropwizard5 prometheus-metrics-simpleclient-bridge - + prometheus-metrics-shaded-dependencies examples benchmarks integration-tests diff --git a/prometheus-metrics-bom/pom.xml b/prometheus-metrics-bom/pom.xml index d000aac2d..afdd84cf0 100644 --- a/prometheus-metrics-bom/pom.xml +++ b/prometheus-metrics-bom/pom.xml @@ -118,20 +118,20 @@ io.prometheus prometheus-metrics-shaded-dependencies - ${prometheus.metrics.shaded.dependencies.version} - + + ${project.version} io.prometheus prometheus-metrics-shaded-protobuf - ${prometheus.metrics.shaded.dependencies.version} - + + ${project.version} io.prometheus prometheus-metrics-shaded-opentelemetry - ${prometheus.metrics.shaded.dependencies.version} - + + ${project.version} diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml index 8d80bda14..25f657f31 100644 --- a/prometheus-metrics-exporter-opentelemetry/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry/pom.xml @@ -17,7 +17,7 @@ - 1.36.0 + 1.38.0 io.prometheus.metrics.exporter.opentelemetry @@ -46,8 +46,8 @@ io.prometheus prometheus-metrics-shaded-opentelemetry - 1.2.1 - + + ${project.version} @@ -60,7 +60,7 @@ org.wiremock wiremock - 3.4.2 + 3.5.4 test diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java index 6cb3b4731..97719d6c3 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java @@ -3,15 +3,15 @@ import io.prometheus.metrics.config.ExporterOpenTelemetryProperties; import io.prometheus.metrics.config.PrometheusProperties; import io.prometheus.metrics.model.registry.PrometheusRegistry; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.http.metrics.OtlpHttpMetricExporter; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.metrics.OtlpGrpcMetricExporter; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.export.MetricExporter; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.export.PeriodicMetricReader; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.Resource; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.ResourceBuilder; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.exporter.otlp.http.metrics.OtlpHttpMetricExporter; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.exporter.otlp.metrics.OtlpGrpcMetricExporter; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.common.InstrumentationScopeInfo; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.export.MetricExporter; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.export.PeriodicMetricReader; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.resources.Resource; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.resources.ResourceBuilder; import java.time.Duration; import java.util.HashMap; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java index acaf0d2a9..de14def11 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java @@ -1,6 +1,6 @@ package io.prometheus.metrics.exporter.opentelemetry; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.common.InstrumentationScopeInfo; import java.util.Properties; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java index 63b042ecd..37ee4d1de 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java @@ -12,13 +12,13 @@ import io.prometheus.metrics.model.snapshots.StateSetSnapshot; import io.prometheus.metrics.model.snapshots.SummarySnapshot; import io.prometheus.metrics.model.snapshots.UnknownSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.AttributesBuilder; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.export.CollectionRegistration; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.Resource; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.ResourceBuilder; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.AttributesBuilder; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.common.InstrumentationScopeInfo; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.export.CollectionRegistration; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.resources.Resource; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.resources.ResourceBuilder; import java.util.ArrayList; import java.util.Collection; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/DoublePointDataImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/DoublePointDataImpl.java index b8b850367..8f4a627ff 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/DoublePointDataImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/DoublePointDataImpl.java @@ -1,8 +1,8 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramBucketsImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramBucketsImpl.java index 664d03cc1..5acacc457 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramBucketsImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramBucketsImpl.java @@ -1,6 +1,6 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramBuckets; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ExponentialHistogramBuckets; import java.util.ArrayList; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImpl.java index 1756bf63f..799e44712 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImpl.java @@ -1,9 +1,9 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramBuckets; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramPointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ExponentialHistogramBuckets; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ExponentialHistogramPointData; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImpl.java index 9e2eb70dd..af9c1519d 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImpl.java @@ -1,8 +1,8 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.HistogramPointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.HistogramPointData; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java index 24dd549e4..6e723e20a 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java @@ -7,9 +7,9 @@ import io.prometheus.metrics.model.snapshots.StateSetSnapshot; import io.prometheus.metrics.model.snapshots.SummarySnapshot; import io.prometheus.metrics.model.snapshots.UnknownSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.Resource; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.common.InstrumentationScopeInfo; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.resources.Resource; public class MetricDataFactory { diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PointDataImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PointDataImpl.java index c9b3713e7..b3795e5dd 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PointDataImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PointDataImpl.java @@ -1,9 +1,8 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.PointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.PointData; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusClassicHistogram.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusClassicHistogram.java index 55eddc9be..0040c7d17 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusClassicHistogram.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusClassicHistogram.java @@ -2,10 +2,10 @@ import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets; import io.prometheus.metrics.model.snapshots.HistogramSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.AggregationTemporality; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.HistogramData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.HistogramPointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.AggregationTemporality; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.HistogramData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.HistogramPointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; import java.util.ArrayList; import java.util.Collection; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusCounter.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusCounter.java index be0a54a19..4ad04975f 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusCounter.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusCounter.java @@ -1,9 +1,9 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.AggregationTemporality; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SumData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.AggregationTemporality; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SumData; import io.prometheus.metrics.model.snapshots.CounterSnapshot; import java.util.Collection; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusData.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusData.java index ef5028871..7d67a22fa 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusData.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusData.java @@ -1,16 +1,16 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; import io.prometheus.metrics.model.snapshots.*; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.AttributesBuilder; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.trace.SpanContext; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.trace.TraceFlags; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.trace.TraceState; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.Data; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.PointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.internal.data.ImmutableDoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.AttributesBuilder; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.trace.SpanContext; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.trace.TraceFlags; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.trace.TraceState; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.Data; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.PointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.internal.data.ImmutableDoubleExemplarData; import java.util.Collections; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusGauge.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusGauge.java index 21136b338..73e176bb6 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusGauge.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusGauge.java @@ -1,9 +1,9 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; import io.prometheus.metrics.model.snapshots.GaugeSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.GaugeData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.GaugeData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; import java.util.Collection; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusInfo.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusInfo.java index 88be12ba7..6159e77fb 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusInfo.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusInfo.java @@ -1,10 +1,10 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; import io.prometheus.metrics.model.snapshots.InfoSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.AggregationTemporality; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SumData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.AggregationTemporality; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SumData; import java.util.Collection; import java.util.Collections; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java index a12e63f76..348ff535f 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java @@ -1,14 +1,13 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; import io.prometheus.metrics.model.snapshots.MetricMetadata; -import io.prometheus.metrics.model.snapshots.PrometheusNaming; import io.prometheus.metrics.model.snapshots.Unit; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SumData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.Resource; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.common.InstrumentationScopeInfo; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SumData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.resources.Resource; class PrometheusMetricData> implements MetricData { diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusNativeHistogram.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusNativeHistogram.java index c0fcfdf13..83ce1f14a 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusNativeHistogram.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusNativeHistogram.java @@ -2,11 +2,11 @@ import io.prometheus.metrics.model.snapshots.HistogramSnapshot; import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.AggregationTemporality; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramBuckets; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramPointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.AggregationTemporality; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ExponentialHistogramBuckets; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ExponentialHistogramData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ExponentialHistogramPointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; import java.util.Collection; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusStateSet.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusStateSet.java index 6631813fb..110919428 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusStateSet.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusStateSet.java @@ -2,10 +2,10 @@ import io.prometheus.metrics.model.snapshots.Labels; import io.prometheus.metrics.model.snapshots.StateSetSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.AggregationTemporality; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SumData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.AggregationTemporality; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SumData; import java.util.ArrayList; import java.util.Collection; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusSummary.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusSummary.java index 29f861e2e..11e780018 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusSummary.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusSummary.java @@ -2,9 +2,9 @@ import io.prometheus.metrics.model.snapshots.Quantile; import io.prometheus.metrics.model.snapshots.SummarySnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SummaryData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SummaryPointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SummaryData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SummaryPointData; import java.util.Collection; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusUnknown.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusUnknown.java index bcda2e74a..9bb2f8e76 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusUnknown.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusUnknown.java @@ -1,9 +1,9 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; import io.prometheus.metrics.model.snapshots.UnknownSnapshot; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.GaugeData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricDataType; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoublePointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.GaugeData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.MetricDataType; import java.util.Collection; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/SummaryPointDataImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/SummaryPointDataImpl.java index 03a9179c5..83155f05a 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/SummaryPointDataImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/SummaryPointDataImpl.java @@ -1,9 +1,9 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.SummaryPointData; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ValueAtQuantile; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.api.common.Attributes; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.DoubleExemplarData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.SummaryPointData; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ValueAtQuantile; import java.util.ArrayList; import java.util.List; diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ValueAtQuantileImpl.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ValueAtQuantileImpl.java index 09c244534..8117c5a8c 100644 --- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ValueAtQuantileImpl.java +++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ValueAtQuantileImpl.java @@ -1,6 +1,6 @@ package io.prometheus.metrics.exporter.opentelemetry.otelmodel; -import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ValueAtQuantile; +import io.prometheus.metrics.shaded.io_opentelemetry_1_38_0.sdk.metrics.data.ValueAtQuantile; public class ValueAtQuantileImpl implements ValueAtQuantile { diff --git a/prometheus-metrics-exporter-pushgateway/pom.xml b/prometheus-metrics-exporter-pushgateway/pom.xml index 47dbadf74..66690e973 100644 --- a/prometheus-metrics-exporter-pushgateway/pom.xml +++ b/prometheus-metrics-exporter-pushgateway/pom.xml @@ -59,13 +59,13 @@ org.mock-server mockserver-netty - 5.13.2 + 5.15.0 test org.mock-server mockserver-junit-rule-no-dependencies - 5.13.2 + 5.15.0 test diff --git a/prometheus-metrics-exposition-formats/pom.xml b/prometheus-metrics-exposition-formats/pom.xml index 88e2b1955..66ec6a427 100644 --- a/prometheus-metrics-exposition-formats/pom.xml +++ b/prometheus-metrics-exposition-formats/pom.xml @@ -50,8 +50,8 @@ io.prometheus prometheus-metrics-shaded-protobuf - 1.2.1 - + + ${project.version} diff --git a/prometheus-metrics-instrumentation-dropwizard5/pom.xml b/prometheus-metrics-instrumentation-dropwizard5/pom.xml index 92fc3de4c..40d04d516 100644 --- a/prometheus-metrics-instrumentation-dropwizard5/pom.xml +++ b/prometheus-metrics-instrumentation-dropwizard5/pom.xml @@ -70,7 +70,7 @@ org.mockito mockito-core - 5.11.0 + 5.12.0 test diff --git a/prometheus-metrics-instrumentation-jvm/pom.xml b/prometheus-metrics-instrumentation-jvm/pom.xml index 2b0208e5a..0e42c50c5 100644 --- a/prometheus-metrics-instrumentation-jvm/pom.xml +++ b/prometheus-metrics-instrumentation-jvm/pom.xml @@ -58,7 +58,7 @@ org.mockito mockito-core - 5.11.0 + 5.12.0 test diff --git a/prometheus-metrics-shaded-dependencies/prometheus-metrics-shaded-opentelemetry/pom.xml b/prometheus-metrics-shaded-dependencies/prometheus-metrics-shaded-opentelemetry/pom.xml index e613da510..e48a18808 100644 --- a/prometheus-metrics-shaded-dependencies/prometheus-metrics-shaded-opentelemetry/pom.xml +++ b/prometheus-metrics-shaded-dependencies/prometheus-metrics-shaded-opentelemetry/pom.xml @@ -16,8 +16,8 @@ - 1.36.0 - 1_36_0 + 1.38.0 + 1_38_0 diff --git a/prometheus-metrics-tracer/pom.xml b/prometheus-metrics-tracer/pom.xml index 5a547bfce..0e08aae71 100644 --- a/prometheus-metrics-tracer/pom.xml +++ b/prometheus-metrics-tracer/pom.xml @@ -37,7 +37,7 @@ io.opentelemetry opentelemetry-api - 1.36.0 + 1.38.0