From 24c699f78afd17db5aac42f83c1c5cad70254294 Mon Sep 17 00:00:00 2001
From: Rob Skillington <rob.skillington@gmail.com>
Date: Thu, 23 May 2019 15:11:00 +0200
Subject: [PATCH] Fix OnRegisterError not being called correctly when listen
 port in use (#103)

---
 prometheus/config.go      |  2 +-
 prometheus/config_test.go | 48 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 prometheus/config_test.go

diff --git a/prometheus/config.go b/prometheus/config.go
index 872e862c..97e1df82 100644
--- a/prometheus/config.go
+++ b/prometheus/config.go
@@ -149,7 +149,7 @@ func (c Configuration) NewReporter(
 		mux.Handle(path, reporter.HTTPHandler())
 		go func() {
 			if err := http.ListenAndServe(addr, mux); err != nil {
-				configOpts.OnError(err)
+				opts.OnRegisterError(err)
 			}
 		}()
 	}
diff --git a/prometheus/config_test.go b/prometheus/config_test.go
new file mode 100644
index 00000000..11fa976a
--- /dev/null
+++ b/prometheus/config_test.go
@@ -0,0 +1,48 @@
+// Copyright (c) 2019 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package prometheus
+
+import (
+	"net"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestListenErrorCallsOnRegisterError(t *testing.T) {
+	// Ensure that Listen error calls default OnRegisterError to panic
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	require.NoError(t, err)
+
+	defer func() { _ = listener.Close() }()
+
+	assert.NotPanics(t, func() {
+		cfg := Configuration{
+			ListenAddress: listener.Addr().String(),
+			OnError: "log",
+		}
+		_, _ = cfg.NewReporter(ConfigurationOptions{})
+		time.Sleep(time.Second)
+	})
+}
+