Skip to content

Commit 4449284

Browse files
rmfitzpatrickrmfitzpatrick
authored
Adopt Otel 0.10.0 (#20)
* Adopt OTel 0.10.0 * jmx: Replace InMemoryMetricExporter path from testing dep * jmx: adopt 0.10.0 api/sdk changes
1 parent 3de4216 commit 4449284

File tree

9 files changed

+97
-160
lines changed

9 files changed

+97
-160
lines changed

‎contrib/jmx-metrics/jmx-metrics.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ dependencies {
4848
libraries.otelExporterLogging,
4949
libraries.otelExporterOtlp,
5050
libraries.otelExporterPrometheus,
51-
libraries.otelExporterInMemory,
5251
libraries.otelSdk,
52+
libraries.otelSdkTesting,
5353
deps.slf4j,
5454
dependencies.create(group: 'org.slf4j', name: 'slf4j-simple', version: versions.slf4j)
5555

‎contrib/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/InstrumentHelper.groovy‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
package io.opentelemetry.contrib.jmxmetrics
1818

19-
import io.opentelemetry.metrics.DoubleCounter
20-
import io.opentelemetry.metrics.DoubleSumObserver
21-
import io.opentelemetry.metrics.DoubleUpDownCounter
22-
import io.opentelemetry.metrics.DoubleUpDownSumObserver
23-
import io.opentelemetry.metrics.DoubleValueObserver
24-
import io.opentelemetry.metrics.LongCounter
25-
import io.opentelemetry.metrics.LongSumObserver
26-
import io.opentelemetry.metrics.LongUpDownCounter
27-
import io.opentelemetry.metrics.LongUpDownSumObserver
28-
import io.opentelemetry.metrics.LongValueObserver
19+
import io.opentelemetry.api.metrics.DoubleCounter
20+
import io.opentelemetry.api.metrics.DoubleSumObserver
21+
import io.opentelemetry.api.metrics.DoubleUpDownCounter
22+
import io.opentelemetry.api.metrics.DoubleUpDownSumObserver
23+
import io.opentelemetry.api.metrics.DoubleValueObserver
24+
import io.opentelemetry.api.metrics.LongCounter
25+
import io.opentelemetry.api.metrics.LongSumObserver
26+
import io.opentelemetry.api.metrics.LongUpDownCounter
27+
import io.opentelemetry.api.metrics.LongUpDownSumObserver
28+
import io.opentelemetry.api.metrics.LongValueObserver
2929

3030
import java.util.logging.Logger
3131
import javax.management.openmbean.CompositeData
@@ -63,7 +63,7 @@ class InstrumentHelper {
6363
private final Closure instrument
6464

6565
/**
66-
* An InstrumentHelper provides the ability to easily create and update {@link io.opentelemetry.metrics.Instrument}
66+
* An InstrumentHelper provides the ability to easily create and update {@link io.opentelemetry.api.metrics.Instrument}
6767
* instances from an MBeanHelper's underlying {@link GroovyMBean} instances via an {@link OtelHelper}'s instrument
6868
* method pointer.
6969
*
@@ -75,7 +75,7 @@ class InstrumentHelper {
7575
* {@link GroovyMBean}-provided Closures: (e.g. [ "myLabelName" : { mbean -> "myLabelValue"} ]). The
7676
* resulting Label instances will be used for each individual update.
7777
* @param attribute - The {@link GroovyMBean} attribute for which to use as the instrument value.
78-
* @param instrument - The {@link io.opentelemetry.metrics.Instrument}-producing {@link OtelHelper} method pointer:
78+
* @param instrument - The {@link io.opentelemetry.api.metrics.Instrument}-producing {@link OtelHelper} method pointer:
7979
* (e.g. new OtelHelper().&doubleValueRecorder)
8080
*/
8181
InstrumentHelper(MBeanHelper mBeanHelper, String instrumentName, String description, String unit, Map<String, Closure> labelFuncs, String attribute, Closure instrument) {

‎contrib/jmx-metrics/src/main/groovy/io/opentelemetry/contrib/jmxmetrics/OtelHelper.groovy‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616

1717
package io.opentelemetry.contrib.jmxmetrics
1818

19-
import io.opentelemetry.metrics.DoubleCounter
20-
import io.opentelemetry.metrics.DoubleSumObserver
21-
import io.opentelemetry.metrics.DoubleUpDownCounter
22-
import io.opentelemetry.metrics.DoubleUpDownSumObserver
23-
import io.opentelemetry.metrics.DoubleValueObserver
24-
import io.opentelemetry.metrics.DoubleValueRecorder
25-
import io.opentelemetry.metrics.LongCounter
26-
import io.opentelemetry.metrics.LongSumObserver
27-
import io.opentelemetry.metrics.LongUpDownCounter
28-
import io.opentelemetry.metrics.LongUpDownSumObserver
29-
import io.opentelemetry.metrics.LongValueObserver
30-
import io.opentelemetry.metrics.LongValueRecorder
19+
import io.opentelemetry.api.metrics.DoubleCounter
20+
import io.opentelemetry.api.metrics.DoubleSumObserver
21+
import io.opentelemetry.api.metrics.DoubleUpDownCounter
22+
import io.opentelemetry.api.metrics.DoubleUpDownSumObserver
23+
import io.opentelemetry.api.metrics.DoubleValueObserver
24+
import io.opentelemetry.api.metrics.DoubleValueRecorder
25+
import io.opentelemetry.api.metrics.LongCounter
26+
import io.opentelemetry.api.metrics.LongSumObserver
27+
import io.opentelemetry.api.metrics.LongUpDownCounter
28+
import io.opentelemetry.api.metrics.LongUpDownSumObserver
29+
import io.opentelemetry.api.metrics.LongValueObserver
30+
import io.opentelemetry.api.metrics.LongValueRecorder
3131

3232
import javax.management.ObjectName
3333

‎contrib/jmx-metrics/src/main/java/io/opentelemetry/contrib/jmxmetrics/GroovyMetricEnvironment.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@
1616

1717
package io.opentelemetry.contrib.jmxmetrics;
1818

19-
import io.opentelemetry.OpenTelemetry;
20-
import io.opentelemetry.common.Labels;
21-
import io.opentelemetry.exporters.inmemory.InMemoryMetricExporter;
22-
import io.opentelemetry.exporters.logging.LoggingMetricExporter;
23-
import io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter;
24-
import io.opentelemetry.exporters.prometheus.PrometheusCollector;
25-
import io.opentelemetry.metrics.DoubleCounter;
26-
import io.opentelemetry.metrics.DoubleSumObserver;
27-
import io.opentelemetry.metrics.DoubleUpDownCounter;
28-
import io.opentelemetry.metrics.DoubleUpDownSumObserver;
29-
import io.opentelemetry.metrics.DoubleValueObserver;
30-
import io.opentelemetry.metrics.DoubleValueRecorder;
31-
import io.opentelemetry.metrics.LongCounter;
32-
import io.opentelemetry.metrics.LongSumObserver;
33-
import io.opentelemetry.metrics.LongUpDownCounter;
34-
import io.opentelemetry.metrics.LongUpDownSumObserver;
35-
import io.opentelemetry.metrics.LongValueObserver;
36-
import io.opentelemetry.metrics.LongValueRecorder;
37-
import io.opentelemetry.metrics.Meter;
19+
import io.opentelemetry.api.OpenTelemetry;
20+
import io.opentelemetry.api.common.Labels;
21+
import io.opentelemetry.api.metrics.DoubleCounter;
22+
import io.opentelemetry.api.metrics.DoubleSumObserver;
23+
import io.opentelemetry.api.metrics.DoubleUpDownCounter;
24+
import io.opentelemetry.api.metrics.DoubleUpDownSumObserver;
25+
import io.opentelemetry.api.metrics.DoubleValueObserver;
26+
import io.opentelemetry.api.metrics.DoubleValueRecorder;
27+
import io.opentelemetry.api.metrics.LongCounter;
28+
import io.opentelemetry.api.metrics.LongSumObserver;
29+
import io.opentelemetry.api.metrics.LongUpDownCounter;
30+
import io.opentelemetry.api.metrics.LongUpDownSumObserver;
31+
import io.opentelemetry.api.metrics.LongValueObserver;
32+
import io.opentelemetry.api.metrics.LongValueRecorder;
33+
import io.opentelemetry.api.metrics.Meter;
34+
import io.opentelemetry.exporter.logging.LoggingMetricExporter;
35+
import io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter;
36+
import io.opentelemetry.exporter.prometheus.PrometheusCollector;
3837
import io.opentelemetry.sdk.OpenTelemetrySdk;
3938
import io.opentelemetry.sdk.metrics.data.MetricData;
4039
import io.opentelemetry.sdk.metrics.export.MetricExporter;
4140
import io.opentelemetry.sdk.metrics.export.MetricProducer;
41+
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricExporter;
4242
import io.prometheus.client.exporter.HTTPServer;
4343
import java.io.IOException;
4444
import java.util.Collection;
@@ -62,11 +62,11 @@ public GroovyMetricEnvironment(
6262
final JmxConfig config,
6363
final String instrumentationName,
6464
final String instrumentationVersion) {
65-
meter = OpenTelemetry.getMeter(instrumentationName, instrumentationVersion);
65+
meter = OpenTelemetry.getGlobalMeter(instrumentationName, instrumentationVersion);
6666

6767
switch (config.exporterType.toLowerCase()) {
6868
case "otlp":
69-
exporter = OtlpGrpcMetricExporter.newBuilder().readProperties(config.properties).build();
69+
exporter = OtlpGrpcMetricExporter.builder().readProperties(config.properties).build();
7070
break;
7171
case "prometheus":
7272
configurePrometheus(config);
@@ -90,11 +90,11 @@ public GroovyMetricEnvironment(final JmxConfig config) {
9090
}
9191

9292
private static MetricProducer getMetricProducer() {
93-
return OpenTelemetrySdk.getMeterProvider().getMetricProducer();
93+
return OpenTelemetrySdk.getGlobalMeterProvider().getMetricProducer();
9494
}
9595

9696
private void configurePrometheus(final JmxConfig config) {
97-
PrometheusCollector.newBuilder().setMetricProducer(getMetricProducer()).buildAndRegister();
97+
PrometheusCollector.builder().setMetricProducer(getMetricProducer()).buildAndRegister();
9898
try {
9999
prometheusServer =
100100
new HTTPServer(config.prometheusExporterHost, config.prometheusExporterPort);
@@ -121,7 +121,7 @@ protected static Labels mapToLabels(final Map<String, String> labelMap) {
121121
Labels.Builder labels = new Labels.Builder();
122122
if (labelMap != null) {
123123
for (Map.Entry<String, String> kv : labelMap.entrySet()) {
124-
labels.setLabel(kv.getKey(), kv.getValue());
124+
labels.put(kv.getKey(), kv.getValue());
125125
}
126126
}
127127
return labels.build();

‎contrib/jmx-metrics/src/test/groovy/io/opentelemetry/contrib/jmxmetrics/InstrumentHelperTest.groovy‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616

1717
package io.opentelemetry.contrib.jmxmetrics
1818

19+
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.GAUGE_DOUBLE
20+
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.GAUGE_LONG
1921
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.MONOTONIC_DOUBLE
2022
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.MONOTONIC_LONG
2123
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.NON_MONOTONIC_DOUBLE
2224
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.NON_MONOTONIC_LONG
2325
import static io.opentelemetry.sdk.metrics.data.MetricData.Type.SUMMARY
2426
import static java.lang.management.ManagementFactory.getPlatformMBeanServer
2527

26-
import io.opentelemetry.common.Labels
28+
import io.opentelemetry.api.common.Labels
2729
import io.opentelemetry.sdk.OpenTelemetrySdk
2830
import javax.management.MBeanServer
2931
import javax.management.ObjectName
@@ -95,7 +97,7 @@ class InstrumentHelperTest extends Specification {
9597
}
9698

9799
def exportMetrics() {
98-
def provider = OpenTelemetrySdk.meterProvider.get(name.methodName, '')
100+
def provider = OpenTelemetrySdk.globalMeterProvider.get(name.methodName, '')
99101
return provider.collectAll().sort { md1, md2 ->
100102
def p1 = md1.points[0]
101103
def p2 = md2.points[0]
@@ -182,9 +184,9 @@ class InstrumentHelperTest extends Specification {
182184
false | "multiple" | "Long" | "longSumObserver" | MONOTONIC_LONG | 234
183185
true | "single" | "Long" | "longUpDownSumObserver" | NON_MONOTONIC_LONG | 234
184186
false | "multiple" | "Long" | "longUpDownSumObserver" | NON_MONOTONIC_LONG | 234
185-
true | "single" | "Double" | "doubleValueObserver" | SUMMARY | 123.456
186-
false | "multiple" | "Double" | "doubleValueObserver" | SUMMARY | 123.456
187-
true | "single" | "Long" | "longValueObserver" | SUMMARY | 234
188-
false | "multiple" | "Long" | "longValueObserver" | SUMMARY | 234
187+
true | "single" | "Double" | "doubleValueObserver" | GAUGE_DOUBLE | 123.456
188+
false | "multiple" | "Double" | "doubleValueObserver" | GAUGE_DOUBLE | 123.456
189+
true | "single" | "Long" | "longValueObserver" | GAUGE_LONG | 234
190+
false | "multiple" | "Long" | "longValueObserver" | GAUGE_LONG | 234
189191
}
190192
}

0 commit comments

Comments
 (0)