Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
0c45e268
Commit
0c45e268
authored
Apr 02, 2019
by
Jan Provaznik
Committed by
Robert Speicher
Apr 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"
This reverts merge request !26569
parent
9f6ab1a5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
84 deletions
+0
-84
app/graphql/gitlab_schema.rb
app/graphql/gitlab_schema.rb
+0
-1
changelogs/unreleased/graphql-prometheus.yml
changelogs/unreleased/graphql-prometheus.yml
+0
-5
lib/gitlab/graphql/tracing.rb
lib/gitlab/graphql/tracing.rb
+0
-43
spec/lib/gitlab/graphql/tracing_spec.rb
spec/lib/gitlab/graphql/tracing_spec.rb
+0
-35
No files found.
app/graphql/gitlab_schema.rb
View file @
0c45e268
...
@@ -5,7 +5,6 @@ class GitlabSchema < GraphQL::Schema
...
@@ -5,7 +5,6 @@ class GitlabSchema < GraphQL::Schema
use
Gitlab
::
Graphql
::
Authorize
use
Gitlab
::
Graphql
::
Authorize
use
Gitlab
::
Graphql
::
Present
use
Gitlab
::
Graphql
::
Present
use
Gitlab
::
Graphql
::
Connections
use
Gitlab
::
Graphql
::
Connections
use
Gitlab
::
Graphql
::
Tracing
query
(
Types
::
QueryType
)
query
(
Types
::
QueryType
)
...
...
changelogs/unreleased/graphql-prometheus.yml
deleted
100644 → 0
View file @
9f6ab1a5
---
title
:
Added prometheus monitoring to GraphQL
merge_request
:
author
:
type
:
added
lib/gitlab/graphql/tracing.rb
deleted
100644 → 0
View file @
9f6ab1a5
# frozen_string_literal: true
module
Gitlab
module
Graphql
class
Tracing
<
GraphQL
::
Tracing
::
PlatformTracing
self
.
platform_keys
=
{
'lex'
=>
'graphql.lex'
,
'parse'
=>
'graphql.parse'
,
'validate'
=>
'graphql.validate'
,
'analyze_query'
=>
'graphql.analyze'
,
'analyze_multiplex'
=>
'graphql.analyze'
,
'execute_multiplex'
=>
'graphql.execute'
,
'execute_query'
=>
'graphql.execute'
,
'execute_query_lazy'
=>
'graphql.execute'
,
'execute_field'
=>
'graphql.execute'
,
'execute_field_lazy'
=>
'graphql.execute'
}
def
platform_field_key
(
type
,
field
)
"
#{
type
.
name
}
.
#{
field
.
name
}
"
end
def
platform_trace
(
platform_key
,
key
,
data
,
&
block
)
start
=
Gitlab
::
Metrics
::
System
.
monotonic_time
yield
ensure
duration
=
Gitlab
::
Metrics
::
System
.
monotonic_time
-
start
graphql_duration_seconds
.
observe
({
platform_key:
platform_key
,
key:
key
},
duration
)
end
private
def
graphql_duration_seconds
@graphql_duration_seconds
||=
Gitlab
::
Metrics
.
histogram
(
:graphql_duration_seconds
,
'GraphQL execution time'
)
end
end
end
end
spec/lib/gitlab/graphql/tracing_spec.rb
deleted
100644 → 0
View file @
9f6ab1a5
# frozen_string_literal: true
require
'spec_helper'
describe
Gitlab
::
Graphql
::
Tracing
do
let!
(
:graphql_duration_seconds
)
{
double
(
'Gitlab::Metrics::NullMetric'
)
}
before
do
allow
(
Gitlab
::
Metrics
)
.
to
receive
(
:histogram
)
.
with
(
:graphql_duration_seconds
,
'GraphQL execution time'
)
.
and_return
(
graphql_duration_seconds
)
end
it
'updates graphql histogram with expected labels'
do
query
=
'query { users { id } }'
expect_metric
(
'graphql.lex'
,
'lex'
)
expect_metric
(
'graphql.parse'
,
'parse'
)
expect_metric
(
'graphql.validate'
,
'validate'
)
expect_metric
(
'graphql.analyze'
,
'analyze_multiplex'
)
expect_metric
(
'graphql.execute'
,
'execute_query_lazy'
)
expect_metric
(
'graphql.execute'
,
'execute_multiplex'
)
GitlabSchema
.
execute
(
query
)
end
private
def
expect_metric
(
platform_key
,
key
)
expect
(
graphql_duration_seconds
)
.
to
receive
(
:observe
)
.
with
({
platform_key:
platform_key
,
key:
key
},
be
>
0.0
)
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment