Skip to content

Commit 8626bff

Browse files
committed
profiles: refactor to separate sdk and exporter
1 parent 491dfff commit 8626bff

60 files changed

Lines changed: 185 additions & 130 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

exporters/otlp/profiles/build.gradle.kts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,23 @@ plugins {
33
// TODO (jack-berg): uncomment when ready to publish
44
// id("otel.publish-conventions")
55

6-
// animalsniffer is disabled on this module to allow use of the JFR API.
7-
// id("otel.animalsniffer-conventions")
6+
id("otel.animalsniffer-conventions")
87
}
98

109
description = "OpenTelemetry - Profiles Exporter"
1110
otelJava.moduleName.set("io.opentelemetry.exporter.otlp.profiles")
1211

1312
val versions: Map<String, String> by project
1413

15-
tasks {
16-
// this module uses the jdk.jfr.consumer API, which was backported into 1.8 but is '@since 9'
17-
// and therefore a bit of a pain to get gradle to compile against...
18-
compileJava {
19-
sourceCompatibility = "1.8"
20-
targetCompatibility = "1.8"
21-
options.release.set(null as Int?)
22-
}
23-
compileTestJava {
24-
sourceCompatibility = "1.8"
25-
targetCompatibility = "1.8"
26-
options.release.set(null as Int?)
27-
}
28-
}
29-
3014
dependencies {
15+
api(project(":opentelemetry-sdk-profiles"))
3116
api(project(":sdk:common"))
3217
api(project(":exporters:common"))
3318
implementation(project(":exporters:otlp:common"))
3419

3520
implementation(project(":exporters:otlp:all"))
3621
compileOnly("io.grpc:grpc-stub")
3722

38-
annotationProcessor("com.google.auto.value:auto-value")
39-
4023
testCompileOnly("com.google.guava:guava")
4124
testImplementation("com.fasterxml.jackson.core:jackson-databind")
4225
testImplementation("com.google.protobuf:protobuf-java-util")

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/FunctionMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
1010
import io.opentelemetry.exporter.internal.marshal.Serializer;
1111
import io.opentelemetry.proto.profiles.v1development.internal.Function;
12+
import io.opentelemetry.sdk.profiles.FunctionData;
1213
import java.io.IOException;
1314
import java.util.List;
1415
import java.util.function.Consumer;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/KeyValueAndUnitMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.exporter.internal.marshal.Serializer;
1212
import io.opentelemetry.exporter.internal.otlp.AnyValueMarshaler;
1313
import io.opentelemetry.proto.profiles.v1development.internal.KeyValueAndUnit;
14+
import io.opentelemetry.sdk.profiles.KeyValueAndUnitData;
1415
import java.io.IOException;
1516
import java.util.List;
1617
import java.util.function.Consumer;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/LineMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
1010
import io.opentelemetry.exporter.internal.marshal.Serializer;
1111
import io.opentelemetry.proto.profiles.v1development.internal.Line;
12+
import io.opentelemetry.sdk.profiles.LineData;
1213
import java.io.IOException;
1314
import java.util.List;
1415
import java.util.function.Consumer;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/LinkMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
1313
import io.opentelemetry.exporter.internal.marshal.Serializer;
1414
import io.opentelemetry.proto.profiles.v1development.internal.Link;
15+
import io.opentelemetry.sdk.profiles.LinkData;
1516
import java.io.IOException;
1617
import java.util.List;
1718
import java.util.function.Consumer;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/LocationMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
1010
import io.opentelemetry.exporter.internal.marshal.Serializer;
1111
import io.opentelemetry.proto.profiles.v1development.internal.Location;
12+
import io.opentelemetry.sdk.profiles.LocationData;
1213
import java.io.IOException;
1314
import java.util.List;
1415
import java.util.function.Consumer;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/MappingMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
1010
import io.opentelemetry.exporter.internal.marshal.Serializer;
1111
import io.opentelemetry.proto.profiles.v1development.internal.Mapping;
12+
import io.opentelemetry.sdk.profiles.MappingData;
1213
import java.io.IOException;
1314
import java.util.List;
1415
import java.util.function.Consumer;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/NoopProfileExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package io.opentelemetry.exporter.otlp.profiles;
77

88
import io.opentelemetry.sdk.common.CompletableResultCode;
9+
import io.opentelemetry.sdk.profiles.ProfileData;
10+
import io.opentelemetry.sdk.profiles.ProfileExporter;
911
import java.util.Collection;
1012

1113
final class NoopProfileExporter implements ProfileExporter {

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfileExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import io.opentelemetry.exporter.internal.grpc.GrpcExporter;
99
import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder;
1010
import io.opentelemetry.sdk.common.CompletableResultCode;
11+
import io.opentelemetry.sdk.profiles.ProfileData;
12+
import io.opentelemetry.sdk.profiles.ProfileExporter;
1113
import java.util.Collection;
1214
import java.util.StringJoiner;
1315
import javax.annotation.concurrent.ThreadSafe;

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/ProfileMarshaler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
1010
import io.opentelemetry.exporter.internal.marshal.Serializer;
1111
import io.opentelemetry.proto.profiles.v1development.internal.Profile;
12+
import io.opentelemetry.sdk.profiles.ProfileData;
1213
import java.io.IOException;
1314
import java.nio.ByteBuffer;
1415
import java.util.List;

0 commit comments

Comments
 (0)