Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix origins bug #143

Merged
merged 2 commits into from
Jul 6, 2023
Merged

Fix origins bug #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2617e8e
add tests for origins and domain
leklund Jul 6, 2023
b20edd0
fix bug for origin histograms
leklund Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/origin/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
)

// Process updates the metrics with data from the API response.
func Process(response *Response, serviceID, serviceName, serviceVersion string, m *Metrics) {

Check failure on line 10 in pkg/origin/process.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

parameter 'serviceVersion' seems to be unused, consider removing or renaming it as _

Check failure on line 10 in pkg/origin/process.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

parameter 'serviceVersion' seems to be unused, consider removing or renaming it as _

Check failure on line 10 in pkg/origin/process.go

View workflow job for this annotation

GitHub Actions / test (windows-latest) 

parameter 'serviceVersion' seems to be unused, consider removing or renaming it as _

Check failure on line 10 in pkg/origin/process.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest) 

parameter 'serviceVersion' seems to be unused, consider removing or renaming it as _

Check failure on line 10 in pkg/origin/process.go

View workflow job for this annotation

GitHub Actions / test (macos-latest) 

parameter 'serviceVersion' seems to be unused, consider removing or renaming it as _

Check failure on line 10 in pkg/origin/process.go

View workflow job for this annotation

GitHub Actions / test (windows-latest) 

parameter 'serviceVersion' seems to be unused, consider removing or renaming it as _
for _, d := range response.Data {
for datacenter, byOrigin := range d.Datacenter {
for origin, stats := range byOrigin {
Expand Down Expand Up @@ -113,7 +113,7 @@
0.0005: stats.Latency0to1, // yolo
} {
for i := uint64(0); i < n; i++ {
m.LatencySeconds.WithLabelValues(serviceID, serviceName, datacenter, origin).Observe(v)
m.LatencySeconds.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery).Observe(v)
}
}

Expand All @@ -132,7 +132,7 @@
0.0005: stats.WafLatency0to1, // yolo
} {
for i := uint64(0); i < n; i++ {
m.LatencySeconds.WithLabelValues(serviceID, serviceName, datacenter, origin).Observe(v)
m.LatencySeconds.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf).Observe(v)
}
}

Expand All @@ -151,7 +151,7 @@
0.0005: stats.ComputeLatency0to1, // yolo
} {
for i := uint64(0); i < n; i++ {
m.LatencySeconds.WithLabelValues(serviceID, serviceName, datacenter, origin).Observe(v)
m.LatencySeconds.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute).Observe(v)
}
}
}
Expand Down
73 changes: 36 additions & 37 deletions pkg/origin/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,45 +22,44 @@ type ByOrigin map[string]Stats

// Stats for a specific datacenter and origin.
type Stats struct {
RespBodyBytes uint64 `json:"resp_body_bytes"` // Number of body bytes from origin.
RespHeaderBytes uint64 `json:"resp_header_bytes"` // Number of header bytes from origin.
Responses uint64 `json:"responses"` // Number of responses from origin.
Status1xx uint64 `json:"status_1xx"` // Number of 1xx "Informational" status codes delivered from origin.
Status200 uint64 `json:"status_200"` // Number of responses received with status code 200 (Success) from origin.
Status204 uint64 `json:"status_204"` // Number of responses received with status code 204 (No Content) from origin.
Status2xx uint64 `json:"status_2xx"` // Number of 2xx "Success" status codes delivered from origin.
Status301 uint64 `json:"status_301"` // Number of responses received with status code 301 (Moved Permanently) from origin.
Status302 uint64 `json:"status_302"` // Number of responses received with status code 302 (Found) from origin.
Status304 uint64 `json:"status_304"` // Number of responses received with status code 304 (Not Modified) from origin.
Status3xx uint64 `json:"status_3xx"` // Number of 3xx "Redirection" codes delivered from origin.
Status400 uint64 `json:"status_400"` // Number of responses received with status code 400 (Bad Request) from origin.
Status401 uint64 `json:"status_401"` // Number of responses received with status code 401 (Unauthorized) from origin.
Status403 uint64 `json:"status_403"` // Number of responses received with status code 403 (Forbidden) from origin.
Status404 uint64 `json:"status_404"` // Number of responses received with status code 404 (Not Found) from origin.
Status416 uint64 `json:"status_416"` // Number of responses received with status code 416 (Range Not Satisfiable) from origin.
Status4xx uint64 `json:"status_4xx"` // Number of 4xx "Client Error" codes delivered from origin.
Status500 uint64 `json:"status_500"` // Number of responses received with status code 500 (Internal Server Error) from origin.
Status501 uint64 `json:"status_501"` // Number of responses received with status code 501 (Not Implemented) from origin.
Status502 uint64 `json:"status_502"` // Number of responses received with status code 502 (Bad Gateway) from origin.
Status503 uint64 `json:"status_503"` // Number of responses received with status code 503 (Service Unavailable) from origin.
Status504 uint64 `json:"status_504"` // Number of responses received with status code 504 (Gateway Timeout) from origin.
Status505 uint64 `json:"status_505"` // Number of responses received with status code 505 (HTTP Version Not Supported) from origin.
Status5xx uint64 `json:"status_5xx"` // Number of 5xx "Server Error" codes delivered from origin.
Latency0to1 uint64 `json:"latency_0_to_1ms"` // Number of responses from origin with latency between 0 and 1 millisecond.
Latency1to5 uint64 `json:"latency_1_to_5ms"` // Number of responses from origin with latency between 1 and 5 milliseconds.
Latency5to10 uint64 `json:"latency_5_to_10ms"` // Number of responses from origin with latency between 5 and 10 milliseconds.
Latency10to50 uint64 `json:"latency_10_to_50ms"` // Number of responses from origin with latency between 10 and 50 milliseconds.
Latency50to100 uint64 `json:"latency_50_to_100ms"` // Number of responses from origin with latency between 50 and 100 milliseconds.
Latency100to250 uint64 `json:"latency_100_to_250ms"` // Number of responses from origin with latency between 100 and 250 milliseconds.
Latency250to500 uint64 `json:"latency_250_to_500ms"` // Number of responses from origin with latency between 250 and 500 milliseconds.
Latency500to1000 uint64 `json:"latency_500_to_1000ms"` // Number of responses from origin with latency between 500 and 1,000 milliseconds.
Latency1000to5000 uint64 `json:"latency_1000_to_5000ms"` // Number of responses from origin with latency between 1,000 and 5,000 milliseconds.
Latency5000to10000 uint64 `json:"latency_5000_to_10000ms"` // Number of responses from origin with latency between 5,000 and 10,000 milliseconds.
Latency10000to60000 uint64 `json:"latency_10000_to_60000ms"` // Number of responses from origin with latency between 10,000 and 60,000 milliseconds.
Latency60000plus uint64 `json:"latency_60000ms"` // Number of responses from origin with latency of 60,000 milliseconds and above.

RespBodyBytes uint64 `json:"resp_body_bytes"` // Number of body bytes from origin.
RespHeaderBytes uint64 `json:"resp_header_bytes"` // Number of header bytes from origin.
Responses uint64 `json:"responses"` // Number of responses from origin.
Status1xx uint64 `json:"status_1xx"` // Number of 1xx "Informational" status codes delivered from origin.
Status200 uint64 `json:"status_200"` // Number of responses received with status code 200 (Success) from origin.
Status204 uint64 `json:"status_204"` // Number of responses received with status code 204 (No Content) from origin.
Status206 uint64 `json:"status_206"` // Number of responses received with status code 206 (Partial Content) from origin.
Status2xx uint64 `json:"status_2xx"` // Number of 2xx "Success" status codes delivered from origin.
Status301 uint64 `json:"status_301"` // Number of responses received with status code 301 (Moved Permanently) from origin.
Status302 uint64 `json:"status_302"` // Number of responses received with status code 302 (Found) from origin.
Status304 uint64 `json:"status_304"` // Number of responses received with status code 304 (Not Modified) from origin.
Status3xx uint64 `json:"status_3xx"` // Number of 3xx "Redirection" codes delivered from origin.
Status400 uint64 `json:"status_400"` // Number of responses received with status code 400 (Bad Request) from origin.
Status401 uint64 `json:"status_401"` // Number of responses received with status code 401 (Unauthorized) from origin.
Status403 uint64 `json:"status_403"` // Number of responses received with status code 403 (Forbidden) from origin.
Status404 uint64 `json:"status_404"` // Number of responses received with status code 404 (Not Found) from origin.
Status416 uint64 `json:"status_416"` // Number of responses received with status code 416 (Range Not Satisfiable) from origin.
Status429 uint64 `json:"status_429"` // Number of responses received with status code 429 (Too Many Requests) from origin.
Status4xx uint64 `json:"status_4xx"` // Number of 4xx "Client Error" codes delivered from origin.
Status500 uint64 `json:"status_500"` // Number of responses received with status code 500 (Internal Server Error) from origin.
Status501 uint64 `json:"status_501"` // Number of responses received with status code 501 (Not Implemented) from origin.
Status502 uint64 `json:"status_502"` // Number of responses received with status code 502 (Bad Gateway) from origin.
Status503 uint64 `json:"status_503"` // Number of responses received with status code 503 (Service Unavailable) from origin.
Status504 uint64 `json:"status_504"` // Number of responses received with status code 504 (Gateway Timeout) from origin.
Status505 uint64 `json:"status_505"` // Number of responses received with status code 505 (HTTP Version Not Supported) from origin.
Status5xx uint64 `json:"status_5xx"` // Number of 5xx "Server Error" codes delivered from origin.
Latency0to1 uint64 `json:"latency_0_to_1ms"` // Number of responses from origin with latency between 0 and 1 millisecond.
Latency1to5 uint64 `json:"latency_1_to_5ms"` // Number of responses from origin with latency between 1 and 5 milliseconds.
Latency5to10 uint64 `json:"latency_5_to_10ms"` // Number of responses from origin with latency between 5 and 10 milliseconds.
Latency10to50 uint64 `json:"latency_10_to_50ms"` // Number of responses from origin with latency between 10 and 50 milliseconds.
Latency50to100 uint64 `json:"latency_50_to_100ms"` // Number of responses from origin with latency between 50 and 100 milliseconds.
Latency100to250 uint64 `json:"latency_100_to_250ms"` // Number of responses from origin with latency between 100 and 250 milliseconds.
Latency250to500 uint64 `json:"latency_250_to_500ms"` // Number of responses from origin with latency between 250 and 500 milliseconds.
Latency500to1000 uint64 `json:"latency_500_to_1000ms"` // Number of responses from origin with latency between 500 and 1,000 milliseconds.
Latency1000to5000 uint64 `json:"latency_1000_to_5000ms"` // Number of responses from origin with latency between 1,000 and 5,000 milliseconds.
Latency5000to10000 uint64 `json:"latency_5000_to_10000ms"` // Number of responses from origin with latency between 5,000 and 10,000 milliseconds.
Latency10000to60000 uint64 `json:"latency_10000_to_60000ms"` // Number of responses from origin with latency between 10,000 and 60,000 milliseconds.
Latency60000plus uint64 `json:"latency_60000ms"` // Number of responses from origin with latency of 60,000 milliseconds and above.
WafResponses uint64 `json:"waf_responses"` // Number of responses received for origin requests made by the Fastly WAF.
WafRespHeaderBytes uint64 `json:"waf_resp_header_bytes"` // Number of header bytes received for origin requests made by the Fastly WAF.
WafRespBodyBytes uint64 `json:"waf_resp_body_bytes"` // Number of body bytes received for origin requests made by the Fastly WAF.
Expand Down
Loading
Loading