Merge remote-tracking branch 'upstream/master' into janitor-slow-queries

ory · May 20, 2021 · 58a8177 · 58a8177
2 parents 25be8b0 + eddfa2d
commit 58a8177
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 168 deletions.
diff --git a/cmd/server/handler.go b/cmd/server/handler.go
@@ -50,9 +50,9 @@ import (
 	"github.com/ory/hydra/driver"
 	"github.com/ory/hydra/driver/config"
 	"github.com/ory/hydra/jwk"
-	"github.com/ory/hydra/metrics/prometheus"
 	"github.com/ory/hydra/oauth2"
 	"github.com/ory/hydra/x"
+	prometheus "github.com/ory/x/prometheusx"
 )
 
 var _ = &consent.Handler{}
@@ -94,6 +94,8 @@ func RunServeAdmin(cmd *cobra.Command, args []string) {
 	admin, _, adminmw, _ := setup(d, cmd)
 	cert := GetOrCreateTLSCertificate(cmd, d, config.AdminInterface) // we do not want to run this concurrently.
 
+	d.PrometheusManager().RegisterRouter(admin.Router)
+
 	var wg sync.WaitGroup
 	wg.Add(1)
 
@@ -118,6 +120,8 @@ func RunServePublic(cmd *cobra.Command, args []string) {
 	_, public, _, publicmw := setup(d, cmd)
 	cert := GetOrCreateTLSCertificate(cmd, d, config.PublicInterface) // we do not want to run this concurrently.
 
+	d.PrometheusManager().RegisterRouter(public.Router)
+
 	var wg sync.WaitGroup
 	wg.Add(1)
 
@@ -140,6 +144,9 @@ func RunServeAll(cmd *cobra.Command, args []string) {
 
 	admin, public, adminmw, publicmw := setup(d, cmd)
 
+	d.PrometheusManager().RegisterRouter(admin.Router)
+	d.PrometheusManager().RegisterRouter(public.Router)
+
 	var wg sync.WaitGroup
 	wg.Add(2)
 

diff --git a/contrib/quickstart/5-min/hydra.yml b/contrib/quickstart/5-min/hydra.yml
@@ -20,4 +20,3 @@ oidc:
       - public
     pairwise:
       salt: youReallyNeedToChangeThis
-
diff --git a/docs/docs/reference/api.mdx b/docs/docs/reference/api.mdx
@@ -4608,28 +4608,28 @@ p JSON.parse(result)
 
 <a id="opIdprometheus"></a>
 
-### Get Snapshot Metrics from the Hydra Service.
+### Get snapshot metrics from the Hydra service. If you're using k8s, you can then add annotations to
+
+your deployment like so:
 
 ```
 GET /metrics/prometheus HTTP/1.1
 
 ```
 
-If you're using k8s, you can then add annotations to your deployment like so:
-
 ```
 metadata:
 annotations:
-prometheus.io/port: "4445"
+prometheus.io/port: "4434"
 prometheus.io/path: "/metrics/prometheus"
 ```
 
-If the service supports TLS Edge Termination, this endpoint does not require the
-`X-Forwarded-Proto` header to be set.
-
 #### Responses
 
-<a id="get-snapshot-metrics-from-the-hydra-service.-responses"></a>
+<a
+  id="get-snapshot-metrics-from-the-hydra-service.-if-you're-using-k8s,-you-can-then-add-annotations-to
+your-deployment-like-so:-responses"
+></a>
 
 ##### Overview
 
@@ -8280,7 +8280,6 @@ _NullTime implements sql.NullTime functionality._
     }
   ],
   "Interface": {
-    "ProtocolScheme": "string",
     "Socket": "string",
     "Types": [
       {
@@ -8388,7 +8387,6 @@ _PluginConfigArgs plugin config args_
 
 ```json
 {
-  "ProtocolScheme": "string",
   "Socket": "string",
   "Types": [
     {
@@ -8404,11 +8402,10 @@ _PluginConfigInterface The interface between Docker and the plugin_
 
 #### Properties
 
-| Name           | Type                                                | Required | Restrictions | Description                                           |
-| -------------- | --------------------------------------------------- | -------- | ------------ | ----------------------------------------------------- |
-| ProtocolScheme | string                                              | false    | none         | Protocol to use for clients connecting to the plugin. |
-| Socket         | string                                              | true     | none         | socket                                                |
-| Types          | [[PluginInterfaceType](#schemaplugininterfacetype)] | true     | none         | types                                                 |
+| Name   | Type                                                | Required | Restrictions | Description |
+| ------ | --------------------------------------------------- | -------- | ------------ | ----------- |
+| Socket | string                                              | true     | none         | socket      |
+| Types  | [[PluginInterfaceType](#schemaplugininterfacetype)] | true     | none         | types       |
 
 <a id="tocSpluginconfiglinux"></a>
 
@@ -8806,7 +8803,7 @@ _Volume volume_
 | Name                       | string                                    | true     | none         | Name of the volume.                                                                                                                                                                                                                                                               |
 | Options                    | object                                    | true     | none         | The driver specific options used when creating the volume.                                                                                                                                                                                                                        |
 | » **additionalProperties** | string                                    | false    | none         | none                                                                                                                                                                                                                                                                              |
-| Scope                      | string                                    | true     | none         | The level at which the volume exists. Either `global` for cluster-wide,<br/>or `local` for machine level.                                                                                                                                                                         |
+| Scope                      | string                                    | true     | none         | The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level.                                                                                                                                                                             |
 | Status                     | object                                    | false    | none         | Low-level details about the volume, provided by the volume driver.<br/>Details are returned as a map with key/value pairs:<br/>`{"key":"value","key2":"value2"}`.<br/><br/>The `Status` field is optional, and is omitted if the volume driver<br/>does not support this feature. |
 | UsageData                  | [VolumeUsageData](#schemavolumeusagedata) | false    | none         | VolumeUsageData Usage details about the volume. This information is used by the<br/>`GET /system/df` endpoint, and omitted in other endpoints.                                                                                                                                    |
 

diff --git a/driver/registry.go b/driver/registry.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/ory/hydra/persistence"
 
-	"github.com/ory/hydra/metrics/prometheus"
+	prometheus "github.com/ory/x/prometheusx"
 
 	"github.com/ory/x/dbal"
 	"github.com/ory/x/healthx"

diff --git a/driver/registry_base.go b/driver/registry_base.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	prometheus "github.com/ory/x/prometheusx"
+
 	"github.com/pkg/errors"
 
 	"github.com/ory/hydra/x/oauth2cors"
@@ -16,7 +18,6 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/ory/hydra/metrics/prometheus"
 	"github.com/ory/x/logrusx"
 
 	"github.com/gorilla/sessions"
@@ -442,7 +443,7 @@ func (m *RegistryBase) Tracer(ctx context.Context) *tracing.Tracer {
 
 func (m *RegistryBase) PrometheusManager() *prometheus.MetricsManager {
 	if m.pmm == nil {
-		m.pmm = prometheus.NewMetricsManager(m.buildVersion, m.buildHash, m.buildDate)
+		m.pmm = prometheus.NewMetricsManager("hydra", m.buildVersion, m.buildHash, m.buildDate)
 	}
 	return m.pmm
 }

diff --git a/go.mod b/go.mod
@@ -52,7 +52,7 @@ require (
 	github.com/ory/go-acc v0.2.6
 	github.com/ory/graceful v0.1.1
 	github.com/ory/herodot v0.9.3
-	github.com/ory/x v0.0.233
+	github.com/ory/x v0.0.237
 	github.com/pborman/uuid v1.2.1
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/philhofer/fwd v1.1.1 // indirect

diff --git a/go.sum b/go.sum
@@ -1210,6 +1210,8 @@ github.com/ory/x v0.0.205/go.mod h1:A1s4iwmFIppRXZLF3J9GGWeY/HpREVm0Dk5z/787iek=
 github.com/ory/x v0.0.207/go.mod h1:sBgvUAcmc2lmtOBe5VMcV2vNAlADT4bkFHomG29y7N4=
 github.com/ory/x v0.0.233 h1:AiBvucFkE054XJ04OnUziM9Ect5nR/NbMe5101EBjVE=
 github.com/ory/x v0.0.233/go.mod h1:0mSGWLFgcqckIvgexka1GJK/sshYrFFkU7lPajzGTFw=
+github.com/ory/x v0.0.237 h1:sFcWr8EcOYrPb30tsWk3BZM7jdzHeBAqaOSHveizmfs=
+github.com/ory/x v0.0.237/go.mod h1:KPgNsUzpztH15EZdw5HjurtTe+mXQ34yqMCCTb5BZAc=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

diff --git a/internal/httpclient/client/admin/admin_client.go b/internal/httpclient/client/admin/admin_client.go
diff --git a/internal/httpclient/client/public/public_client.go b/internal/httpclient/client/public/public_client.go
diff --git a/internal/httpclient/models/plugin_config_interface.go b/internal/httpclient/models/plugin_config_interface.go
diff --git a/internal/httpclient/models/volume.go b/internal/httpclient/models/volume.go
diff --git a/metrics/prometheus/doc.go b/metrics/prometheus/doc.go
diff --git a/metrics/prometheus/metrics.go b/metrics/prometheus/metrics.go
diff --git a/metrics/prometheus/middleware.go b/metrics/prometheus/middleware.go
diff --git a/spec/api.json b/spec/api.json
@@ -846,14 +846,14 @@
     },
     "/metrics/prometheus": {
       "get": {
-        "description": "If you're using k8s, you can then add annotations to your deployment like so:\n\n```\nmetadata:\nannotations:\nprometheus.io/port: \"4445\"\nprometheus.io/path: \"/metrics/prometheus\"\n```\n\nIf the service supports TLS Edge Termination, this endpoint does not require the\n`X-Forwarded-Proto` header to be set.",
+        "description": "```\nmetadata:\nannotations:\nprometheus.io/port: \"4434\"\nprometheus.io/path: \"/metrics/prometheus\"\n```",
         "produces": [
           "plain/text"
         ],
         "tags": [
           "admin"
         ],
-        "summary": "Get Snapshot Metrics from the Hydra Service.",
+        "summary": "Get snapshot metrics from the Hydra service. If you're using k8s, you can then add annotations to\nyour deployment like so:",
         "operationId": "prometheus",
         "responses": {
           "200": {
@@ -2159,10 +2159,6 @@
         "Types"
       ],
       "properties": {
-        "ProtocolScheme": {
-          "description": "Protocol to use for clients connecting to the plugin.",
-          "type": "string"
-        },
         "Socket": {
           "description": "socket",
           "type": "string"
@@ -2505,7 +2501,7 @@
           }
         },
         "Scope": {
-          "description": "The level at which the volume exists. Either `global` for cluster-wide,\nor `local` for machine level.",
+          "description": "The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level.",
           "type": "string"
         },
         "Status": {