Bladeren bron

remove stackimpact

tags/v0.12.0
Shivaram Lingamneni 5 jaren geleden
bovenliggende
commit
a2c2419084
5 gewijzigde bestanden met toevoegingen van 58 en 54 verwijderingen
  1. 58
    16
      Gopkg.lock
  2. 0
    4
      Gopkg.toml
  3. 0
    8
      irc/config.go
  4. 0
    15
      oragono.go
  5. 0
    11
      oragono.yaml

+ 58
- 16
Gopkg.lock Bestand weergeven

@@ -2,132 +2,157 @@
2 2
 
3 3
 
4 4
 [[projects]]
5
+  digest = "1:1bd4d273de93fce29ca3636145ccfcb932754f56e4c099297319e677e89f658d"
5 6
   name = "code.cloudfoundry.org/bytefmt"
6 7
   packages = ["."]
8
+  pruneopts = ""
7 9
   revision = "cbe033486cf0620d3bb77d8ef7f22ab346ad3628"
8 10
 
9 11
 [[projects]]
10 12
   branch = "master"
13
+  digest = "1:20da7140359cab99772431cbeb195bd8cbe76312fcf6509fd8125cf91ab2847b"
11 14
   name = "github.com/docopt/docopt-go"
12 15
   packages = ["."]
16
+  pruneopts = ""
13 17
   revision = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"
14 18
 
15 19
 [[projects]]
16 20
   branch = "master"
21
+  digest = "1:5d1f0cdebbc2a5237b572fa539bdb0aefea36780cdc1dbeda3b2f5d39f8f375d"
17 22
   name = "github.com/goshuirc/e-nfa"
18 23
   packages = ["."]
24
+  pruneopts = ""
19 25
   revision = "7071788e394065e6456458a5e9cb503cad545154"
20 26
 
21 27
 [[projects]]
22 28
   branch = "master"
29
+  digest = "1:d7ff716c49f33735c9e25e11b67e70f9eac7eb6c21b9806b0552b52541a568f5"
23 30
   name = "github.com/goshuirc/irc-go"
24 31
   packages = [
25 32
     "ircfmt",
26 33
     "ircmatch",
27
-    "ircmsg"
34
+    "ircmsg",
28 35
   ]
36
+  pruneopts = ""
29 37
   revision = "8d136c4f92871c1c132bf702022363add479291b"
30 38
 
31 39
 [[projects]]
32 40
   branch = "master"
41
+  digest = "1:5be6259a2ab7350284d8c25b8df78153dcca360247be48ea7c55be37689802f4"
33 42
   name = "github.com/mattn/go-colorable"
34 43
   packages = ["."]
44
+  pruneopts = ""
35 45
   revision = "7dc3415be66d7cc68bf0182f35c8d31f8d2ad8a7"
36 46
 
37 47
 [[projects]]
48
+  digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c"
38 49
   name = "github.com/mattn/go-isatty"
39 50
   packages = ["."]
51
+  pruneopts = ""
40 52
   revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
41 53
   version = "v0.0.3"
42 54
 
43 55
 [[projects]]
44 56
   branch = "master"
57
+  digest = "1:50416da10e189bc201e122e20078fb8e680a439cbdd24aaece06c434b4415b60"
45 58
   name = "github.com/mgutz/ansi"
46 59
   packages = ["."]
60
+  pruneopts = ""
47 61
   revision = "9520e82c474b0a04dd04f8a40959027271bab992"
48 62
 
49 63
 [[projects]]
50 64
   branch = "master"
65
+  digest = "1:2251e6a17ea4a6eaa708882a1cda837aae3e425edbb190ef39b761ecf15a5c3d"
51 66
   name = "github.com/oragono/go-ident"
52 67
   packages = ["."]
68
+  pruneopts = ""
53 69
   revision = "337fed0fd21ad538725cfcb55053ea4cf8056abc"
54 70
 
55 71
 [[projects]]
56 72
   branch = "master"
57
-  name = "github.com/stackimpact/stackimpact-go"
58
-  packages = [
59
-    ".",
60
-    "internal",
61
-    "internal/pprof/profile"
62
-  ]
63
-  revision = "8b5b02c181e477dafcf505342d8a79b5c8241da7"
64
-
65
-[[projects]]
66
-  branch = "master"
73
+  digest = "1:b28f2f9253cbb1bf2bcb3c0ab7421d2f88a245386199a6668b0a66eb09ce3e1f"
67 74
   name = "github.com/tidwall/btree"
68 75
   packages = ["."]
76
+  pruneopts = ""
69 77
   revision = "9876f1454cf0993a53d74c27196993e345f50dd1"
70 78
 
71 79
 [[projects]]
80
+  digest = "1:18342f164260096848ceff7c53cf797dbc1556d8161ad51cfc22281916209a5a"
72 81
   name = "github.com/tidwall/buntdb"
73 82
   packages = ["."]
83
+  pruneopts = ""
74 84
   revision = "2da7c106683f522198cdf55ed8db42b374de50d7"
75 85
   version = "v1.0.0"
76 86
 
77 87
 [[projects]]
88
+  digest = "1:82fa3d995465f05e4c5e7f44a94d084b84a547ad77e41458fe9ec0877d04dced"
78 89
   name = "github.com/tidwall/gjson"
79 90
   packages = ["."]
91
+  pruneopts = ""
80 92
   revision = "87033efcaec6215741137e8ca61952c53ef2685d"
81 93
   version = "v1.0.6"
82 94
 
83 95
 [[projects]]
84 96
   branch = "master"
97
+  digest = "1:bf59f997bab72b8ecd044aed35d706edb6abd6128afe0502c94398b2374f1f3f"
85 98
   name = "github.com/tidwall/grect"
86 99
   packages = ["."]
100
+  pruneopts = ""
87 101
   revision = "ba9a043346eba55344e40d66a5e74cfda3a9d293"
88 102
 
89 103
 [[projects]]
90 104
   branch = "master"
105
+  digest = "1:4db4f92bb9cb04cfc4fccb36aba2598b02a988008c4cc0692b241214ad8ac96e"
91 106
   name = "github.com/tidwall/match"
92 107
   packages = ["."]
108
+  pruneopts = ""
93 109
   revision = "1731857f09b1f38450e2c12409748407822dc6be"
94 110
 
95 111
 [[projects]]
96 112
   branch = "master"
113
+  digest = "1:5d9d865e55b95f001e52a7f5d1f812e8a80f0f05d5b04ede006f24206ebba33c"
97 114
   name = "github.com/tidwall/rtree"
98 115
   packages = [
99 116
     ".",
100
-    "base"
117
+    "base",
101 118
   ]
119
+  pruneopts = ""
102 120
   revision = "6cd427091e0e662cb4f8e2c9eb1a41e1c46ff0d3"
103 121
 
104 122
 [[projects]]
105 123
   branch = "master"
124
+  digest = "1:261a5770e68d10884a6d334396842d69ddb57ac5ecef60057eb5bce6f4bc7512"
106 125
   name = "github.com/tidwall/tinyqueue"
107 126
   packages = ["."]
127
+  pruneopts = ""
108 128
   revision = "1feaf062ef04a231c9126f99a68eaa579fd0e390"
109 129
 
110 130
 [[projects]]
111 131
   branch = "master"
132
+  digest = "1:295363031beef7eb063d53138806b43f26c38d8a3e2543324ce2af3c766069de"
112 133
   name = "golang.org/x/crypto"
113 134
   packages = [
114 135
     "bcrypt",
115 136
     "blowfish",
116
-    "ssh/terminal"
137
+    "ssh/terminal",
117 138
   ]
139
+  pruneopts = ""
118 140
   revision = "5119cf507ed5294cc409c092980c7497ee5d6fd2"
119 141
 
120 142
 [[projects]]
121 143
   branch = "master"
144
+  digest = "1:407b5f905024dd94ee08c1777fabb380fb3d380f92a7f7df2592be005337eeb3"
122 145
   name = "golang.org/x/sys"
123 146
   packages = [
124 147
     "unix",
125
-    "windows"
148
+    "windows",
126 149
   ]
150
+  pruneopts = ""
127 151
   revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd"
128 152
 
129 153
 [[projects]]
130 154
   branch = "master"
155
+  digest = "1:31985a0ed491dba5ba7fe92e18be008acd92ca9435ed9b35b06f3e6c00fd82cb"
131 156
   name = "golang.org/x/text"
132 157
   packages = [
133 158
     "cases",
@@ -148,19 +173,36 @@
148 173
     "unicode/cldr",
149 174
     "unicode/norm",
150 175
     "unicode/rangetable",
151
-    "width"
176
+    "width",
152 177
   ]
178
+  pruneopts = ""
153 179
   revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1"
154 180
 
155 181
 [[projects]]
156 182
   branch = "v2"
183
+  digest = "1:4b4e5848dfe7f316f95f754df071bebfb40cf4482da62e17e7e1aebdf11f4918"
157 184
   name = "gopkg.in/yaml.v2"
158 185
   packages = ["."]
186
+  pruneopts = ""
159 187
   revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
160 188
 
161 189
 [solve-meta]
162 190
   analyzer-name = "dep"
163 191
   analyzer-version = 1
164
-  inputs-digest = "1f6e6db999e9e75b04aee6f0018be1557848f8248a28cf21783188fdeb866718"
192
+  input-imports = [
193
+    "code.cloudfoundry.org/bytefmt",
194
+    "github.com/docopt/docopt-go",
195
+    "github.com/goshuirc/irc-go/ircfmt",
196
+    "github.com/goshuirc/irc-go/ircmatch",
197
+    "github.com/goshuirc/irc-go/ircmsg",
198
+    "github.com/mattn/go-colorable",
199
+    "github.com/mgutz/ansi",
200
+    "github.com/oragono/go-ident",
201
+    "github.com/tidwall/buntdb",
202
+    "golang.org/x/crypto/bcrypt",
203
+    "golang.org/x/crypto/ssh/terminal",
204
+    "golang.org/x/text/secure/precis",
205
+    "gopkg.in/yaml.v2",
206
+  ]
165 207
   solver-name = "gps-cdcl"
166 208
   solver-version = 1

+ 0
- 4
Gopkg.toml Bestand weergeven

@@ -75,10 +75,6 @@
75 75
   branch = "master"
76 76
   name = "github.com/mgutz/ansi"
77 77
 
78
-[[dependencies]]
79
-  branch = "master"
80
-  name = "github.com/stackimpact/stackimpact-go"
81
-
82 78
 [[dependencies]]
83 79
   branch = "master"
84 80
   name = "github.com/tidwall/buntdb"

+ 0
- 8
irc/config.go Bestand weergeven

@@ -200,13 +200,6 @@ func (sts *STSConfig) Value() string {
200 200
 	return val
201 201
 }
202 202
 
203
-// StackImpactConfig is the config used for StackImpact's profiling.
204
-type StackImpactConfig struct {
205
-	Enabled  bool
206
-	AgentKey string `yaml:"agent-key"`
207
-	AppName  string `yaml:"app-name"`
208
-}
209
-
210 203
 type FakelagConfig struct {
211 204
 	Enabled           bool
212 205
 	Window            time.Duration
@@ -273,7 +266,6 @@ type Config struct {
273 266
 	Debug struct {
274 267
 		RecoverFromErrors *bool   `yaml:"recover-from-errors"`
275 268
 		PprofListener     *string `yaml:"pprof-listener"`
276
-		StackImpact       StackImpactConfig
277 269
 	}
278 270
 
279 271
 	Limits Limits

+ 0
- 15
oragono.go Bestand weergeven

@@ -18,7 +18,6 @@ import (
18 18
 	"github.com/oragono/oragono/irc/logger"
19 19
 	"github.com/oragono/oragono/irc/mkcerts"
20 20
 	"github.com/oragono/oragono/irc/passwd"
21
-	stackimpact "github.com/stackimpact/stackimpact-go"
22 21
 	"golang.org/x/crypto/ssh/terminal"
23 22
 )
24 23
 
@@ -127,20 +126,6 @@ Options:
127 126
 			irc.Ver = fmt.Sprintf("%s-%s", irc.Ver, commit)
128 127
 		}
129 128
 
130
-		// profiling
131
-		if config.Debug.StackImpact.Enabled {
132
-			if config.Debug.StackImpact.AgentKey == "" || config.Debug.StackImpact.AppName == "" {
133
-				logman.Error("startup", "Could not start StackImpact - agent-key or app-name are undefined")
134
-				return
135
-			}
136
-
137
-			agent := stackimpact.NewAgent()
138
-			agent.Start(stackimpact.Options{AgentKey: config.Debug.StackImpact.AgentKey, AppName: config.Debug.StackImpact.AppName})
139
-			defer agent.RecordPanic()
140
-
141
-			logman.Info("startup", fmt.Sprintf("StackImpact profiling started as %s", config.Debug.StackImpact.AppName))
142
-		}
143
-
144 129
 		// warning if running a non-final version
145 130
 		if strings.Contains(irc.SemVer, "unreleased") {
146 131
 			logman.Warning("startup", "You are currently running an unreleased beta version of Oragono that may be unstable and could corrupt your database.\nIf you are running a production network, please download the latest build from https://oragono.io/downloads.html and run that instead.")

+ 0
- 11
oragono.yaml Bestand weergeven

@@ -355,17 +355,6 @@ debug:
355 355
     # set to `null`, "", leave blank, or omit to disable
356 356
     # pprof-listener: "localhost:6060"
357 357
 
358
-    # enabling StackImpact profiling
359
-    stackimpact:
360
-        # whether to use StackImpact
361
-        enabled: false
362
-
363
-        # the AgentKey to use
364
-        agent-key: examplekeyhere
365
-
366
-        # the app name to report
367
-        app-name: Oragono
368
-
369 358
 # datastore configuration
370 359
 datastore:
371 360
     # path to the datastore

Laden…
Annuleren
Opslaan