Skip to content

Commit cb5a6d5

Browse files
fstabfstab
committed
Update OpenTelemetry version
Signed-off-by: Fabian Stäber <[email protected]>
1 parent 0f27ea1 commit cb5a6d5

23 files changed

+90
-119
lines changed

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
</description>
1818

1919
<properties>
20-
<otel.version>1.28.0</otel.version>
21-
<otel.semconv.version>${otel.version}-alpha</otel.semconv.version>
20+
<otel.version>1.31.0</otel.version>
2221
<automatic.module.name>io.prometheus.metrics.exporter.opentelemetry</automatic.module.name>
2322
</properties>
2423

@@ -49,28 +48,6 @@
4948
<artifactId>prometheus-metrics-shaded-opentelemetry</artifactId>
5049
<version>${project.version}</version>
5150
</dependency>
52-
<!--
53-
<dependency>
54-
<groupId>io.opentelemetry</groupId>
55-
<artifactId>opentelemetry-api</artifactId>
56-
<version>${otel.version}</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>io.opentelemetry</groupId>
60-
<artifactId>opentelemetry-sdk</artifactId>
61-
<version>${otel.version}</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>io.opentelemetry</groupId>
65-
<artifactId>opentelemetry-semconv</artifactId>
66-
<version>${otel.semconv.version}</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>io.opentelemetry</groupId>
70-
<artifactId>opentelemetry-exporter-otlp</artifactId>
71-
<version>${otel.version}</version>
72-
</dependency>
73-
-->
7451

7552
<!-- test dependencies -->
7653
<dependency>

‎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_28_0.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
7-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder;
8-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.exporter.otlp.metrics.OtlpGrpcMetricExporter;
9-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
10-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.common.InstrumentationScopeInfo;
11-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.export.MetricExporter;
12-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.export.PeriodicMetricReader;
13-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.resources.Resource;
14-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.resources.ResourceBuilder;
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;
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_28_0.sdk.common.InstrumentationScopeInfo;
3+
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
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_28_0.api.common.Attributes;
16-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.api.common.AttributesBuilder;
17-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.common.InstrumentationScopeInfo;
18-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.MetricData;
19-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.internal.export.MetricProducer;
20-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.resources.Resource;
21-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.resources.ResourceBuilder;
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;
2222

2323
import java.util.ArrayList;
2424
import java.util.Collection;
2525
import java.util.List;
2626

27-
class PrometheusMetricProducer implements MetricProducer {
27+
class PrometheusMetricProducer implements CollectionRegistration {
2828

2929
private final PrometheusRegistry registry;
3030
private final Resource resource;

‎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_28_0.api.common.Attributes;
4-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.DoubleExemplarData;
5-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.DoublePointData;
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;
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_28_0.sdk.metrics.data.ExponentialHistogramBuckets;
3+
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.ExponentialHistogramBuckets;
44

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

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

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

3-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.api.common.Attributes;
4-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.DoubleExemplarData;
5-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.ExponentialHistogramBuckets;
6-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.ExponentialHistogramPointData;
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.ExponentialHistogramBuckets;
6+
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.ExponentialHistogramPointData;
77

88
import java.util.List;
99

‎prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImpl.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_28_0.api.common.Attributes;
4-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.DoubleExemplarData;
5-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.HistogramPointData;
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.HistogramPointData;
66

77
import java.util.List;
88

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
88
import io.prometheus.metrics.model.snapshots.SummarySnapshot;
99
import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
10-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.common.InstrumentationScopeInfo;
11-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.MetricData;
12-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.resources.Resource;
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.data.MetricData;
12+
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.resources.Resource;
1313

1414
public class MetricDataFactory {
1515

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

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

3-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.api.common.Attributes;
4-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.DoubleExemplarData;
5-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.ExemplarData;
6-
import io.prometheus.metrics.shaded.io_opentelemetry_1_28_0.sdk.metrics.data.PointData;
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.ExemplarData;
6+
import io.prometheus.metrics.shaded.io_opentelemetry_1_31_0.sdk.metrics.data.PointData;
77

88
import java.util.List;
99

0 commit comments

Comments
 (0)