Skip to content

Commit 7905d9d

Browse files
joel-riekejoel-rieke
authored
Merge pull request #99 from trimble-oss/v1.20.7_franz_update
V1.20.7 franz update
2 parents bfaba87 + d9f5cc6 commit 7905d9d

7 files changed

Lines changed: 116 additions & 28 deletions

File tree

‎buildopts/kernelopts/buildopts.go‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package kernelopts
2+
3+
import "os"
4+
5+
type Option func(*OptionsBuilder)
6+
7+
type OptionsBuilder struct {
8+
IsKernel func() bool
9+
IsKernelZ func() bool
10+
}
11+
12+
func LoadOptions() Option {
13+
return func(optionsBuilder *OptionsBuilder) {
14+
optionsBuilder.IsKernel = IsKernel
15+
optionsBuilder.IsKernelZ = IsKernelZ
16+
}
17+
}
18+
19+
var BuildOptions *OptionsBuilder
20+
21+
func NewOptionsBuilder(opts ...Option) {
22+
BuildOptions = &OptionsBuilder{}
23+
for _, opt := range opts {
24+
opt(BuildOptions)
25+
}
26+
}
27+
28+
func init() {
29+
// Initialize BuildOptions first
30+
NewOptionsBuilder(LoadOptions())
31+
32+
// Redirect stderr to log file for kernelz mode to keep TUI clean
33+
if IsKernelZ() {
34+
logFile := "./trcsh.log"
35+
f, err := os.OpenFile(logFile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o600)
36+
if err == nil {
37+
os.Stderr = f
38+
}
39+
}
40+
}

‎buildopts/kernelopts/options_trcshk.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//go:build trcshkernel && !trcshkernelz
2+
// +build trcshkernel,!trcshkernelz
3+
4+
package kernelopts
5+
6+
func IsKernel() bool {
7+
return true
8+
}
9+
10+
func IsKernelZ() bool {
11+
return false
12+
}

‎buildopts/kernelopts/options_trcshk_common.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//go:build !trcshkernel && !trcshkernelz
2+
// +build !trcshkernel,!trcshkernelz
3+
4+
package kernelopts
5+
6+
func IsKernel() bool {
7+
return false
8+
}
9+
10+
func IsKernelZ() bool {
11+
return false
12+
}

‎buildopts/kernelopts/options_trcshz.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//go:build trcshkernelz
2+
// +build trcshkernelz
3+
4+
package kernelopts
5+
6+
func IsKernel() bool {
7+
return true
8+
}
9+
10+
func IsKernelZ() bool {
11+
return true
12+
}
13+
14+
func Init(pluginName string, properties *map[string]any) {
15+
// Kernel does not have any compiled plugins by default
16+
}

‎flow/process_genericflow.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"time"
99

10+
"github.com/trimble-oss/tierceron-core/v2/buildopts/kernelopts"
1011
prod "github.com/trimble-oss/tierceron-core/v2/prod"
11-
"github.com/trimble-oss/tierceron/buildopts/kernelopts"
1212
)
1313

1414
// CompareRows returns true when equal, false otherwise

‎go.mod‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
module github.com/trimble-oss/tierceron-core/v2
22

3-
go 1.25.7
3+
go 1.26.0
44

55
require (
66
github.com/glycerine/bchan v0.0.0-20170210221909-ad30cd867e1c
77
github.com/go-git/go-billy/v5 v5.6.2
88
github.com/orcaman/concurrent-map/v2 v2.0.1
9-
github.com/trimble-oss/tierceron-nute-core v1.0.3
10-
golang.org/x/sys v0.38.0
9+
github.com/trimble-oss/tierceron-nute-core v1.0.4
10+
golang.org/x/sys v0.41.0
1111
google.golang.org/grpc v1.72.1
1212
google.golang.org/protobuf v1.36.6
1313
)
1414

1515
require (
16-
github.com/google/go-cmp v0.7.0 // indirect
17-
go.opentelemetry.io/otel v1.35.0 // indirect
18-
golang.org/x/net v0.47.0 // indirect
19-
golang.org/x/text v0.31.0 // indirect
16+
golang.org/x/net v0.49.0 // indirect
17+
golang.org/x/text v0.34.0 // indirect
2018
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
2119
)
20+
21+
replace (
22+
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.40.0
23+
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.40.0
24+
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.40.0
25+
go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v1.40.0
26+
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.40.0
27+
)

‎go.sum‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
2+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
13
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
24
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
35
github.com/glycerine/bchan v0.0.0-20170210221909-ad30cd867e1c h1:HSgdiDVw61eratEUy9GFtolPa00KZD+tdpJfKGE4xlQ=
@@ -10,8 +12,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
1012
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
1113
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
1214
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
13-
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
14-
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
15+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
16+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1517
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
1618
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1719
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -26,26 +28,26 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
2628
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
2729
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
2830
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
29-
github.com/trimble-oss/tierceron-nute-core v1.0.3 h1:wG3bj1MtZk09bPAb0ymOfJL5NlCjxAOUzzJ7Igyid3Y=
30-
github.com/trimble-oss/tierceron-nute-core v1.0.3/go.mod h1:2M/uT8pm7AJMzRxsasQsQdjXvDXbXpBPCqd3ghb03ss=
31+
github.com/trimble-oss/tierceron-nute-core v1.0.4 h1:SbX2QZzjzZqhJJeHWiNyH6nCri4AKV/i1cOEJVb3Vug=
32+
github.com/trimble-oss/tierceron-nute-core v1.0.4/go.mod h1:rgTSHO4RgVHCK+/RbZuv/d7/EFTSmeFRK4Ek9IUuECY=
3133
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
3234
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
33-
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
34-
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
35-
go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
36-
go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
37-
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
38-
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
39-
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
40-
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
41-
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
42-
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
43-
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
44-
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
45-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
46-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
47-
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
48-
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
35+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
36+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
37+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
38+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
39+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
40+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
41+
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
42+
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
43+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
44+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
45+
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
46+
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
47+
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
48+
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
49+
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
50+
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
4951
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
5052
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
5153
google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=

0 commit comments

Comments
 (0)