Skip to content

Commit 2e9dda5

Browse files
authored
Fix pprofile timestamp unix nano to be a fixed64 (#13825)
This was missed in my previous PR. The `timestamp_unix_nano` field has changed to be a fixed rather than uint. See https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/profiles/v1development/profiles.proto#L257
1 parent 3089704 commit 2e9dda5

File tree

5 files changed

+18
-22
lines changed

5 files changed

+18
-22
lines changed

.chloggen/profiles-otlp-1-8-0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ component: pdata/pprofile
1010
note: Upgrade the OTLP protobuf definitions to version 1.8.0
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [13758]
13+
issues: [13758, 13825]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.

internal/cmd/pdatagen/internal/pdata/pprofile_package.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,7 @@ var profile = &messageStruct{
232232
fieldName: "Time",
233233
originFieldName: "TimeUnixNano",
234234
protoID: 3,
235-
returnType: &TypedType{
236-
structName: "Timestamp",
237-
packageName: "pcommon",
238-
protoType: proto.TypeUint64,
239-
defaultVal: "0",
240-
testVal: "1234567890",
241-
},
235+
returnType: timestampType,
242236
},
243237
&TypedField{
244238
fieldName: "Duration",

pdata/internal/generated_wrapper_profile.go

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pdata/internal/generated_wrapper_profile_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

service/internal/graph/obs_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ func TestComponentInstrumentation(t *testing.T) {
548548
"otelcol.receiver.produced.size": simpleMetric{
549549
attribute.NewSet(
550550
attribute.String(obsconsumer.ComponentOutcome, "success"),
551-
): 1271,
551+
): 1254,
552552
},
553553
},
554554
attribute.NewSet(
@@ -570,12 +570,12 @@ func TestComponentInstrumentation(t *testing.T) {
570570
"otelcol.processor.consumed.size": simpleMetric{
571571
attribute.NewSet(
572572
attribute.String(obsconsumer.ComponentOutcome, "success"),
573-
): 1271,
573+
): 1254,
574574
},
575575
"otelcol.processor.produced.size": simpleMetric{
576576
attribute.NewSet(
577577
attribute.String(obsconsumer.ComponentOutcome, "success"),
578-
): 1271,
578+
): 1254,
579579
},
580580
},
581581
attribute.NewSet(
@@ -602,17 +602,17 @@ func TestComponentInstrumentation(t *testing.T) {
602602
"otelcol.connector.consumed.size": simpleMetric{
603603
attribute.NewSet(
604604
attribute.String(obsconsumer.ComponentOutcome, "success"),
605-
): 1271,
605+
): 1254,
606606
},
607607
"otelcol.connector.produced.size": simpleMetric{
608608
attribute.NewSet(
609609
attribute.String(obsconsumer.ComponentOutcome, "success"),
610610
attribute.String("otelcol.pipeline.id", "profiles/right"),
611-
): 668,
611+
): 659,
612612
attribute.NewSet(
613613
attribute.String(obsconsumer.ComponentOutcome, "success"),
614614
attribute.String("otelcol.pipeline.id", "profiles/left"),
615-
): 603,
615+
): 595,
616616
},
617617
},
618618
attribute.NewSet(
@@ -628,7 +628,7 @@ func TestComponentInstrumentation(t *testing.T) {
628628
"otelcol.exporter.consumed.size": simpleMetric{
629629
attribute.NewSet(
630630
attribute.String(obsconsumer.ComponentOutcome, "success"),
631-
): 668,
631+
): 659,
632632
},
633633
},
634634
attribute.NewSet(
@@ -644,7 +644,7 @@ func TestComponentInstrumentation(t *testing.T) {
644644
"otelcol.exporter.consumed.size": simpleMetric{
645645
attribute.NewSet(
646646
attribute.String(obsconsumer.ComponentOutcome, "success"),
647-
): 603,
647+
): 595,
648648
},
649649
},
650650
}

0 commit comments

Comments
 (0)