Skip to content

Commit 7b1a530

Browse files
bogdandrutubogdandrutu
committed
Move internal/otlp to model/otlp
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
1 parent 75ebb88 commit 7b1a530

File tree

17 files changed

+58
-58
lines changed

17 files changed

+58
-58
lines changed

‎exporter/fileexporter/file_exporter.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222

2323
"go.opentelemetry.io/collector/component"
2424
"go.opentelemetry.io/collector/consumer"
25-
"go.opentelemetry.io/collector/internal/otlp"
25+
otlp2 "go.opentelemetry.io/collector/model/otlp"
2626
"go.opentelemetry.io/collector/model/pdata"
2727
)
2828

2929
// Marshaler configuration used for marhsaling Protobuf to JSON.
30-
var tracesMarshaler = otlp.NewJSONTracesMarshaler()
31-
var metricsMarshaler = otlp.NewJSONMetricsMarshaler()
32-
var logsMarshaler = otlp.NewJSONLogsMarshaler()
30+
var tracesMarshaler = otlp2.NewJSONTracesMarshaler()
31+
var metricsMarshaler = otlp2.NewJSONMetricsMarshaler()
32+
var logsMarshaler = otlp2.NewJSONLogsMarshaler()
3333

3434
// fileExporter is the implementation of file exporter that writes telemetry data to a file
3535
// in Protobuf-JSON format.

‎exporter/fileexporter/file_exporter_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/stretchr/testify/require"
2525

2626
"go.opentelemetry.io/collector/component/componenttest"
27-
"go.opentelemetry.io/collector/internal/otlp"
2827
"go.opentelemetry.io/collector/internal/testdata"
28+
otlp2 "go.opentelemetry.io/collector/model/otlp"
2929
)
3030

3131
func TestFileTracesExporter(t *testing.T) {
@@ -37,7 +37,7 @@ func TestFileTracesExporter(t *testing.T) {
3737
assert.NoError(t, fe.ConsumeTraces(context.Background(), td))
3838
assert.NoError(t, fe.Shutdown(context.Background()))
3939

40-
unmarshaler := otlp.NewJSONTracesUnmarshaler()
40+
unmarshaler := otlp2.NewJSONTracesUnmarshaler()
4141
buf, err := ioutil.ReadFile(fe.path)
4242
assert.NoError(t, err)
4343
got, err := unmarshaler.UnmarshalTraces(buf)
@@ -65,7 +65,7 @@ func TestFileMetricsExporter(t *testing.T) {
6565
assert.NoError(t, fe.ConsumeMetrics(context.Background(), md))
6666
assert.NoError(t, fe.Shutdown(context.Background()))
6767

68-
unmarshaler := otlp.NewJSONMetricsUnmarshaler()
68+
unmarshaler := otlp2.NewJSONMetricsUnmarshaler()
6969
buf, err := ioutil.ReadFile(fe.path)
7070
assert.NoError(t, err)
7171
got, err := unmarshaler.UnmarshalMetrics(buf)
@@ -93,7 +93,7 @@ func TestFileLogsExporter(t *testing.T) {
9393
assert.NoError(t, fe.ConsumeLogs(context.Background(), ld))
9494
assert.NoError(t, fe.Shutdown(context.Background()))
9595

96-
unmarshaler := otlp.NewJSONLogsUnmarshaler()
96+
unmarshaler := otlp2.NewJSONLogsUnmarshaler()
9797
buf, err := ioutil.ReadFile(fe.path)
9898
assert.NoError(t, err)
9999
got, err := unmarshaler.UnmarshalLogs(buf)

‎exporter/kafkaexporter/kafka_exporter_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727

2828
"go.opentelemetry.io/collector/component/componenttest"
2929
"go.opentelemetry.io/collector/config/configtls"
30-
"go.opentelemetry.io/collector/internal/otlp"
3130
"go.opentelemetry.io/collector/internal/testdata"
31+
otlp2 "go.opentelemetry.io/collector/model/otlp"
3232
"go.opentelemetry.io/collector/model/pdata"
3333
)
3434

@@ -125,7 +125,7 @@ func TestTracesPusher(t *testing.T) {
125125

126126
p := kafkaTracesProducer{
127127
producer: producer,
128-
marshaler: newPdataTracesMarshaler(otlp.NewProtobufTracesMarshaler(), defaultEncoding),
128+
marshaler: newPdataTracesMarshaler(otlp2.NewProtobufTracesMarshaler(), defaultEncoding),
129129
}
130130
t.Cleanup(func() {
131131
require.NoError(t, p.Close(context.Background()))
@@ -142,7 +142,7 @@ func TestTracesPusher_err(t *testing.T) {
142142

143143
p := kafkaTracesProducer{
144144
producer: producer,
145-
marshaler: newPdataTracesMarshaler(otlp.NewProtobufTracesMarshaler(), defaultEncoding),
145+
marshaler: newPdataTracesMarshaler(otlp2.NewProtobufTracesMarshaler(), defaultEncoding),
146146
logger: zap.NewNop(),
147147
}
148148
t.Cleanup(func() {
@@ -172,7 +172,7 @@ func TestMetricsDataPusher(t *testing.T) {
172172

173173
p := kafkaMetricsProducer{
174174
producer: producer,
175-
marshaler: newPdataMetricsMarshaler(otlp.NewProtobufMetricsMarshaler(), defaultEncoding),
175+
marshaler: newPdataMetricsMarshaler(otlp2.NewProtobufMetricsMarshaler(), defaultEncoding),
176176
}
177177
t.Cleanup(func() {
178178
require.NoError(t, p.Close(context.Background()))
@@ -189,7 +189,7 @@ func TestMetricsDataPusher_err(t *testing.T) {
189189

190190
p := kafkaMetricsProducer{
191191
producer: producer,
192-
marshaler: newPdataMetricsMarshaler(otlp.NewProtobufMetricsMarshaler(), defaultEncoding),
192+
marshaler: newPdataMetricsMarshaler(otlp2.NewProtobufMetricsMarshaler(), defaultEncoding),
193193
logger: zap.NewNop(),
194194
}
195195
t.Cleanup(func() {
@@ -219,7 +219,7 @@ func TestLogsDataPusher(t *testing.T) {
219219

220220
p := kafkaLogsProducer{
221221
producer: producer,
222-
marshaler: newPdataLogsMarshaler(otlp.NewProtobufLogsMarshaler(), defaultEncoding),
222+
marshaler: newPdataLogsMarshaler(otlp2.NewProtobufLogsMarshaler(), defaultEncoding),
223223
}
224224
t.Cleanup(func() {
225225
require.NoError(t, p.Close(context.Background()))
@@ -236,7 +236,7 @@ func TestLogsDataPusher_err(t *testing.T) {
236236

237237
p := kafkaLogsProducer{
238238
producer: producer,
239-
marshaler: newPdataLogsMarshaler(otlp.NewProtobufLogsMarshaler(), defaultEncoding),
239+
marshaler: newPdataLogsMarshaler(otlp2.NewProtobufLogsMarshaler(), defaultEncoding),
240240
logger: zap.NewNop(),
241241
}
242242
t.Cleanup(func() {

‎exporter/kafkaexporter/marshaler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package kafkaexporter
1717
import (
1818
"github.com/Shopify/sarama"
1919

20-
"go.opentelemetry.io/collector/internal/otlp"
20+
otlp2 "go.opentelemetry.io/collector/model/otlp"
2121
"go.opentelemetry.io/collector/model/pdata"
2222
)
2323

@@ -50,7 +50,7 @@ type LogsMarshaler interface {
5050

5151
// tracesMarshalers returns map of supported encodings with TracesMarshaler.
5252
func tracesMarshalers() map[string]TracesMarshaler {
53-
otlpPb := newPdataTracesMarshaler(otlp.NewProtobufTracesMarshaler(), defaultEncoding)
53+
otlpPb := newPdataTracesMarshaler(otlp2.NewProtobufTracesMarshaler(), defaultEncoding)
5454
jaegerProto := jaegerMarshaler{marshaler: jaegerProtoSpanMarshaler{}}
5555
jaegerJSON := jaegerMarshaler{marshaler: newJaegerJSONMarshaler()}
5656
return map[string]TracesMarshaler{
@@ -62,15 +62,15 @@ func tracesMarshalers() map[string]TracesMarshaler {
6262

6363
// metricsMarshalers returns map of supported encodings and MetricsMarshaler
6464
func metricsMarshalers() map[string]MetricsMarshaler {
65-
otlpPb := newPdataMetricsMarshaler(otlp.NewProtobufMetricsMarshaler(), defaultEncoding)
65+
otlpPb := newPdataMetricsMarshaler(otlp2.NewProtobufMetricsMarshaler(), defaultEncoding)
6666
return map[string]MetricsMarshaler{
6767
otlpPb.Encoding(): otlpPb,
6868
}
6969
}
7070

7171
// logsMarshalers returns map of supported encodings and LogsMarshaler
7272
func logsMarshalers() map[string]LogsMarshaler {
73-
otlpPb := newPdataLogsMarshaler(otlp.NewProtobufLogsMarshaler(), defaultEncoding)
73+
otlpPb := newPdataLogsMarshaler(otlp2.NewProtobufLogsMarshaler(), defaultEncoding)
7474
return map[string]LogsMarshaler{
7575
otlpPb.Encoding(): otlpPb,
7676
}

‎exporter/otlphttpexporter/otlp.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"go.opentelemetry.io/collector/consumer/consumererror"
3838
"go.opentelemetry.io/collector/exporter/exporterhelper"
3939
"go.opentelemetry.io/collector/internal/middleware"
40-
"go.opentelemetry.io/collector/internal/otlp"
40+
otlp2 "go.opentelemetry.io/collector/model/otlp"
4141
"go.opentelemetry.io/collector/model/pdata"
4242
)
4343

@@ -52,9 +52,9 @@ type exporter struct {
5252
}
5353

5454
var (
55-
tracesMarshaler = otlp.NewProtobufTracesMarshaler()
56-
metricsMarshaler = otlp.NewProtobufMetricsMarshaler()
57-
logsMarshaler = otlp.NewProtobufLogsMarshaler()
55+
tracesMarshaler = otlp2.NewProtobufTracesMarshaler()
56+
metricsMarshaler = otlp2.NewProtobufMetricsMarshaler()
57+
logsMarshaler = otlp2.NewProtobufLogsMarshaler()
5858
)
5959

6060
const (

internal/otlp/json_marshaler.go renamed to model/otlp/json_marshaler.go

File renamed without changes.

internal/otlp/json_test.go renamed to model/otlp/json_test.go

File renamed without changes.

internal/otlp/json_unmarshaler.go renamed to model/otlp/json_unmarshaler.go

File renamed without changes.

internal/otlp/pb_marshaler.go renamed to model/otlp/pb_marshaler.go

File renamed without changes.

internal/otlp/pb_test.go renamed to model/otlp/pb_test.go

File renamed without changes.

0 commit comments

Comments
 (0)