Skip to content

Commit 5c9c0b0

Browse files
committed
Reuse OtelMetricStorage
1 parent 0d8ccd1 commit 5c9c0b0

29 files changed

Lines changed: 40 additions & 55 deletions

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelAggregator.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
/** Common behaviour shared across all aggregators. */
44
abstract class OtelAggregator {

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelDoublePoint.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoublePoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
public final class OtelDoublePoint extends OtelPoint {
44
public final double value;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelDoubleSum.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleSum.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
import java.util.concurrent.atomic.DoubleAdder;
44

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelDoubleValue.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelDoubleValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
final class OtelDoubleValue extends OtelAggregator {
44
private volatile double value;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelHistogramPoint.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramPoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
import java.util.List;
44

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelHistogramSketch.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelHistogramSketch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
import datadog.metrics.api.Histogram;
44
import java.util.List;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelLongPoint.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongPoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
public final class OtelLongPoint extends OtelPoint {
44
public final long value;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelLongSum.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongSum.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
import java.util.concurrent.atomic.LongAdder;
44

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelLongValue.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelLongValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

33
final class OtelLongValue extends OtelAggregator {
44
private volatile long value;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/data/OtelMetricStorage.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package datadog.opentelemetry.shim.metrics.data;
1+
package datadog.trace.bootstrap.otel.metrics.data;
22

3-
import datadog.opentelemetry.shim.metrics.export.OtelInstrumentVisitor;
43
import datadog.trace.api.Config;
54
import datadog.trace.api.config.OtlpConfig;
65
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
76
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentDescriptor;
87
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentType;
8+
import datadog.trace.bootstrap.otel.metrics.export.OtelInstrumentVisitor;
99
import datadog.trace.relocate.api.RatelimitedLogger;
1010
import io.opentelemetry.api.common.Attributes;
1111
import java.util.List;

0 commit comments

Comments
 (0)