Skip to content

Commit 9c81e75

Browse files
cschleidencschleiden
committed
Eliminate top-level context propagator package
1 parent 7600e70 commit 9c81e75

29 files changed

+99
-170
lines changed

‎backend/backend.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/cschleiden/go-workflows/backend/converter"
99
"github.com/cschleiden/go-workflows/backend/history"
1010
"github.com/cschleiden/go-workflows/backend/metrics"
11-
"github.com/cschleiden/go-workflows/contextpropagation"
1211
"github.com/cschleiden/go-workflows/core"
1312
"github.com/cschleiden/go-workflows/workflow"
1413
"go.opentelemetry.io/otel/trace"
@@ -83,5 +82,5 @@ type Backend interface {
8382
Converter() converter.Converter
8483

8584
// ContextPropagators returns the configured context propagators for the backend
86-
ContextPropagators() []contextpropagation.ContextPropagator
85+
ContextPropagators() []workflow.ContextPropagator
8786
}

‎backend/mock_Backend.go‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/mysql/mysql.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/cschleiden/go-workflows/backend/history"
1717
"github.com/cschleiden/go-workflows/backend/metadata"
1818
"github.com/cschleiden/go-workflows/backend/metrics"
19-
"github.com/cschleiden/go-workflows/contextpropagation"
2019
"github.com/cschleiden/go-workflows/core"
2120
"github.com/cschleiden/go-workflows/internal/metrickeys"
2221
"github.com/cschleiden/go-workflows/workflow"
@@ -79,7 +78,7 @@ func (b *mysqlBackend) Converter() converter.Converter {
7978
return b.options.Converter
8079
}
8180

82-
func (b *mysqlBackend) ContextPropagators() []contextpropagation.ContextPropagator {
81+
func (b *mysqlBackend) ContextPropagators() []workflow.ContextPropagator {
8382
return b.options.ContextPropagators
8483
}
8584

‎backend/options.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/cschleiden/go-workflows/backend/converter"
88
"github.com/cschleiden/go-workflows/backend/metrics"
9-
"github.com/cschleiden/go-workflows/contextpropagation"
109
mi "github.com/cschleiden/go-workflows/internal/metrics"
1110
"github.com/cschleiden/go-workflows/internal/tracing"
1211
"github.com/cschleiden/go-workflows/workflow"
@@ -25,7 +24,7 @@ type Options struct {
2524
Converter converter.Converter
2625

2726
// ContextPropagators is a list of context propagators to use for passing context into workflows and activities.
28-
ContextPropagators []contextpropagation.ContextPropagator
27+
ContextPropagators []workflow.ContextPropagator
2928

3029
StickyTimeout time.Duration
3130

@@ -50,7 +49,7 @@ var DefaultOptions Options = Options{
5049
TracerProvider: trace.NewNoopTracerProvider(),
5150
Converter: converter.DefaultConverter,
5251

53-
ContextPropagators: []contextpropagation.ContextPropagator{&tracing.TracingContextPropagator{}},
52+
ContextPropagators: []workflow.ContextPropagator{&tracing.TracingContextPropagator{}},
5453
}
5554

5655
type BackendOption func(*Options)

‎backend/redis/redis.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/cschleiden/go-workflows/backend/converter"
1111
"github.com/cschleiden/go-workflows/backend/history"
1212
"github.com/cschleiden/go-workflows/backend/metrics"
13-
"github.com/cschleiden/go-workflows/contextpropagation"
1413
"github.com/cschleiden/go-workflows/core"
1514
"github.com/cschleiden/go-workflows/internal/metrickeys"
15+
"github.com/cschleiden/go-workflows/workflow"
1616
"github.com/redis/go-redis/v9"
1717
"go.opentelemetry.io/otel/trace"
1818
)
@@ -102,7 +102,7 @@ func (rb *redisBackend) Converter() converter.Converter {
102102
return rb.options.Converter
103103
}
104104

105-
func (rb *redisBackend) ContextPropagators() []contextpropagation.ContextPropagator {
105+
func (rb *redisBackend) ContextPropagators() []workflow.ContextPropagator {
106106
return rb.options.ContextPropagators
107107
}
108108

‎backend/sqlite/sqlite.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/cschleiden/go-workflows/backend/history"
1717
"github.com/cschleiden/go-workflows/backend/metadata"
1818
"github.com/cschleiden/go-workflows/backend/metrics"
19-
"github.com/cschleiden/go-workflows/contextpropagation"
2019
"github.com/cschleiden/go-workflows/core"
2120
"github.com/cschleiden/go-workflows/internal/metrickeys"
2221
"github.com/cschleiden/go-workflows/workflow"
@@ -88,7 +87,7 @@ func (sb *sqliteBackend) Converter() converter.Converter {
8887
return sb.options.Converter
8988
}
9089

91-
func (sb *sqliteBackend) ContextPropagators() []contextpropagation.ContextPropagator {
90+
func (sb *sqliteBackend) ContextPropagators() []workflow.ContextPropagator {
9291
return sb.options.ContextPropagators
9392
}
9493

‎contextpropagation/contextpropagator.go‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎internal/activity/executor.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"github.com/cschleiden/go-workflows/backend/converter"
1212
"github.com/cschleiden/go-workflows/backend/history"
1313
"github.com/cschleiden/go-workflows/backend/payload"
14-
"github.com/cschleiden/go-workflows/contextpropagation"
1514
"github.com/cschleiden/go-workflows/internal/args"
1615
"github.com/cschleiden/go-workflows/internal/log"
1716
"github.com/cschleiden/go-workflows/internal/workflow"
1817
"github.com/cschleiden/go-workflows/internal/workflowerrors"
18+
wf "github.com/cschleiden/go-workflows/workflow"
1919
"go.opentelemetry.io/otel/attribute"
2020
"go.opentelemetry.io/otel/trace"
2121
)
@@ -24,11 +24,11 @@ type Executor struct {
2424
logger *slog.Logger
2525
tracer trace.Tracer
2626
converter converter.Converter
27-
propagators []contextpropagation.ContextPropagator
27+
propagators []wf.ContextPropagator
2828
r *workflow.Registry
2929
}
3030

31-
func NewExecutor(logger *slog.Logger, tracer trace.Tracer, converter converter.Converter, propagators []contextpropagation.ContextPropagator, r *workflow.Registry) *Executor {
31+
func NewExecutor(logger *slog.Logger, tracer trace.Tracer, converter converter.Converter, propagators []wf.ContextPropagator, r *workflow.Registry) *Executor {
3232
return &Executor{
3333
logger: logger,
3434
tracer: tracer,

‎internal/contextpropagation/context_propagator.go‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎internal/contextvalue/contextpropagator.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package contextvalue
2+
3+
type PropagatorsKey int
4+
5+
var PropagatorsCtxKey PropagatorsKey

0 commit comments

Comments
 (0)