Merge branch 'main' into 14311

Author: iblancasa

.github/workflows/stale-pr.yaml

@@ -7,6 +7,7 @@ permissions: read-all
 
 jobs:
   stale:
+    if: ${{ false }} # Stale action paused for the holidays
     permissions:
       issues: write # for actions/stale to close stale issues
       pull-requests: write # for actions/stale to close stale PRs

pdata/testdata/profile.go

@@ -50,12 +50,13 @@ func fillProfileOne(dic pprofile.ProfilesDictionary, profile pprofile.Profile) {
 
 	loc := pprofile.NewLocation()
 	loc.SetAddress(1)
-	id, _ := pprofile.SetLocation(dic.LocationTable(), loc)
-	stack := dic.StackTable().AppendEmpty()
-	stack.LocationIndices().Append(id)
+	locID, _ := pprofile.SetLocation(dic.LocationTable(), loc)
+	stack := pprofile.NewStack()
+	stack.LocationIndices().Append(locID)
+	stackID, _ := pprofile.SetStack(dic.StackTable(), stack)
 
 	sample := profile.Samples().AppendEmpty()
-	sample.SetStackIndex(1)
+	sample.SetStackIndex(stackID)
 	sample.Values().Append(4)
 	sample.AttributeIndices().Append(0)
 }
@@ -67,12 +68,13 @@ func fillProfileTwo(dic pprofile.ProfilesDictionary, profile pprofile.Profile) {
 
 	loc := pprofile.NewLocation()
 	loc.SetAddress(2)
-	id, _ := pprofile.SetLocation(dic.LocationTable(), loc)
-	stack := dic.StackTable().AppendEmpty()
-	stack.LocationIndices().Append(id)
+	locID, _ := pprofile.SetLocation(dic.LocationTable(), loc)
+	stack := pprofile.NewStack()
+	stack.LocationIndices().Append(locID)
+	stackID, _ := pprofile.SetStack(dic.StackTable(), stack)
 
 	sample := profile.Samples().AppendEmpty()
-	sample.SetStackIndex(1)
+	sample.SetStackIndex(stackID)
 	sample.Values().Append(9)
 	sample.AttributeIndices().Append(0)
 }

service/internal/graph/obs_test.go

@@ -548,7 +548,7 @@ func TestComponentInstrumentation(t *testing.T) {
 			"otelcol.receiver.produced.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
-				): 1118,
+				): 1035,
 			},
 		},
 		attribute.NewSet(
@@ -570,12 +570,12 @@ func TestComponentInstrumentation(t *testing.T) {
 			"otelcol.processor.consumed.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
-				): 1118,
+				): 1035,
 			},
 			"otelcol.processor.produced.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
-				): 1118,
+				): 1035,
 			},
 		},
 		attribute.NewSet(
@@ -602,17 +602,17 @@ func TestComponentInstrumentation(t *testing.T) {
 			"otelcol.connector.consumed.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
-				): 1118,
+				): 1035,
 			},
 			"otelcol.connector.produced.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
 					attribute.String("otelcol.pipeline.id", "profiles/right"),
-				): 587,
+				): 542,
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
 					attribute.String("otelcol.pipeline.id", "profiles/left"),
-				): 531,
+				): 493,
 			},
 		},
 		attribute.NewSet(
@@ -628,7 +628,7 @@ func TestComponentInstrumentation(t *testing.T) {
 			"otelcol.exporter.consumed.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
-				): 587,
+				): 542,
 			},
 		},
 		attribute.NewSet(
@@ -644,7 +644,7 @@ func TestComponentInstrumentation(t *testing.T) {
 			"otelcol.exporter.consumed.size": simpleMetric{
 				attribute.NewSet(
 					attribute.String(obsconsumer.ComponentOutcome, "success"),
-				): 531,
+				): 493,
 			},
 		},
 	}