You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
chore: drop python/, link fork analysis, track otel-upstream
- Remove python/ entirely. Only nodejs layers ship; if Python
autoinstrumentation is needed later, start from origin/python-instrumentation.
Drop the commented-out pip block in dependabot.yml and the python/README.md
link in README.md.
- UPSTREAM.md: replace the scratch-path reference to the fork-research doc
with the Confluence page link. Add remote-setup block (remotes aren't
checked in, fresh clones only have origin). Add a third fork-points row
for open-telemetry/opentelemetry-lambda with the tag (layer-nodejs/0.10.0,
c9e67c4) coralogix last merged in via 436f3d0. Add sync block + note that
coralogix absorbs upstream-upstream selectively (tags or cherry-picks) so
the sync skill should walk by patch-id, not merge-base.
- .gitignore: add .claude/worktrees/ and extend/plan-*.md so transient agent
scaffolding doesn't leak into commits again.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This fork supports**Node.js**and **Python** runtimes only. Upstream's Java, .NET, Ruby, and Go Lambda layers have been removed — we don't ship them and don't need to track their CI.
11
+
This fork ships**Node.js**Lambda layers only. Upstream's Python, Java, .NET, Ruby, and Go layers have been removed — we don't build them. If we need Python autoinstrumentation later, start from `origin/python-instrumentation` rather than reviving the upstream dir.
12
12
13
-
The collector extension (in `collector/`) is language-agnostic and powers both Node.js and Python layers.
13
+
The collector extension (in `collector/`) is language-agnostic.
14
14
15
15
## Layout
16
16
@@ -19,7 +19,6 @@ The collector extension (in `collector/`) is language-agnostic and powers both N
19
19
|`collector/`| Go collector extension + Makefile (`package-extend` target) |
20
20
|`extend/`| Extend-specific collector configs + README for consumers |
Copy file name to clipboardExpand all lines: UPSTREAM.md
+33-12Lines changed: 33 additions & 12 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -4,46 +4,66 @@ This repo is a fork of [`coralogix/opentelemetry-lambda`](https://github.com/cor
4
4
5
5
We also consume [`coralogix/opentelemetry-js-contrib`](https://github.com/coralogix/opentelemetry-js-contrib) (branch `coralogix-autoinstrumentation`) at build time — pinned separately in `scripts/publish-sandbox.sh` and `.github/workflows/publish-extend-otel-layer.yml`.
6
6
7
-
Why we fork cx-contrib: upstream OpenTelemetry has declined the Lambda-specific PRs (trigger subsystem, early-spans-on-timeout, `cx.internal.*` reconciliation attrs — see contrib#1349, contrib#1295, contrib#1309). See `~/workspace/scratch/otel-fork-research/summary.md` for the full rationale.
7
+
Why we fork cx-contrib: upstream OpenTelemetry has declined the Lambda-specific PRs (trigger subsystem, early-spans-on-timeout, `cx.internal.*` reconciliation attrs — see contrib#1349, contrib#1295, contrib#1309). Full rationale: [DEVOPS-2394: OTel Lambda fork analysis](https://helloextend.atlassian.net/wiki/spaces/ENG/pages/3529080850/DEVOPS-2394+OTel+Lambda+fork+analysis).
|`open-telemetry/opentelemetry-lambda`|`main` @ tag `layer-nodejs/0.10.0`|`c9e67c4d8e208000ddbcbab0b8cfe56fc5cf58b6`| 2024-09-24 |
15
16
16
-
Upstream remote in this repo is configured as `upstream` → `coralogix/opentelemetry-lambda`:
17
+
The `open-telemetry/...` row is transitive — last time Coralogix pulled from OTel-upstream into `coralogix-nodejs-autoinstrumentation` was merge commit [`436f3d0`](https://github.com/coralogix/opentelemetry-lambda/commit/436f3d0) (`Merge tag 'layer-nodejs/0.10.0' into merge`, 2024-10-28), whose second parent is `c9e67c4`. To catch up, start walking OTel-upstream from that SHA:
~416 OTel-`main` commits have landed since. Coralogix merges selectively — whole tags (`436f3d0`) or cherry-picks that rewrite SHAs — so don't rely on `git merge-base` alone when checking what's already in. The sync skill (DEVOPS-2502) should diff by `git patch-id` across the walk.
24
+
25
+
## Remote setup (one-time, per clone)
26
+
27
+
Remotes aren't checked into the repo. After cloning, run:
Until the sync skill lands (see DEVOPS-2502), upstream changes are pulled in manually:
37
+
Until the sync skill lands (see DEVOPS-2502), upstream changes are pulled in manually. Walk both upstreams — coralogix adds CX-specific features; open-telemetry adds core fixes/security patches that coralogix hasn't yet absorbed.
0 commit comments