Skip to content

Commit

Permalink
feat: Add tracing prefix
Browse files Browse the repository at this point in the history
Signed-off-by: Guilhem Fanton <guilhem.fanton@gmail.com>
  • Loading branch information
gfanton committed Jun 10, 2020
1 parent cc9bb3b commit a3ca41f
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 9 deletions.
23 changes: 21 additions & 2 deletions js/packages/components/Onboarding.tsx
Expand Up @@ -338,7 +338,15 @@ const CreateYourAccount: React.FC<{
}> = ({ next }) => {
const [name, setName] = useState('')
const [nodeConfig, setNodeConfig] = useState(
__DEV__ ? defaultExternalBridgeConfig : defaultEmbeddedConfig,
__DEV__
? defaultExternalBridgeConfig
: {
...defaultEmbeddedConfig,
opts: {
...defaultEmbeddedConfig.opts,
tracingPrefix: name,
},
},
)
const [{ text, padding, margin, background, border }] = useStyles()
const createAccount = Chat.useAccountCreate()
Expand All @@ -362,7 +370,18 @@ const CreateYourAccount: React.FC<{
<TextInput
autoCapitalize='none'
autoCorrect={false}
onChangeText={setName}
onChangeText={(name) => {
setName(name)
if (nodeConfig.type === 'embedded') {
setNodeConfig({
...nodeConfig,
opts: {
...nodeConfig.opts,
tracingPrefix: name,
},
})
}
}}
placeholder={t('onboarding.create-account.placeholder')}
style={[
margin.top.medium,
Expand Down
23 changes: 16 additions & 7 deletions js/packages/go-bridge/ios/GoBridge.swift
Expand Up @@ -9,6 +9,14 @@
import Foundation
import Bertybridge

extension NSDictionary {
func get(bool: String, defaultValue: Bool = false) -> Bool { return self[bool] as? Bool ?? defaultValue }
func get(string: String, defaultValue: String = "") -> String { return self[string] as? String ?? defaultValue }
func get(int: String, defaultValue: Int = 0) -> Int { return self[int] as? Int ?? defaultValue }
func get(array: String, defaultValue: NSArray = []) -> NSArray { return self[array] as? NSArray ?? defaultValue }
func get(object: NSDictionary, defaultValue: NSDictionary = [:]) -> NSDictionary { return self[object] as? NSDictionary ?? defaultValue }
}

@objc(GoBridge)
class GoBridge: NSObject {
static let rnlogger = LoggerDriver("tech.berty", "react")
Expand Down Expand Up @@ -65,12 +73,13 @@ class GoBridge: NSObject {
throw NSError(domain: "already started", code: 1)
}

// get opts
let optTracing = opts["tracing"] as? Bool ?? false
let optPersistance = opts["persistance"] as? Bool ?? false
let optLog = opts["logLevel"] as? String ?? "info"
let optGrpcListeners = opts["grpcListeners"] as? NSArray ?? ["/ip4/127.0.0.1/tcp/0/grpcws"]
let optSwarmListeners = opts["swarmListeners"] as? NSArray ?? ["/ip4/0.0.0.0/tcp/0", "/ip6/0.0.0.0/tcp/0"]
// gather opts
let optPersistance = opts.get(bool: "persistance")
let optLog = opts.get(string: "logLevel", defaultValue: "info")
let optGrpcListeners = opts.get(array: "grpcListeners", defaultValue: ["/ip4/127.0.0.1/tcp/0/grpcws"])
let optSwarmListeners = opts.get(array: "swarmListeners", defaultValue: ["/ip4/0.0.0.0/tcp/0", "/ip6/0.0.0.0/tcp/0"])
let optTracing = opts.get(bool: "tracing")
let optTracingPrefix = opts.get(string: "tracingPrefix")

var err: NSError?
guard let config = BertybridgeNewProtocolConfig() else {
Expand Down Expand Up @@ -115,7 +124,7 @@ class GoBridge: NSObject {

if optTracing {
config.enableTracing()
config.setTracingPrefix("changeme")
config.setTracingPrefix(optTracingPrefix)
}

let bridgeProtocol = BertybridgeNewProtocolBridge(config, &err)
Expand Down
1 change: 1 addition & 0 deletions js/packages/go-bridge/types.ts
Expand Up @@ -11,6 +11,7 @@ export type GoBridgeOpts = {
persistance?: boolean
logLevel?: GoLogLevel
tracing?: boolean
tracingPrefix?: string
}

export type GoLoggerOpts = {
Expand Down
1 change: 1 addition & 0 deletions js/packages/store/protocol/client.ts
Expand Up @@ -303,6 +303,7 @@ export const defaultBridgeOpts = {
logLevel: 'debug',
persistance: true,
tracing: true,
tracingPrefix: '',
}

export const transactions: Transactions = {
Expand Down

0 comments on commit a3ca41f

Please sign in to comment.