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

get openAI and mongo integration tests working #55

Merged
merged 1 commit into from
Oct 23, 2024
Merged

get openAI and mongo integration tests working #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions pkg/plugins/datadog/cmd/main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,11 @@ func postProcess(ccResp *pb.CustomCostResponse) {

ccResp.Costs = processLogUsage(ccResp.Costs)

// removes any items that have 0 usage, either because of post processing or otherwise
ccResp.Costs = removeZeroUsages(ccResp.Costs)

// DBM queries have 200 * number of hosts included. We need to adjust the costs to reflect this
ccResp.Costs = adjustDBMQueries(ccResp.Costs)

// removes any items that have 0 usage, either because of post processing or otherwise
ccResp.Costs = removeZeroUsages(ccResp.Costs)
}

// as per https://www.datadoghq.com/pricing/?product=database-monitoring#database-monitoring-can-i-still-use-dbm-if-i-have-additional-normalized-queries-past-the-a-hrefpricingallotmentsallotteda-amount
Expand Down Expand Up @@ -383,7 +383,7 @@ func adjustDBMQueries(costs []*pb.CustomCost) []*pb.CustomCost {
return costs
}

// removes any items that have 0 usage, either because of post processing or otherwise
// removes any items that have 0 usage or cost, either because of post processing or otherwise
func removeZeroUsages(costs []*pb.CustomCost) []*pb.CustomCost {
for index := 0; index < len(costs); index++ {
if costs[index].UsageQuantity < 0.001 {
Expand All @@ -392,6 +392,15 @@ func removeZeroUsages(costs []*pb.CustomCost) []*pb.CustomCost {
index = 0
}
}

for index := 0; index < len(costs); index++ {
if costs[index].ListCost == 0.0 && costs[index].BilledCost == 0.0 {
log.Debugf("removing cost %s because it has 0 billed and list costs", costs[index].ProviderId)
costs = append(costs[:index], costs[index+1:]...)
index = 0
}
}

return costs
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/plugins/mongodb-atlas/cmd/validator/main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ func validate(respDaily, respHourly []*pb.CustomCostResponse) bool {
return false
}

if len(respHourly) == 0 {
log.Errorf("no hourly response received from mongodb-atlas plugin")
if len(respHourly) != 0 {
log.Errorf("mongo plugin does not support hourly costs")
return false
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/plugins/openai/cmd/main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ func (d *OpenAICostSource) getOpenAIBilling(start time.Time, end time.Time) (*op
req, errReq = http.NewRequest("GET", openAIBillingURL, nil)
if errReq != nil {
log.Warnf("error creating billing export request: %v", errReq)
log.Warnf("retrying request after 30s")
log.Infof("retrying request after 30s")
time.Sleep(30 * time.Second)
continue
}
Expand All @@ -246,7 +246,7 @@ func (d *OpenAICostSource) getOpenAIBilling(start time.Time, end time.Time) (*op

errReq = fmt.Errorf("received non-200 response for billing export request: %d", resp.StatusCode)
log.Warnf("got non-200 response for billing export request: %d, body is: %s", resp.StatusCode, bodyString)
log.Warnf("retrying request after 30s")
log.Infof("retrying request after 30s")
time.Sleep(30 * time.Second)
continue
} else {
Expand Down Expand Up @@ -304,7 +304,7 @@ func (d *OpenAICostSource) getOpenAITokenUsages(targetTime time.Time) (*openaipl
resp, errReq = client.Do(req)
if errReq != nil {
log.Warnf("error doing token request: %v", errReq)
log.Warnf("retrying request after 30s")
log.Infof("retrying request after 30s")
time.Sleep(30 * time.Second)
continue
}
Expand All @@ -320,7 +320,7 @@ func (d *OpenAICostSource) getOpenAITokenUsages(targetTime time.Time) (*openaipl
bodyString = string(bodyBytes)
}
log.Warnf("got non-200 response for token usage request: %d, body is: %s", resp.StatusCode, bodyString)
log.Warnf("retrying request after 30s")
log.Infof("retrying request after 30s")
time.Sleep(30 * time.Second)
continue
} else {
Expand Down
3 changes: 1 addition & 2 deletions pkg/plugins/openai/cmd/validator/main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func validate(respDaily, respHourly []*pb.CustomCostResponse) bool {
if cost.GetBilledCost() == 0 {
log.Debugf("got zero cost for %v", cost)
}
if cost.GetBilledCost() > 1 {
if cost.GetBilledCost() > 2 {
log.Errorf("daily cost returned by plugin openai for %v is greater than 1", cost)
return false
}
Expand All @@ -120,7 +120,6 @@ func validate(respDaily, respHourly []*pb.CustomCostResponse) bool {
expectedCosts := []string{
"GPT-4o mini",
"GPT-4o",
"Other models",
}

for _, cost := range expectedCosts {
Expand Down
Loading