Add stored procedure columns to events

.chloggen/add-stored-procedure-columns-to-events.yaml

@@ -16,7 +16,7 @@ issues: [44656]
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
 subtext: Refined query and reported events to include stored procedure information when applicable.
-  Expanded default samples count from 200 to 250 to account for teh addition of stored procedure events.
+  Additionally, the maximum number of active queries reported by default has been increased from 200 to 250 to account for record deaggregation introduced by this change, ensuring the effective limit remains consistent with the previous 200-query baseline.
 
 # If your change doesn't affect end users or the exported elements of any package,
 # you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

.chloggen/issue-39491.yaml

@@ -0,0 +1,29 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
+component: receiver/filelog
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Suppress repeated permission-denied errors
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [39491]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  Only one error is logged per file per process run, and an informational message is emitted when the file becomes readable again.
+  This reduces log spam and improves clarity for operators.
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

.chloggen/vengal-reduce-allocs-in-routing-connector.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
+component: connector/routing
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Update existing util functions to reduce allocs.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [45061]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

.github/workflows/update-otel.yaml

@@ -23,6 +23,11 @@ jobs:
         with:
           path: opentelemetry-collector
           repository: open-telemetry/opentelemetry-collector
+      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
       - name: Prepare to update dependencies
         run: |
           exec > >(tee log.out) 2>&1
@@ -40,6 +45,8 @@ jobs:
             echo "LAST_COMMIT=$LAST_COMMIT"
             echo "BRANCH_NAME=$branch"
           } >> "$GITHUB_ENV"
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
       - name: Gets packages from links with retries
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
@@ -51,11 +58,6 @@ jobs:
             exec > >(tee -a log.out) 2>&1
             cd opentelemetry-collector-contrib
             make update-otel OTEL_STABLE_VERSION=${{ env.LAST_COMMIT }} OTEL_VERSION=${{ env.LAST_COMMIT }}
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
-        id: otelbot-token
-        with:
-          app-id: ${{ vars.OTELBOT_APP_ID }}
-          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
       - name: Push and create PR
         run: |
           exec > >(tee -a log.out) 2>&1

connector/routingconnector/internal/pdatautil/utils.go

@@ -0,0 +1,23 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package pdatautil // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pdatautil"
+
+// OnceValue to set a given value only once.
+type OnceValue[K any] struct {
+	val    K
+	isInit bool
+}
+
+func (ov *OnceValue[K]) IsInit() bool {
+	return ov.isInit
+}
+
+func (ov *OnceValue[K]) Init(val K) {
+	ov.isInit = true
+	ov.val = val
+}
+
+func (ov *OnceValue[K]) Value() K {
+	return ov.val
+}

connector/routingconnector/internal/plogutil/logs.go

@@ -5,6 +5,8 @@ package plogutil // import "github.com/open-telemetry/opentelemetry-collector-co
 
 import (
 	"go.opentelemetry.io/collector/pdata/plog"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pdatautil"
 )
 
 // MoveResourcesIf calls f sequentially for each ResourceLogs present in the first plog.Logs.
@@ -27,27 +29,25 @@ func MoveRecordsWithContextIf(from, to plog.Logs, f func(plog.ResourceLogs, plog
 	rls := from.ResourceLogs()
 	rls.RemoveIf(func(rl plog.ResourceLogs) bool {
 		sls := rl.ScopeLogs()
-		var rlCopy *plog.ResourceLogs
+		var rlCopy pdatautil.OnceValue[plog.ResourceLogs]
 		sls.RemoveIf(func(sl plog.ScopeLogs) bool {
 			lrs := sl.LogRecords()
-			var slCopy *plog.ScopeLogs
+			var slCopy pdatautil.OnceValue[plog.ScopeLogs]
 			lrs.RemoveIf(func(lr plog.LogRecord) bool {
 				if !f(rl, sl, lr) {
 					return false
 				}
-				if rlCopy == nil {
-					rlc := to.ResourceLogs().AppendEmpty()
-					rlCopy = &rlc
-					rl.Resource().CopyTo(rlCopy.Resource())
-					rlCopy.SetSchemaUrl(rl.SchemaUrl())
+				if !rlCopy.IsInit() {
+					rlCopy.Init(to.ResourceLogs().AppendEmpty())
+					rl.Resource().CopyTo(rlCopy.Value().Resource())
+					rlCopy.Value().SetSchemaUrl(rl.SchemaUrl())
 				}
-				if slCopy == nil {
-					slc := rlCopy.ScopeLogs().AppendEmpty()
-					slCopy = &slc
-					sl.Scope().CopyTo(slCopy.Scope())
-					slCopy.SetSchemaUrl(sl.SchemaUrl())
+				if !slCopy.IsInit() {
+					slCopy.Init(rlCopy.Value().ScopeLogs().AppendEmpty())
+					sl.Scope().CopyTo(slCopy.Value().Scope())
+					slCopy.Value().SetSchemaUrl(sl.SchemaUrl())
 				}
-				lr.MoveTo(slCopy.LogRecords().AppendEmpty())
+				lr.MoveTo(slCopy.Value().LogRecords().AppendEmpty())
 				return true
 			})
 			return sl.LogRecords().Len() == 0

connector/routingconnector/internal/pmetricutil/metrics.go

@@ -3,7 +3,11 @@
 
 package pmetricutil // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pmetricutil"
 
-import "go.opentelemetry.io/collector/pdata/pmetric"
+import (
+	"go.opentelemetry.io/collector/pdata/pmetric"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/pdatautil"
+)
 
 // MoveResourcesIf calls f sequentially for each ResourceSpans present in the first pmetric.Metrics.
 // If f returns true, the element is removed from the first pmetric.Metrics and added to the second pmetric.Metrics.
@@ -25,21 +29,21 @@ func MoveMetricsWithContextIf(from, to pmetric.Metrics, f func(pmetric.ResourceM
 	rms := from.ResourceMetrics()
 	rms.RemoveIf(func(rm pmetric.ResourceMetrics) bool {
 		sms := rm.ScopeMetrics()
-		var rmCopy *pmetric.ResourceMetrics
+		var rmCopy pdatautil.OnceValue[pmetric.ResourceMetrics]
 		sms.RemoveIf(func(sm pmetric.ScopeMetrics) bool {
 			ms := sm.Metrics()
-			var smCopy *pmetric.ScopeMetrics
+			var smCopy pdatautil.OnceValue[pmetric.ScopeMetrics]
 			ms.RemoveIf(func(m pmetric.Metric) bool {
 				if !f(rm, sm, m) {
 					return false
 				}
-				if rmCopy == nil {
-					rmCopy = copyResourceMetrics(rm, to.ResourceMetrics())
+				if !rmCopy.IsInit() {
+					rmCopy.Init(copyResourceMetrics(rm, to.ResourceMetrics()))
 				}
-				if smCopy == nil {
-					smCopy = copyScopeMetrics(sm, rmCopy.ScopeMetrics())
+				if !smCopy.IsInit() {
+					smCopy.Init(copyScopeMetrics(sm, rmCopy.Value().ScopeMetrics()))
 				}
-				m.MoveTo(smCopy.Metrics().AppendEmpty())
+				m.MoveTo(smCopy.Value().Metrics().AppendEmpty())
 				return true
 			})
 			return sm.Metrics().Len() == 0
@@ -56,12 +60,12 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 	rms := from.ResourceMetrics()
 	rms.RemoveIf(func(rm pmetric.ResourceMetrics) bool {
 		sms := rm.ScopeMetrics()
-		var rmCopy *pmetric.ResourceMetrics
+		var rmCopy pdatautil.OnceValue[pmetric.ResourceMetrics]
 		sms.RemoveIf(func(sm pmetric.ScopeMetrics) bool {
 			ms := sm.Metrics()
-			var smCopy *pmetric.ScopeMetrics
+			var smCopy pdatautil.OnceValue[pmetric.ScopeMetrics]
 			ms.RemoveIf(func(m pmetric.Metric) bool {
-				var mCopy *pmetric.Metric
+				var mCopy pdatautil.OnceValue[pmetric.Metric]
 
 				// TODO condense this code
 				switch m.Type() {
@@ -71,17 +75,17 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 						if !f(rm, sm, m, dp) {
 							return false
 						}
-						if rmCopy == nil {
-							rmCopy = copyResourceMetrics(rm, to.ResourceMetrics())
+						if !rmCopy.IsInit() {
+							rmCopy.Init(copyResourceMetrics(rm, to.ResourceMetrics()))
 						}
-						if smCopy == nil {
-							smCopy = copyScopeMetrics(sm, rmCopy.ScopeMetrics())
+						if !smCopy.IsInit() {
+							smCopy.Init(copyScopeMetrics(sm, rmCopy.Value().ScopeMetrics()))
 						}
-						if mCopy == nil {
-							mCopy = copyMetricDescription(m, smCopy.Metrics())
-							mCopy.SetEmptyGauge()
+						if !mCopy.IsInit() {
+							mCopy.Init(copyMetricDescription(m, smCopy.Value().Metrics()))
+							mCopy.Value().SetEmptyGauge()
 						}
-						dp.MoveTo(mCopy.Gauge().DataPoints().AppendEmpty())
+						dp.MoveTo(mCopy.Value().Gauge().DataPoints().AppendEmpty())
 						return true
 					})
 					return dps.Len() == 0
@@ -91,18 +95,18 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 						if !f(rm, sm, m, dp) {
 							return false
 						}
-						if rmCopy == nil {
-							rmCopy = copyResourceMetrics(rm, to.ResourceMetrics())
+						if !rmCopy.IsInit() {
+							rmCopy.Init(copyResourceMetrics(rm, to.ResourceMetrics()))
 						}
-						if smCopy == nil {
-							smCopy = copyScopeMetrics(sm, rmCopy.ScopeMetrics())
+						if !smCopy.IsInit() {
+							smCopy.Init(copyScopeMetrics(sm, rmCopy.Value().ScopeMetrics()))
 						}
-						if mCopy == nil {
-							mCopy = copyMetricDescription(m, smCopy.Metrics())
-							mCopy.SetEmptySum().SetAggregationTemporality(m.Sum().AggregationTemporality())
-							mCopy.Sum().SetIsMonotonic(m.Sum().IsMonotonic())
+						if !mCopy.IsInit() {
+							mCopy.Init(copyMetricDescription(m, smCopy.Value().Metrics()))
+							mCopy.Value().SetEmptySum().SetAggregationTemporality(m.Sum().AggregationTemporality())
+							mCopy.Value().Sum().SetIsMonotonic(m.Sum().IsMonotonic())
 						}
-						dp.MoveTo(mCopy.Sum().DataPoints().AppendEmpty())
+						dp.MoveTo(mCopy.Value().Sum().DataPoints().AppendEmpty())
 						return true
 					})
 					return dps.Len() == 0
@@ -112,17 +116,17 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 						if !f(rm, sm, m, dp) {
 							return false
 						}
-						if rmCopy == nil {
-							rmCopy = copyResourceMetrics(rm, to.ResourceMetrics())
+						if !rmCopy.IsInit() {
+							rmCopy.Init(copyResourceMetrics(rm, to.ResourceMetrics()))
 						}
-						if smCopy == nil {
-							smCopy = copyScopeMetrics(sm, rmCopy.ScopeMetrics())
+						if !smCopy.IsInit() {
+							smCopy.Init(copyScopeMetrics(sm, rmCopy.Value().ScopeMetrics()))
 						}
-						if mCopy == nil {
-							mCopy = copyMetricDescription(m, smCopy.Metrics())
-							mCopy.SetEmptyHistogram().SetAggregationTemporality(m.Histogram().AggregationTemporality())
+						if !mCopy.IsInit() {
+							mCopy.Init(copyMetricDescription(m, smCopy.Value().Metrics()))
+							mCopy.Value().SetEmptyHistogram().SetAggregationTemporality(m.Histogram().AggregationTemporality())
 						}
-						dp.MoveTo(mCopy.Histogram().DataPoints().AppendEmpty())
+						dp.MoveTo(mCopy.Value().Histogram().DataPoints().AppendEmpty())
 						return true
 					})
 					return dps.Len() == 0
@@ -132,17 +136,17 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 						if !f(rm, sm, m, dp) {
 							return false
 						}
-						if rmCopy == nil {
-							rmCopy = copyResourceMetrics(rm, to.ResourceMetrics())
+						if !rmCopy.IsInit() {
+							rmCopy.Init(copyResourceMetrics(rm, to.ResourceMetrics()))
 						}
-						if smCopy == nil {
-							smCopy = copyScopeMetrics(sm, rmCopy.ScopeMetrics())
+						if !smCopy.IsInit() {
+							smCopy.Init(copyScopeMetrics(sm, rmCopy.Value().ScopeMetrics()))
 						}
-						if mCopy == nil {
-							mCopy = copyMetricDescription(m, smCopy.Metrics())
-							mCopy.SetEmptyExponentialHistogram().SetAggregationTemporality(m.ExponentialHistogram().AggregationTemporality())
+						if !mCopy.IsInit() {
+							mCopy.Init(copyMetricDescription(m, smCopy.Value().Metrics()))
+							mCopy.Value().SetEmptyExponentialHistogram().SetAggregationTemporality(m.ExponentialHistogram().AggregationTemporality())
 						}
-						dp.MoveTo(mCopy.ExponentialHistogram().DataPoints().AppendEmpty())
+						dp.MoveTo(mCopy.Value().ExponentialHistogram().DataPoints().AppendEmpty())
 						return true
 					})
 					return dps.Len() == 0
@@ -152,17 +156,17 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 						if !f(rm, sm, m, dp) {
 							return false
 						}
-						if rmCopy == nil {
-							rmCopy = copyResourceMetrics(rm, to.ResourceMetrics())
+						if !rmCopy.IsInit() {
+							rmCopy.Init(copyResourceMetrics(rm, to.ResourceMetrics()))
 						}
-						if smCopy == nil {
-							smCopy = copyScopeMetrics(sm, rmCopy.ScopeMetrics())
+						if !smCopy.IsInit() {
+							smCopy.Init(copyScopeMetrics(sm, rmCopy.Value().ScopeMetrics()))
 						}
-						if mCopy == nil {
-							mCopy = copyMetricDescription(m, smCopy.Metrics())
-							mCopy.SetEmptySummary()
+						if !mCopy.IsInit() {
+							mCopy.Init(copyMetricDescription(m, smCopy.Value().Metrics()))
+							mCopy.Value().SetEmptySummary()
 						}
-						dp.MoveTo(mCopy.Summary().DataPoints().AppendEmpty())
+						dp.MoveTo(mCopy.Value().Summary().DataPoints().AppendEmpty())
 						return true
 					})
 					return dps.Len() == 0
@@ -176,24 +180,24 @@ func MoveDataPointsWithContextIf(from, to pmetric.Metrics, f func(pmetric.Resour
 	})
 }
 
-func copyResourceMetrics(from pmetric.ResourceMetrics, to pmetric.ResourceMetricsSlice) *pmetric.ResourceMetrics {
+func copyResourceMetrics(from pmetric.ResourceMetrics, to pmetric.ResourceMetricsSlice) pmetric.ResourceMetrics {
 	rmc := to.AppendEmpty()
 	from.Resource().CopyTo(rmc.Resource())
 	rmc.SetSchemaUrl(from.SchemaUrl())
-	return &rmc
+	return rmc
 }
 
-func copyScopeMetrics(from pmetric.ScopeMetrics, to pmetric.ScopeMetricsSlice) *pmetric.ScopeMetrics {
+func copyScopeMetrics(from pmetric.ScopeMetrics, to pmetric.ScopeMetricsSlice) pmetric.ScopeMetrics {
 	smc := to.AppendEmpty()
 	from.Scope().CopyTo(smc.Scope())
 	smc.SetSchemaUrl(from.SchemaUrl())
-	return &smc
+	return smc
 }
 
-func copyMetricDescription(from pmetric.Metric, to pmetric.MetricSlice) *pmetric.Metric {
+func copyMetricDescription(from pmetric.Metric, to pmetric.MetricSlice) pmetric.Metric {
 	mc := to.AppendEmpty()
 	mc.SetName(from.Name())
 	mc.SetDescription(from.Description())
 	mc.SetUnit(from.Unit())
-	return &mc
+	return mc
 }