Skip to content

Commit 2924094

Browse files
fstabfstab
committed
Bump shaded dependency versions
Signed-off-by: Fabian Stäber <[email protected]>
1 parent 200be28 commit 2924094

File tree

35 files changed

+2787
-2062
lines changed

35 files changed

+2787
-2062
lines changed

‎integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.prometheus.client.it.common.LogConsumer;
44
import io.prometheus.client.it.common.Volume;
5-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_21_7.Metrics;
5+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
66
import org.apache.commons.io.IOUtils;
77
import org.junit.After;
88
import org.junit.Assert;

‎prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.prometheus.metrics.core.metrics;
22

3-
import io.prometheus.metrics.shaded.com_google_protobuf_3_21_7.TextFormat;
3+
import io.prometheus.metrics.shaded.com_google_protobuf_3_25_3.TextFormat;
44
import io.prometheus.metrics.expositionformats.PrometheusProtobufWriter;
5-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_21_7.Metrics;
5+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
66
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
77
import io.prometheus.metrics.tracer.common.SpanContext;
88
import io.prometheus.metrics.tracer.initializer.SpanContextSupplier;

‎prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.prometheus.metrics.core.metrics;
22

3-
import io.prometheus.metrics.shaded.com_google_protobuf_3_21_7.TextFormat;
3+
import io.prometheus.metrics.shaded.com_google_protobuf_3_25_3.TextFormat;
44
import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
55
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
66
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
77
import io.prometheus.metrics.expositionformats.PrometheusProtobufWriter;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_21_7.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
99
import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;
1010
import io.prometheus.metrics.model.snapshots.Exemplar;
1111
import io.prometheus.metrics.model.snapshots.Exemplars;

‎prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
44
import io.prometheus.metrics.model.snapshots.Labels;
55
import io.prometheus.metrics.model.snapshots.MetricSnapshots;
6-
import io.prometheus.metrics.shaded.com_google_protobuf_3_21_7.TextFormat;
6+
import io.prometheus.metrics.shaded.com_google_protobuf_3_25_3.TextFormat;
77
import io.prometheus.metrics.expositionformats.PrometheusProtobufWriter;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_21_7.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_3_25_3.Metrics;
99
import org.junit.Assert;
1010
import org.junit.Test;
1111

‎prometheus-metrics-exporter-opentelemetry/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<dependency>
4747
<groupId>io.prometheus</groupId>
4848
<artifactId>prometheus-metrics-shaded-opentelemetry</artifactId>
49-
<version>1.1.0</version>
49+
<version>${project.version}</version>
50+
<!-- <version>1.1.0</version> -->
5051
</dependency>
5152

5253
<!-- test dependencies -->

‎prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import io.prometheus.metrics.config.ExporterOpenTelemetryProperties;
44
import io.prometheus.metrics.config.PrometheusProperties;
55
import io.prometheus.metrics.model.registry.PrometheusRegistry;
6-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
7-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder;
8-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.exporter.otlp.metrics.OtlpGrpcMetricExporter;
9-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
10-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.common.InstrumentationScopeInfo;
11-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.export.MetricExporter;
12-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.export.PeriodicMetricReader;
13-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.resources.Resource;
14-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.resources.ResourceBuilder;
6+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
7+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder;
8+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.metrics.OtlpGrpcMetricExporter;
9+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
10+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo;
11+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.export.MetricExporter;
12+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.export.PeriodicMetricReader;
13+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.Resource;
14+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.ResourceBuilder;
1515

1616
import java.time.Duration;
1717
import java.util.HashMap;

‎prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.prometheus.metrics.exporter.opentelemetry;
22

3-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.common.InstrumentationScopeInfo;
3+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo;
44

55
import java.util.Properties;
66

‎prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
1313
import io.prometheus.metrics.model.snapshots.SummarySnapshot;
1414
import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
15-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.api.common.Attributes;
16-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.api.common.AttributesBuilder;
17-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.common.InstrumentationScopeInfo;
18-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.MetricData;
19-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.export.CollectionRegistration;
20-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.resources.Resource;
21-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.resources.ResourceBuilder;
15+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes;
16+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.AttributesBuilder;
17+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.common.InstrumentationScopeInfo;
18+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.MetricData;
19+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.export.CollectionRegistration;
20+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.Resource;
21+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.resources.ResourceBuilder;
2222

2323
import java.util.ArrayList;
2424
import java.util.Collection;

‎prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/DoublePointDataImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.prometheus.metrics.exporter.opentelemetry.otelmodel;
22

3-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.api.common.Attributes;
4-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.DoubleExemplarData;
5-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.DoublePointData;
3+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.api.common.Attributes;
4+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoubleExemplarData;
5+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.DoublePointData;
66

77
import java.util.List;
88

‎prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramBucketsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.prometheus.metrics.exporter.opentelemetry.otelmodel;
22

3-
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.ExponentialHistogramBuckets;
3+
import io.prometheus.metrics.shaded.io_opentelemetry_1_36_0.sdk.metrics.data.ExponentialHistogramBuckets;
44

55
import java.util.ArrayList;
66
import java.util.List;

0 commit comments

Comments
 (0)