[chore] repo: Sync fork with current upstream main

[amir-jakoby]

repo: Sync fork with current upstream main

Brings the fork back up to the current upstream main tip while retaining the Sawmills-specific fork delta.

• Reapplies the fork-only exporter, processor, confmap, and version pin changes on top of current upstream main.
• Refreshes module manifests and generated files to match the new base.
• Verifies the touched packages and repo gates (go test, make genotelcontribcol, make checkapi, make chlog-validate).

---

Note

Medium Risk
Broad repo-wide changes to release-note metadata and CI automation (workflows/scripts/codeowners/component lists) could affect tooling behavior and contributor workflows, but do not directly modify runtime collector code paths.

Overview
Syncs the fork with upstream by adding a large batch of .chloggen entries, updating .chloggen/config.yaml component inventory (notably receiver/filelog → receiver/file_log, adding pkg/expohisto/pkg/skywalking, and dropping some components like processor/hotreloadprocessor and processor/logstometricsprocessor). Also refreshes generated changelog output in CHANGELOG-API.md (adding the v0.148.0 section).

Updates repo automation and metadata: adjusts CODEOWNERS ownership, updates component label lists/issue templates and schemagen overrides to match renamed components, and tightens/modernizes multiple GitHub Actions workflows (pinned action versions, conditions limited to open-telemetry, link-check behavior, CodeQL disk-space handling, and PR-from-changelog generation logic).

^{Written by Cursor Bugbot for commit f03087f. This will update automatically on new commits. Configure here.}

---

Summary by cubic

Syncs the Sawmills fork to upstream opentelemetry-collector-contrib v0.148.0, carries forward the Sawmills delta, and refreshes deps/CI/generated outputs. Verified with repo gates (go test, make genotelcontribcol, make checkapi, make chlog-validate). Connects to SAW-6831.

• Migration

  • Cut a v0.148.0-sawmills tag here before SAW-6833 updates sawmills-collector.
  • receiver/prometheus: report_extra_scrape_metrics is removed; configure extra scrape metrics via Prometheus config. Target allocator interval must be >0; invalid configs now fail validation.
  • exporter/kafka:
    • Top‑level topic/encoding are removed; use per‑signal logs|metrics|traces|profiles.topic and *.encoding.
    • Local queue partitioning is removed; use exporterhelper batching for partitioning.
    • If topic_from_metadata_key is set, it must also be present in include_metadata_keys; validation enforces this.
  • receiver/kafka: deprecates built‑in azure_resource_logs encoding; use extension/azure_encoding.
  • processor/datadogsemantics: removed; delete it from any configs.
  • receiver/windowseventlogreceiver: event_data is now a flat map, not an array of single‑key maps; update any OTTL expressions that read event_data.
  • Component type renames to snake_case (aliases retained), including extension/google_cloud_logentry_encoding, extension/aws_logs_encoding, extension/cgroup_runtime, exporter/google_cloud_storage, and receiver/cisco_os. Update names only if standardizing on new types now; old names remain as deprecated aliases.
  • receiver/postgresql: db.server.top_query and db.server.query_sample are now disabled by default; explicitly enable if needed.

• New Features

  • processor/resourcedetection: adds IBM Cloud Classic and IBM Cloud VPC detectors.
  • receiver/pprof: supports scraping HTTP endpoints and self.
  • receiver/kafka: exposes topic/partition/offset as client metadata.
  • connector/signal_to_metrics: supports setting sum.monotonic for correct counter behavior.

^{Written for commit f03087f. Summary will update on new commits.}

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cdfce05a91

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

Restore relative require path in codeowners activity workflow

The github-script step now calls require('.github/workflows/scripts/generate-codeowners-activity.js'), which is not a valid relative import path in Node (relative paths must start with ./ or ../). As written, Node treats this as a package name and fails with MODULE_NOT_FOUND, so the generate-codeowners-activity job will fail whenever it runs.

Useful? React with 👍 / 👎.

[chatgpt-codex-connector]

Diff changelog entries against the PR base branch

The script now computes added .chloggen files from git merge-base origin/main "${PR_HEAD}" instead of the pull request base branch. Because the workflow still triggers on any pull_request_target (not just PRs into main), PRs targeting release/* branches can include unrelated changelog files from the branch divergence point, producing incorrect generated PR titles/bodies.

Useful? React with 👍 / 👎.

[cubic-dev-ai]

17 issues found across 1611 files

Confidence score: 4/5

• Most issues are about change_logs: [] suppressing user-facing release notes in multiple .chloggen/*.yaml entries, which is low runtime risk but can hide important fixes/features from users.
• The .chloggen/config.yaml allowlist change could break changelog validation for Sawmills-specific processors per SAW-6831, so it’s worth a quick check before merging.
• Pay close attention to .chloggen/config.yaml, .chloggen/datadogexporter_aix.yaml, .chloggen/mx-psi_unit-rates.yaml, .chloggen/feat_sk_sqlquery_ch.yaml, .chloggen/re-aggregation-feat_mongodb-receiver.yaml, .chloggen/yanggrpc_wip.yaml, .chloggen/fix-filelog-bug.yaml, .chloggen/datadogconnector_aix.yaml, .chloggen/k8sevents-duplication.yaml, .chloggen/otelarrowreceiver-fix-grpc-status-codes.yaml - ensure user-facing release notes aren’t unintentionally suppressed and allowlist changes won’t block validation.

Note: This PR contains a large number of files. cubic only reviews up to 75 files per PR, so some files may not have been reviewed.

Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name=".chloggen/add_aix.yaml">

<violation number="1" location=".chloggen/add_aix.yaml:29">
P2: This changelog entry is excluded from all changelog outputs by setting `change_logs: []`; use `user` so the AIX support change appears in release notes.</violation>
</file>

<file name=".chloggen/yanggrpc_wip.yaml">

<violation number="1" location=".chloggen/yanggrpc_wip.yaml:27">
P2: This end-user enhancement entry should include the `user` changelog instead of an empty `change_logs` list.</violation>
</file>

<file name=".chloggen/pulsar_aix_exporter.yaml">

<violation number="1" location=".chloggen/pulsar_aix_exporter.yaml:28">
P2: This changelog entry is configured to publish to no changelog files. For a user-facing behavior change, include it in the `user` changelog.</violation>
</file>

<file name=".chloggen/fix-filelog-bug.yaml">

<violation number="1" location=".chloggen/fix-filelog-bug.yaml:27">
P2: `change_logs` is set to an empty list, which suppresses this changelog entry from all changelog outputs. Use the default (`user`) or set it explicitly.</violation>
</file>

<file name=".chloggen/46991-pprof-receiver-merge-profiles.yaml">

<violation number="1" location=".chloggen/46991-pprof-receiver-merge-profiles.yaml:10">
P3: Correct the changelog note typo from `file_scrapper` to `file_scraper` to match the actual pprofreceiver component naming.</violation>
</file>

<file name=".chloggen/datadogexporter_aix.yaml">

<violation number="1" location=".chloggen/datadogexporter_aix.yaml:28">
P2: This changelog entry is excluded from all changelog outputs by `change_logs: []`, so the user-facing Datadog AIX support note will be dropped from release notes.</violation>
</file>

<file name=".chloggen/datadogconnector_aix.yaml">

<violation number="1" location=".chloggen/datadogconnector_aix.yaml:28">
P2: This changelog entry opts out of all changelog outputs, so the release note will not be published. Use the default user changelog (or remove the field) instead of an empty list.</violation>
</file>

<file name=".chloggen/k8sevents-duplication.yaml">

<violation number="1" location=".chloggen/k8sevents-duplication.yaml:27">
P2: This bug-fix changelog entry is excluded from all changelog outputs by setting `change_logs: []`, so the release note for a user-visible fix will be dropped.</violation>
</file>

<file name=".chloggen/otelarrowreceiver-fix-grpc-status-codes.yaml">

<violation number="1" location=".chloggen/otelarrowreceiver-fix-grpc-status-codes.yaml:27">
P2: This bug-fix changelog entry is excluded from all changelog outputs by setting `change_logs: []`. Use `user` so the fix is actually published in release notes.</violation>
</file>

<file name=".chloggen/feat_aws-lambda-enrich-context-with-metadata.yaml">

<violation number="1" location=".chloggen/feat_aws-lambda-enrich-context-with-metadata.yaml:27">
P2: This changelog entry explicitly opts out of all changelog outputs (`change_logs: []`), so the enhancement note will be dropped from release notes. Use `[user]` (or omit the field) for an end-user-visible receiver change.</violation>
</file>

<file name=".chloggen/dylan_azure-event-hubs-distributed.yaml">

<violation number="1" location=".chloggen/dylan_azure-event-hubs-distributed.yaml:27">
P2: This user-facing enhancement is excluded from all changelog outputs by setting `change_logs: []`; include `user` so the feature appears in release notes.</violation>
</file>

<file name=".chloggen/mx-psi_unit-rates.yaml">

<violation number="1" location=".chloggen/mx-psi_unit-rates.yaml:27">
P2: This changelog entry is excluded from all changelog outputs by setting `change_logs: []`; use `[user]` (or omit the field) so the bug-fix note is actually published.</violation>
</file>

<file name=".chloggen/pulsar_aix.yaml">

<violation number="1" location=".chloggen/pulsar_aix.yaml:28">
P2: This changelog entry opts out of all changelog outputs (`change_logs: []`), so the user-facing enhancement note will not be published in release notes.</violation>
</file>

<file name=".chloggen/feat_sk_sqlquery_ch.yaml">

<violation number="1" location=".chloggen/feat_sk_sqlquery_ch.yaml:27">
P2: This enhancement changelog entry disables changelog output by setting `change_logs: []`. For a user-facing feature, it should include the `user` changelog so the release note is published.</violation>
</file>

<file name=".chloggen/re-aggregation-feat_mongodb-receiver.yaml">

<violation number="1" location=".chloggen/re-aggregation-feat_mongodb-receiver.yaml:27">
P2: This enhancement entry opts out of all changelog outputs, so the release note for this user-facing change will be dropped. Include it in the `user` changelog.</violation>
</file>

<file name=".chloggen/dockerstatsreceiver-persistent-stats-stream.yaml">

<violation number="1" location=".chloggen/dockerstatsreceiver-persistent-stats-stream.yaml:30">
P3: This changelog entry should not target the API changelog unless it changes a library API. The described change is a receiver config enhancement, so it should be `user` only.</violation>
</file>

<file name=".chloggen/config.yaml">

<violation number="1" location=".chloggen/config.yaml:199">
P2: According to linked Linear issue SAW-6831, Sawmills-specific patches must be carried forward. This change removes active Sawmills processors from the chloggen component allowlist, which can break changelog entry validation for those maintained components.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review, or fix all with cubic.}

[cubic-dev-ai]

P2: This changelog entry is excluded from all changelog outputs by setting change_logs: []; use user so the AIX support change appears in release notes.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/add_aix.yaml, line 29:

<comment>This changelog entry is excluded from all changelog outputs by setting `change_logs: []`; use `user` so the AIX support change appears in release notes.</comment>

<file context>
@@ -0,0 +1,29 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: This end-user enhancement entry should include the user changelog instead of an empty change_logs list.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/yanggrpc_wip.yaml, line 27:

<comment>This end-user enhancement entry should include the `user` changelog instead of an empty `change_logs` list.</comment>

<file context>
@@ -0,0 +1,27 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: This changelog entry is configured to publish to no changelog files. For a user-facing behavior change, include it in the user changelog.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/pulsar_aix_exporter.yaml, line 28:

<comment>This changelog entry is configured to publish to no changelog files. For a user-facing behavior change, include it in the `user` changelog.</comment>

<file context>
@@ -0,0 +1,28 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: change_logs is set to an empty list, which suppresses this changelog entry from all changelog outputs. Use the default (user) or set it explicitly.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/fix-filelog-bug.yaml, line 27:

<comment>`change_logs` is set to an empty list, which suppresses this changelog entry from all changelog outputs. Use the default (`user`) or set it explicitly.</comment>

<file context>
@@ -0,0 +1,27 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: This changelog entry is excluded from all changelog outputs by change_logs: [], so the user-facing Datadog AIX support note will be dropped from release notes.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/datadogexporter_aix.yaml, line 28:

<comment>This changelog entry is excluded from all changelog outputs by `change_logs: []`, so the user-facing Datadog AIX support note will be dropped from release notes.</comment>

<file context>
@@ -0,0 +1,28 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: This enhancement changelog entry disables changelog output by setting change_logs: []. For a user-facing feature, it should include the user changelog so the release note is published.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/feat_sk_sqlquery_ch.yaml, line 27:

<comment>This enhancement changelog entry disables changelog output by setting `change_logs: []`. For a user-facing feature, it should include the `user` changelog so the release note is published.</comment>

<file context>
@@ -0,0 +1,27 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: This enhancement entry opts out of all changelog outputs, so the release note for this user-facing change will be dropped. Include it in the user changelog.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/re-aggregation-feat_mongodb-receiver.yaml, line 27:

<comment>This enhancement entry opts out of all changelog outputs, so the release note for this user-facing change will be dropped. Include it in the `user` changelog.</comment>

<file context>
@@ -0,0 +1,27 @@
+# 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: []
</file context>

[cubic-dev-ai]

P2: According to linked Linear issue SAW-6831, Sawmills-specific patches must be carried forward. This change removes active Sawmills processors from the chloggen component allowlist, which can break changelog entry validation for those maintained components.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/config.yaml, line 199:

<comment>According to linked Linear issue SAW-6831, Sawmills-specific patches must be carried forward. This change removes active Sawmills processors from the chloggen component allowlist, which can break changelog entry validation for those maintained components.</comment>

<file context>
@@ -195,13 +196,12 @@ components:
     - processor/groupbytrace
     - processor/hetznerdetector
-    - processor/hotreloadprocessor
+    - processor/ibmcloudclassicdetector
     - processor/ibmcloudvpcdetector
     - processor/interval
</file context>

[cubic-dev-ai]

P3: Correct the changelog note typo from file_scrapper to file_scraper to match the actual pprofreceiver component naming.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/46991-pprof-receiver-merge-profiles.yaml, line 10:

<comment>Correct the changelog note typo from `file_scrapper` to `file_scraper` to match the actual pprofreceiver component naming.</comment>

<file context>
@@ -0,0 +1,27 @@
+component: receiver/pprof
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fixes pprofreceiver file_scrapper appending resource profiles instead of merging them.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
</file context>

[cubic-dev-ai]

P3: This changelog entry should not target the API changelog unless it changes a library API. The described change is a receiver config enhancement, so it should be user only.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At .chloggen/dockerstatsreceiver-persistent-stats-stream.yaml, line 30:

<comment>This changelog entry should not target the API changelog unless it changes a library API. The described change is a receiver config enhancement, so it should be `user` only.</comment>

<file context>
@@ -0,0 +1,30 @@
+# 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, api]
</file context>

[cubic-dev-ai]

0 issues found across 1 file (changes from recent commits).

_{Requires human review: Auto-approval blocked by 17 unresolved issues from previous reviews.}

[sawmills-architect-review]

[ARCH-REVIEW] ✅ APPROVE

Re-review: new commit adds 2 lychee.toml URL exclusions (CI noise suppression). No architectural concerns. Prior 🟡 (mixed go.mod pseudo-version state) remains advisory — developer's call to address in a follow-up. No new 🔴/🟡/🟢 findings.

[sawmills-architect-review]

[ARCH-REVIEW] Re-review: version alignment — COMMENT

✅ Prior 🟡 (mixed go.mod pseudo-version state) addressed: s3provider, loadbalancingexporter, hotreloadprocessor, logstometricsprocessor now consistently pinned to the Sawmills pseudo-version build. No new findings. 19 unresolved threads remain — resolve to unlock approval.

[cubic-dev-ai]

0 issues found across 8 files (changes from recent commits).

_{Requires human review: Auto-approval blocked by 17 unresolved issues from previous reviews.}

[sawmills-architect-review]

[ARCH-REVIEW] Re-review: CI suppression commit — COMMENT

New commit: 12 URL exclusions added to .github/lychee.toml to suppress flaky doc link checks. No architectural concerns. Prior state unchanged — 19 unresolved threads remain (all from external bots). Resolve threads to unlock approval.

[cubic-dev-ai]

0 issues found across 1 file (changes from recent commits).

_{Requires human review: Auto-approval blocked by 17 unresolved issues from previous reviews.}

[sawmills-architect-review]

[ARCH-REVIEW] Re-review: tidylist registration — COMMENT

New commit adds hotreloadprocessor and logstometricsprocessor to internal/tidylist/tidylist.txt (+ reorder of metricstransformprocessor). Correct — Sawmills fork modules must be registered here or tidy CI will skip them. No architectural concerns. Prior state unchanged — 19 unresolved threads remain (all from external bots). Resolve threads to unlock approval.

[cubic-dev-ai]

0 issues found across 1 file (changes from recent commits).

_{Requires human review: Auto-approval blocked by 17 unresolved issues from previous reviews.}

[cursor]

Sawmills lint exclusions removed but code still exists

High Severity

The .golangci.yml lint exclusion rules for processor/hotreloadprocessor/ were removed, but the processor/hotreloadprocessor/ directory still exists in the repo with Sawmills-specific code. The removed exclusions suppressed errcheck, gosec, gocritic, gci, gofumpt, govet, modernize, revive, staticcheck, testifylint, thelper, unconvert, unparam, unused, and usetesting — CI linting will now fail on this code. Similarly, processor/logstometricsprocessor was removed from .codecov.yml, .chloggen/config.yaml, CODEOWNERS, and issue templates while its code remains.

Additional Locations (1)

• .codecov.yml#L475-L476

 

[cursor]

API pagination removed causing truncated review data

Low Severity

The code switched from octokit.paginate() (which fetches all pages) to direct octokit.pulls.listReviews() and octokit.issues.listComments() calls without pagination or a per_page parameter. This returns only the first page of results (default 30 items), so PRs with more than 30 reviews or comments will have incomplete data in the codeowners activity report.

 

[sawmills-architect-review]

[ARCH-REVIEW] Re-review: distribution report refresh — COMMENT

New commit adds logstometricsprocessor to reports/distributions/contrib.yaml. Correct follow-through from the tidylist registration — distribution report now reflects the Sawmills fork modules. No architectural concerns.

21 unresolved threads remain (all from external bots: cursor, chatgpt-codex-connector, cubic-dev-ai). Resolve threads to unlock approval.

[cursor]

Parallel arrays become misaligned with conditional appends

Medium Severity

The COMPONENTS, NOTES, and CHANGE_TYPES arrays are now conditionally appended independently — each only when its value is non-empty. Previously, all three were appended unconditionally together (with "unknown" as a fallback for empty components), keeping them index-aligned. Later, the body generation loop at line 176 iterates over NOTES indices and cross-references COMPONENTS[$i] and CHANGE_TYPES[$i] by the same index. If a changelog file has a note but no component (or vice versa), the arrays will have different lengths and the index lookup will retrieve data from the wrong changelog entry, producing an incorrect PR title and body.

Additional Locations (1)

• .github/workflows/scripts/generate-pr-from-changelog.sh#L141-L142

 

[cursor]

Fork-specific workflow conditions dropped during sync

Medium Severity

The repository_owner == 'Sawmills' condition was removed from both generate-component-labels.yml and rerun-workflows.yml, meaning these workflows will never trigger on the Sawmills fork. The PR description states it "retains the Sawmills-specific fork delta," but these fork customizations were overwritten by upstream. A grep for Sawmills in .github/ confirms zero remaining references.

Additional Locations (1)

• .github/workflows/rerun-workflows.yml#L10-L11

 

[cubic-dev-ai]

0 issues found across 1 file (changes from recent commits).

_{Requires human review: Auto-approval blocked by 17 unresolved issues from previous reviews.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

There are 5 total unresolved issues (including 4 from previous reviews).

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

[cursor]

Removing Linux guard breaks disk cleanup on Windows runners

Medium Severity

The if: runner.os == 'Linux' guard was removed from setup-go-tools/action.yml, so free-disk-space.sh now runs on all OSes including Windows. This script uses Linux-only commands (df -BM --output=avail /, du -BM, sudo rm -rf /usr/local/lib/android), and sets BASELINE_SPACE in GITHUB_ENV. On Windows, these commands will fail or produce empty values. The downstream check-disk-space.sh (also Linux-only, also had shell: bash removed in the Windows workflow) depends on BASELINE_SPACE.

 

[sawmills-architect-review]

[ARCH-REVIEW] Re-review: prometheusreceiver upstream delta — COMMENT

New commits bring in upstream receiver/prometheusreceiver changes for otel_scope_<attr> label extraction (upstream open-telemetry#41502). The implementation is clean: getSortedNotUsefulLabelsForSeries correctly excludes all otel_scope_* labels from series hashing dynamically, attrsHash on scopeID correctly partitions distinct scope attribute sets into separate ScopeMetrics groups, and the IgnoreScopeInfoMetric feature gate path is gated at alpha/disabled-by-default. Test coverage for both gate states is present. No architectural concerns with this upstream pull.

Prior finding still open: 24 unresolved review threads (up from 21). All appear to be external bot threads (cursor, chatgpt-codex-connector, cubic-dev-ai). Resolve threads to unlock approval.

[cubic-dev-ai]

0 issues found across 1 file (changes from recent commits).

_{Requires human review: Auto-approval blocked by 17 unresolved issues from previous reviews.}

[amir-jakoby]

Superseded by PR #26, which already merged the same sync to main.