Skip to content

Rebase patches onto upstream v1.37.0 - #29

Merged
Marius Volkhart (MariusVolkhart) merged 1 commit into
mainfrom
rebase-v1.37.0
Jul 17, 2026
Merged

Rebase patches onto upstream v1.37.0#29
Marius Volkhart (MariusVolkhart) merged 1 commit into
mainfrom
rebase-v1.37.0

Conversation

@MariusVolkhart

Copy link
Copy Markdown
Member

No description provided.

Fixes #23. Upstream v1.37.0 restructured the contrib modules, which broke
the patch series in three ways:

- Upstream added its own `temporal-opentelemetry` contrib module (a Tally->
  OTel metrics/stats reporter built on the opentracing-shim). It collides by
  name with the fork's native OTel *tracing* module. Renamed the fork module
  to `temporal-opentelemetry-tracing` so upstream and fork can never clash
  again on a bump; upstream's variant stays excluded (it needs the excluded
  temporal-opentracing and only does metrics, which we get natively).

- The fork now ships `temporal-workflowstreams`. Enabling it under the Serde-
  only stack needed more than an include: its public-field wire DTOs get
  @Serdeable + @introspected(accessKind=FIELD) (Serde drops public fields
  otherwise), and its build.gradle needs the Serde annotation processor or
  @Serdeable compiles but generates no introspection (runtime SerdeException).

- New contrib modules temporal-aws-lambda, plus upstream's temporal-
  opentelemetry, are excluded. aws-lambda hard-depends on temporal-envconfig
  (jackson-toml) and upstream temporal-opentelemetry (opentracing); resolving
  those is deferred.

settings.gradle/temporal-bom reconciled for the new module layout;
LocalActivityMarkerMetadata re-Serde-annotated onto upstream's javadoc change.

Verified on JDK 25: :temporal-workflowstreams:test (37/37),
:temporal-opentelemetry-tracing:test, and the SDK serde suites all pass;
spotlessCheck clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@MariusVolkhart
Marius Volkhart (MariusVolkhart) merged commit caf170a into main Jul 17, 2026
5 checks passed
@MariusVolkhart
Marius Volkhart (MariusVolkhart) deleted the rebase-v1.37.0 branch July 17, 2026 01:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant