Merge branch 'main' into custom_receiverhelper

Author: gizas

.chloggen/add-pooling.yaml

@@ -0,0 +1,26 @@
+# 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. otlpreceiver)
+component: pdata
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add support for local memory pooling for data objects.
+
+# One or more tracking issues or pull requests related to the change
+issues: [13678]
+
+# (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: This is still an early experimental (alpha) feature. Do not recommended to be used production.
+  To enable use "--featuregate=+pdata.useProtoPooling"
+
+# 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, user]

.chloggen/x25519mlkem768.yaml

@@ -0,0 +1,25 @@
+# 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. otlpreceiver)
+component: configtls
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Enable X25519MLKEM768 as per draft-ietf-tls-ecdhe-mlkem 
+
+# One or more tracking issues or pull requests related to the change
+issues: [13670]
+
+# (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:
+
+# 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: []

.github/workflows/builder-snapshot.yaml

@@ -36,7 +36,7 @@ jobs:
 
       - uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
 
-      - uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
+      - uses: anchore/sbom-action/download-syft@da167eac915b4e86f08b264dbdbc867b61be6f0c # v0.20.5
 
       - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
@@ -60,7 +60,7 @@ jobs:
           key: go-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/go.sum') }}
 
       - name: Check GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
+        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
           distribution: goreleaser-pro
           version: ${{ env.GORELEASER_PRO_VERSION }}
@@ -70,7 +70,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
+        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
           distribution: goreleaser-pro
           version: ${{ env.GORELEASER_PRO_VERSION }}

.github/workflows/codeql-analysis.yml

@@ -39,12 +39,12 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
         with:
           languages: go
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/autobuild@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10

.github/workflows/scorecard.yml

@@ -64,6 +64,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
         with:
           sarif_file: results.sarif

config/configgrpc/wrappedstream_test.go

@@ -20,7 +20,7 @@ var (
 )
 
 func TestWrapServerStream(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), oneCtxKey, 1)
+	ctx := context.WithValue(t.Context(), oneCtxKey, 1)
 	fake := &fakeServerStream{ctx: ctx}
 	assert.NotNil(t, fake.Context().Value(oneCtxKey), "values from fake must propagate to wrapper")
 	wrapped := wrapServerStream(context.WithValue(fake.Context(), otherCtxKey, 2), fake)

config/configtls/configtls.go

@@ -247,7 +247,7 @@ func (c Config) loadTLSConfig() (*tls.Config, error) {
 	for _, curve := range c.CurvePreferences {
 		curveID, ok := tlsCurveTypes[curve]
 		if !ok {
-			return nil, fmt.Errorf("invalid curve type: %s. Expected values are [P-256, P-384, P-521, X25519]", curveID)
+			return nil, fmt.Errorf("invalid curve type: %s. Expected values are [P-256, P-384, P-521, X25519, X25519MLKEM768]", curveID)
 		}
 		curvePreferences = append(curvePreferences, curveID)
 	}
@@ -478,8 +478,9 @@ var tlsVersions = map[string]uint16{
 }
 
 var tlsCurveTypes = map[string]tls.CurveID{
-	"P256":   tls.CurveP256,
-	"P384":   tls.CurveP384,
-	"P521":   tls.CurveP521,
-	"X25519": tls.X25519,
+	"P256":           tls.CurveP256,
+	"P384":           tls.CurveP384,
+	"P521":           tls.CurveP521,
+	"X25519":         tls.X25519,
+	"X25519MLKEM768": tls.X25519MLKEM768,
 }

config/configtls/configtls_test.go

@@ -881,6 +881,11 @@ func TestCurvePreferences(t *testing.T) {
 		expectedCurveIDs []tls.CurveID
 		expectedErr      string
 	}{
+		{
+			name:             "X25519MLKEM768",
+			preferences:      []string{"X25519MLKEM768"},
+			expectedCurveIDs: []tls.CurveID{tls.X25519MLKEM768},
+		},
 		{
 			name:             "X25519",
 			preferences:      []string{"X25519"},

internal/cmd/pdatagen/internal/pdata/field.go

@@ -14,6 +14,8 @@ type Field interface {
 
 	GenerateTestEncodingValues(ms *messageStruct) string
 
+	GenerateDeleteOrig(ms *messageStruct) string
+
 	GenerateCopyOrig(ms *messageStruct) string
 
 	GenerateMarshalJSON(ms *messageStruct) string

internal/cmd/pdatagen/internal/pdata/message_field.go

@@ -63,6 +63,10 @@ func (mf *MessageField) GenerateTestEncodingValues(*messageStruct) string {
 	return mf.toProtoField().GenTestEncodingValues()
 }
 
+func (mf *MessageField) GenerateDeleteOrig(*messageStruct) string {
+	return mf.toProtoField().GenDeleteOrig()
+}
+
 func (mf *MessageField) GenerateCopyOrig(ms *messageStruct) string {
 	t := template.Parse("messageCopyOrigTemplate", []byte(messageCopyOrigTemplate))
 	return template.Execute(t, mf.templateFields(ms))