-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Add-ability-to-use-JS-file-for-UI-configur…
…ation
- Loading branch information
Showing
16 changed files
with
273 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Copyright (c) 2020 The Jaeger Authors. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package reporter | ||
|
||
import ( | ||
"expvar" | ||
|
||
"github.com/uber/jaeger-lib/metrics" | ||
) | ||
|
||
type connectMetrics struct { | ||
// used for reflect current connection stability | ||
Reconnects metrics.Counter `metric:"collector_reconnects" help:"Number of successful connections (including reconnects) to the collector."` | ||
|
||
// Connection status that jaeger-agent to jaeger-collector, 1 is connected, 0 is disconnected | ||
Status metrics.Gauge `metric:"collector_connected" help:"Status of connection between the agent and the collector; 1 is connected, 0 is disconnected"` | ||
} | ||
|
||
// ConnectMetrics include connectMetrics necessary params if want to modify metrics of connectMetrics, must via ConnectMetrics API | ||
type ConnectMetrics struct { | ||
metrics connectMetrics | ||
target *expvar.String | ||
} | ||
|
||
// NewConnectMetrics will be initialize ConnectMetrics | ||
func NewConnectMetrics(mf metrics.Factory) *ConnectMetrics { | ||
cm := &ConnectMetrics{} | ||
metrics.MustInit(&cm.metrics, mf.Namespace(metrics.NSOptions{Name: "connection_status"}), nil) | ||
|
||
if r := expvar.Get("gRPCTarget"); r == nil { | ||
cm.target = expvar.NewString("gRPCTarget") | ||
} else { | ||
cm.target = r.(*expvar.String) | ||
} | ||
|
||
return cm | ||
} | ||
|
||
// OnConnectionStatusChange used for pass the status parameter when connection is changed | ||
// 0 is disconnected, 1 is connected | ||
// For quick view status via use `sum(jaeger_agent_connection_status_collector_connected{}) by (instance) > bool 0` | ||
func (cm *ConnectMetrics) OnConnectionStatusChange(connected bool) { | ||
if connected { | ||
cm.metrics.Status.Update(1) | ||
cm.metrics.Reconnects.Inc(1) | ||
} else { | ||
cm.metrics.Status.Update(0) | ||
} | ||
} | ||
|
||
// RecordTarget writes the current connection target to an expvar field. | ||
func (cm *ConnectMetrics) RecordTarget(target string) { | ||
cm.target.Set(target) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// Copyright (c) 2020 The Jaeger Authors. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package reporter | ||
|
||
import ( | ||
"expvar" | ||
"testing" | ||
"time" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/uber/jaeger-lib/metrics/metricstest" | ||
) | ||
|
||
func TestConnectMetrics(t *testing.T) { | ||
mf := metricstest.NewFactory(time.Hour) | ||
cm := NewConnectMetrics(mf) | ||
|
||
getGauge := func() map[string]int64 { | ||
_, gauges := mf.Snapshot() | ||
return gauges | ||
} | ||
|
||
getCount := func() map[string]int64 { | ||
counts, _ := mf.Snapshot() | ||
return counts | ||
} | ||
|
||
// no connection | ||
cm.OnConnectionStatusChange(false) | ||
assert.EqualValues(t, 0, getGauge()["connection_status.collector_connected"]) | ||
|
||
// first connection | ||
cm.OnConnectionStatusChange(true) | ||
assert.EqualValues(t, 1, getGauge()["connection_status.collector_connected"]) | ||
assert.EqualValues(t, 1, getCount()["connection_status.collector_reconnects"]) | ||
|
||
// reconnect | ||
cm.OnConnectionStatusChange(false) | ||
cm.OnConnectionStatusChange(true) | ||
assert.EqualValues(t, 2, getCount()["connection_status.collector_reconnects"]) | ||
|
||
cm.RecordTarget("collector-host") | ||
assert.Equal(t, `"collector-host"`, expvar.Get("gRPCTarget").String()) | ||
|
||
// since expvars are singletons, the second constructor should grab the same var | ||
cm2 := NewConnectMetrics(mf) | ||
assert.Same(t, cm.target, cm2.target) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.