Skip to content

Commit 0aa8c41

Browse files
cschleidencschleiden
committed
Split context propagation package
1 parent dc3e2e1 commit 0aa8c41

File tree

16 files changed

+42
-32
lines changed

16 files changed

+42
-32
lines changed

‎backend/backend.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"log/slog"
77

88
"github.com/cschleiden/go-workflows/backend/history"
9+
"github.com/cschleiden/go-workflows/contextpropagation"
910
"github.com/cschleiden/go-workflows/converter"
1011
"github.com/cschleiden/go-workflows/core"
11-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
1212
"github.com/cschleiden/go-workflows/metrics"
1313
"github.com/cschleiden/go-workflows/workflow"
1414
"go.opentelemetry.io/otel/trace"

‎backend/mock_Backend.go‎

Lines changed: 1 addition & 1 deletion
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/cschleiden/go-workflows/backend"
1515
"github.com/cschleiden/go-workflows/backend/history"
1616
"github.com/cschleiden/go-workflows/backend/metadata"
17+
"github.com/cschleiden/go-workflows/contextpropagation"
1718
"github.com/cschleiden/go-workflows/converter"
1819
"github.com/cschleiden/go-workflows/core"
19-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
2020
"github.com/cschleiden/go-workflows/internal/metrickeys"
2121
"github.com/cschleiden/go-workflows/metrics"
2222
"github.com/cschleiden/go-workflows/workflow"

‎backend/options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"log/slog"
55
"time"
66

7+
"github.com/cschleiden/go-workflows/contextpropagation"
78
"github.com/cschleiden/go-workflows/converter"
8-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
99
mi "github.com/cschleiden/go-workflows/internal/metrics"
1010
"github.com/cschleiden/go-workflows/internal/tracing"
1111
"github.com/cschleiden/go-workflows/metrics"

‎backend/redis/redis.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/cschleiden/go-workflows/backend"
1010
"github.com/cschleiden/go-workflows/backend/history"
11+
"github.com/cschleiden/go-workflows/contextpropagation"
1112
"github.com/cschleiden/go-workflows/converter"
1213
"github.com/cschleiden/go-workflows/core"
13-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
1414
"github.com/cschleiden/go-workflows/internal/metrickeys"
1515
"github.com/cschleiden/go-workflows/metrics"
1616
"github.com/redis/go-redis/v9"

‎backend/sqlite/sqlite.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/cschleiden/go-workflows/backend"
1515
"github.com/cschleiden/go-workflows/backend/history"
1616
"github.com/cschleiden/go-workflows/backend/metadata"
17+
"github.com/cschleiden/go-workflows/contextpropagation"
1718
"github.com/cschleiden/go-workflows/converter"
1819
"github.com/cschleiden/go-workflows/core"
19-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
2020
"github.com/cschleiden/go-workflows/internal/metrickeys"
2121
"github.com/cschleiden/go-workflows/metrics"
2222
"github.com/cschleiden/go-workflows/workflow"

‎contextpropagation/context_propagator.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package contextpropagation
2+
3+
import (
4+
"context"
5+
6+
"github.com/cschleiden/go-workflows/backend/metadata"
7+
"github.com/cschleiden/go-workflows/internal/sync"
8+
)
9+
10+
type ContextPropagator interface {
11+
Inject(context.Context, *metadata.WorkflowMetadata) error
12+
Extract(context.Context, *metadata.WorkflowMetadata) (context.Context, error)
13+
14+
InjectFromWorkflow(sync.Context, *metadata.WorkflowMetadata) error
15+
ExtractToWorkflow(sync.Context, *metadata.WorkflowMetadata) (sync.Context, error)
16+
}

‎internal/activity/executor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/cschleiden/go-workflows/backend"
1111
"github.com/cschleiden/go-workflows/backend/history"
12+
"github.com/cschleiden/go-workflows/contextpropagation"
1213
"github.com/cschleiden/go-workflows/converter"
1314
"github.com/cschleiden/go-workflows/internal/args"
14-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
1515
"github.com/cschleiden/go-workflows/internal/payload"
1616
"github.com/cschleiden/go-workflows/internal/workflow"
1717
"github.com/cschleiden/go-workflows/internal/workflowerrors"

‎internal/contextpropagation/context_propagator.go‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,11 @@ import (
44
"context"
55

66
"github.com/cschleiden/go-workflows/backend/metadata"
7+
"github.com/cschleiden/go-workflows/contextpropagation"
78
"github.com/cschleiden/go-workflows/internal/sync"
89
)
910

10-
type ContextPropagator interface {
11-
Inject(context.Context, *metadata.WorkflowMetadata) error
12-
Extract(context.Context, *metadata.WorkflowMetadata) (context.Context, error)
13-
14-
InjectFromWorkflow(sync.Context, *metadata.WorkflowMetadata) error
15-
ExtractToWorkflow(sync.Context, *metadata.WorkflowMetadata) (sync.Context, error)
16-
}
17-
18-
func Inject(ctx context.Context, metadata *metadata.WorkflowMetadata, propagators []ContextPropagator) error {
11+
func Inject(ctx context.Context, metadata *metadata.WorkflowMetadata, propagators []contextpropagation.ContextPropagator) error {
1912
for _, propagator := range propagators {
2013
err := propagator.Inject(ctx, metadata)
2114
if err != nil {
@@ -26,7 +19,7 @@ func Inject(ctx context.Context, metadata *metadata.WorkflowMetadata, propagator
2619
return nil
2720
}
2821

29-
func Extract(ctx context.Context, metadata *metadata.WorkflowMetadata, propagators []ContextPropagator) (context.Context, error) {
22+
func Extract(ctx context.Context, metadata *metadata.WorkflowMetadata, propagators []contextpropagation.ContextPropagator) (context.Context, error) {
3023
for _, propagator := range propagators {
3124
var err error
3225
ctx, err = propagator.Extract(ctx, metadata)
@@ -38,7 +31,7 @@ func Extract(ctx context.Context, metadata *metadata.WorkflowMetadata, propagato
3831
return ctx, nil
3932
}
4033

41-
func InjectFromWorkflow(ctx sync.Context, metadata *metadata.WorkflowMetadata, propagators []ContextPropagator) error {
34+
func InjectFromWorkflow(ctx sync.Context, metadata *metadata.WorkflowMetadata, propagators []contextpropagation.ContextPropagator) error {
4235
for _, propagator := range propagators {
4336
err := propagator.InjectFromWorkflow(ctx, metadata)
4437
if err != nil {
@@ -49,7 +42,7 @@ func InjectFromWorkflow(ctx sync.Context, metadata *metadata.WorkflowMetadata, p
4942
return nil
5043
}
5144

52-
func ExtractToWorkflow(ctx sync.Context, metadata *metadata.WorkflowMetadata, propagators []ContextPropagator) (sync.Context, error) {
45+
func ExtractToWorkflow(ctx sync.Context, metadata *metadata.WorkflowMetadata, propagators []contextpropagation.ContextPropagator) (sync.Context, error) {
5346
for _, propagator := range propagators {
5447
var err error
5548
ctx, err = propagator.ExtractToWorkflow(ctx, metadata)
@@ -65,12 +58,12 @@ type propagatorsKey int
6558

6659
var propagatorsCtxKey propagatorsKey
6760

68-
func WithPropagators(ctx sync.Context, propagators []ContextPropagator) sync.Context {
61+
func WithPropagators(ctx sync.Context, propagators []contextpropagation.ContextPropagator) sync.Context {
6962
return sync.WithValue(ctx, propagatorsCtxKey, propagators)
7063
}
7164

72-
func Propagators(ctx sync.Context) []ContextPropagator {
73-
propagators, ok := ctx.Value(propagatorsCtxKey).([]ContextPropagator)
65+
func Propagators(ctx sync.Context) []contextpropagation.ContextPropagator {
66+
propagators, ok := ctx.Value(propagatorsCtxKey).([]contextpropagation.ContextPropagator)
7467
if !ok {
7568
return nil
7669
}

‎internal/tracing/tracing.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55

66
"github.com/cschleiden/go-workflows/backend/metadata"
7-
"github.com/cschleiden/go-workflows/internal/contextpropagation"
7+
"github.com/cschleiden/go-workflows/contextpropagation"
88
"github.com/cschleiden/go-workflows/internal/sync"
99
"github.com/cschleiden/go-workflows/internal/workflowtracer"
1010
"go.opentelemetry.io/otel/propagation"

0 commit comments

Comments
 (0)