Merge branch 'main' into enhance-issue-template

.chloggen/remove-pprofile-deprecated.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: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: pdata/pprofile
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated `Profile.EndTime` and `Profile.SetEndTime` methods.
+
+# One or more tracking issues or pull requests related to the change
+issues: [11796]
+
+# (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: []

.chloggen/remove-receiver-scrapererror.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: deprecation
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: receiver/scrapererror
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove the receiver/scrapererror alias.
+
+# One or more tracking issues or pull requests related to the change
+issues: [11003]
+
+# (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: [api]

.github/workflows/api-compatibility.yml

@@ -9,8 +9,6 @@ on:
   pull_request:
     branches:
       - main
-  merge_group:
-    types: [checks_requested]
 
 permissions:
   contents: read

.github/workflows/changelog.yml

@@ -9,8 +9,6 @@ on:
     types: [opened, ready_for_review, synchronize, reopened, labeled, unlabeled]
     branches:
       - main
-  merge_group:
-    types: [checks_requested]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}

cmd/builder/test/core.builder.yaml

@@ -11,67 +11,3 @@ receivers:
 
 exporters:
   - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
-
-replaces:
-  - go.opentelemetry.io/collector => ${WORKSPACE_DIR}
-  - go.opentelemetry.io/collector/client => ${WORKSPACE_DIR}/client
-  - go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component
-  - go.opentelemetry.io/collector/component/componenttest => ${WORKSPACE_DIR}/component/componenttest
-  - go.opentelemetry.io/collector/component/componentstatus => ${WORKSPACE_DIR}/component/componentstatus
-  - go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth
-  - go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression
-  - go.opentelemetry.io/collector/config/configgrpc => ${WORKSPACE_DIR}/config/configgrpc
-  - go.opentelemetry.io/collector/config/confighttp => ${WORKSPACE_DIR}/config/confighttp
-  - go.opentelemetry.io/collector/config/confignet => ${WORKSPACE_DIR}/config/confignet
-  - go.opentelemetry.io/collector/config/configopaque => ${WORKSPACE_DIR}/config/configopaque
-  - go.opentelemetry.io/collector/config/configretry => ${WORKSPACE_DIR}/config/configretry
-  - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
-  - go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
-  - go.opentelemetry.io/collector/config/internal => ${WORKSPACE_DIR}/config/internal
-  - go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap
-  - go.opentelemetry.io/collector/confmap/provider/envprovider => ${WORKSPACE_DIR}/confmap/provider/envprovider
-  - go.opentelemetry.io/collector/confmap/provider/fileprovider => ${WORKSPACE_DIR}/confmap/provider/fileprovider
-  - go.opentelemetry.io/collector/confmap/provider/httpprovider => ${WORKSPACE_DIR}/confmap/provider/httpprovider
-  - go.opentelemetry.io/collector/confmap/provider/httpsprovider => ${WORKSPACE_DIR}/confmap/provider/httpsprovider
-  - go.opentelemetry.io/collector/confmap/provider/yamlprovider => ${WORKSPACE_DIR}/confmap/provider/yamlprovider
-  - go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer
-  - go.opentelemetry.io/collector/consumer/consumererror => ${WORKSPACE_DIR}/consumer/consumererror
-  - go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles => ${WORKSPACE_DIR}/consumer/consumererror/consumererrorprofiles
-  - go.opentelemetry.io/collector/consumer/consumerprofiles => ${WORKSPACE_DIR}/consumer/consumerprofiles
-  - go.opentelemetry.io/collector/consumer/consumertest => ${WORKSPACE_DIR}/consumer/consumertest
-  - go.opentelemetry.io/collector/connector => ${WORKSPACE_DIR}/connector
-  - go.opentelemetry.io/collector/connector/connectortest => ${WORKSPACE_DIR}/connector/connectortest
-  - go.opentelemetry.io/collector/connector/connectorprofiles => ${WORKSPACE_DIR}/connector/connectorprofiles
-  - go.opentelemetry.io/collector/exporter => ${WORKSPACE_DIR}/exporter
-  - go.opentelemetry.io/collector/exporter/debugexporter => ${WORKSPACE_DIR}/exporter/debugexporter
-  - go.opentelemetry.io/collector/exporter/exporterprofiles => ${WORKSPACE_DIR}/exporter/exporterprofiles
-  - go.opentelemetry.io/collector/exporter/exportertest => ${WORKSPACE_DIR}/exporter/exportertest
-  - go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles => ${WORKSPACE_DIR}/exporter/exporterhelper/exporterhelperprofiles
-  - go.opentelemetry.io/collector/extension => ${WORKSPACE_DIR}/extension
-  - go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth
-  - go.opentelemetry.io/collector/extension/auth/authtest => ${WORKSPACE_DIR}/extension/auth/authtest
-  - go.opentelemetry.io/collector/extension/experimental/storage => ${WORKSPACE_DIR}/extension/experimental/storage
-  - go.opentelemetry.io/collector/extension/extensioncapabilities => ${WORKSPACE_DIR}/extension/extensioncapabilities
-  - go.opentelemetry.io/collector/extension/extensiontest => ${WORKSPACE_DIR}/extension/extensiontest
-  - go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension
-  - go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate
-  - go.opentelemetry.io/collector/internal/memorylimiter => ${WORKSPACE_DIR}/internal/memorylimiter
-  - go.opentelemetry.io/collector/internal/fanoutconsumer => ${WORKSPACE_DIR}/internal/fanoutconsumer
-  - go.opentelemetry.io/collector/internal/sharedcomponent => ${WORKSPACE_DIR}/internal/sharedcomponent
-  - go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol
-  - go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest
-  - go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata
-  - go.opentelemetry.io/collector/pdata/pprofile => ${WORKSPACE_DIR}/pdata/pprofile
-  - go.opentelemetry.io/collector/pdata/testdata => ${WORKSPACE_DIR}/pdata/testdata
-  - go.opentelemetry.io/collector/pipeline => ${WORKSPACE_DIR}/pipeline
-  - go.opentelemetry.io/collector/pipeline/pipelineprofiles => ${WORKSPACE_DIR}/pipeline/pipelineprofiles
-  - go.opentelemetry.io/collector/processor => ${WORKSPACE_DIR}/processor
-  - go.opentelemetry.io/collector/processor/processortest => ${WORKSPACE_DIR}/processor/processortest
-  - go.opentelemetry.io/collector/processor/processorprofiles => ${WORKSPACE_DIR}/processor/processorprofiles
-  - go.opentelemetry.io/collector/receiver => ${WORKSPACE_DIR}/receiver
-  - go.opentelemetry.io/collector/receiver/otlpreceiver => ${WORKSPACE_DIR}/receiver/otlpreceiver
-  - go.opentelemetry.io/collector/receiver/receiverprofiles => ${WORKSPACE_DIR}/receiver/receiverprofiles
-  - go.opentelemetry.io/collector/receiver/receivertest => ${WORKSPACE_DIR}/receiver/receivertest
-  - go.opentelemetry.io/collector/scraper => ${WORKSPACE_DIR}/scraper
-  - go.opentelemetry.io/collector/semconv => ${WORKSPACE_DIR}/semconv
-  - go.opentelemetry.io/collector/service => ${WORKSPACE_DIR}/service

cmd/builder/test/test.sh

@@ -33,7 +33,7 @@ test_build_config() {
     echo "Starting test '${test}' at $(date)" >> "${out}/test.log"
 
     final_build_config=$(basename "${build_config}")
-    "${WORKSPACE_DIR}/.tools/envsubst" < "$build_config" > "${out}/${final_build_config}"
+    "${WORKSPACE_DIR}/.tools/envsubst" -o "${out}/${final_build_config}" -i <(cat "$build_config" "$replaces")
     if ! go run . --config "${out}/${final_build_config}" --output-path "${out}" > "${out}/builder.log" 2>&1; then
         echo "❌ FAIL ${test}. Failed to compile the test ${test}. Build logs:"
         cat "${out}/builder.log"
@@ -113,6 +113,15 @@ tests="core"
 base=$(mktemp -d)
 echo "Running the tests in ${base}"
 
+replaces="$base/replaces"
+# Get path of all core modules, in sorted order, without the initial dot
+core_mods=$(cd ../.. && find . -type f -name "go.mod" -exec dirname {} \; | sort | sed 's/.//')
+echo "replaces:" >> "$replaces"
+for mod in $core_mods; do
+    echo "  - go.opentelemetry.io/collector$mod => \${WORKSPACE_DIR}$mod" >> "$replaces"
+done
+echo "Wrote replace statements to $replaces"
+
 failed=false
 
 for test in $tests

docs/rfcs/README.md

@@ -46,15 +46,19 @@ We use a [Lazy Consensus](https://www.apache.org/foundation/glossary.html#LazyCo
 1. *Quorum*: For an RFC to be mergeable, it needs to have at least **two approvals** from the
    approvers set as well as approvals from any additional stakeholders.
 2. *Waiting period*: Maintainers need to announce their intent to merge the RFC with a GitHub
-   comment. They will need to add a `rfc:final-comment-period` label to the PR and wait for at least
-   **4 business days** after making the announcement to merge the RFC.
+   comment. They will need to add a `rfc:final-comment-period` label to the PR, comment on the PR
+   and note the final comment period in the #otel-collector-dev CNCF Slack channel, and wait for at
+   least **4 business days** after making the announcement to merge the RFC.
 3. *Objections*: Objections should be communicated as a 'request changes' review. All objections
    must be addressed before merging an RFC. If addressing an objection does not appear feasible, any
    maintainer may call for a vote to be made on the objection (see below). This will be signified by
    adding a `rfc:vote-needed` label to the PR. The voting result is binding and a maintainer can
    drop any 'request changes' reviews based on the vote results or consensus.
 4. *Modifications*: Non-trivial modifications to an RFC reset the waiting period. RFC authors must
    re-request any approving, comment, or 'request changes' reviews if the RFC has been modified significantly.
+5. *All conversations are resolved*: All Github conversations on the PR must be marked as resolved
+   before merging. The RFC author may resolve conversations at their discretion, but they must
+   explain in the conversation thread why they believe it is appropriate to do so.
 
 ### Voting