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 when consul is used as a name resolution component problem #1793

Closed
wants to merge 25 commits into from
Closed

fix when consul is used as a name resolution component problem #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
434e3fc
Add contexts to pubsub.Subscribe to allow early cancelation (#1756)
ItalyPaleAle Jun 2, 2022
4979bcc
fix:Use the id to distinguish
Jun 17, 2022
66e6946
perf: id
Jun 17, 2022
b16fdcd
Bumped dapr/dapr in cert tests (#1773)
ItalyPaleAle Jun 7, 2022
0765196
adding query api to the feature list (#1775)
pravinpushkar Jun 7, 2022
6fb4e92
Updated sendgrid binding to add the option to add names for the to an…
arahja Jun 7, 2022
c448211
Add Redis StateStore Certification Tests (#1763)
DeepanshuA Jun 8, 2022
9667b19
Add additional Event Hub topics for certification tests (#1767)
berndverst Jun 8, 2022
1ea3cf4
Add postgresql certification test + connection idle time (#1778)
yaron2 Jun 10, 2022
44c1e40
fix: dubbo binding enhancement (#1782)
LaurenceLiZhixin Jun 10, 2022
6794528
Rabbitmq publisher confirm (#1762)
ItalyPaleAle Jun 10, 2022
834bad8
Bump github.com/open-policy-agent/opa from 0.23.2 to 0.40.0 (#1757)
dependabot[bot] Jun 10, 2022
d82282e
Make Service Bus attempt to reconnect forever in case of issues (#1783)
ItalyPaleAle Jun 10, 2022
aa15e11
[pubsub][rabbitmq]add support for binding multiple routingkeys at the…
saber-wang Jun 10, 2022
a81cefd
add file upload to s3 (#1785)
yaron2 Jun 13, 2022
f9d07fb
middleware: add wasm basic (#1747)
daixiang0 Jun 13, 2022
751ad80
Upgrade Apache Dubbo again - pin to Dapr support branch (#1786)
berndverst Jun 14, 2022
ef54c4d
Adding Pinger interface and Removing mandatory nature of Ping fuction…
DeepanshuA Jun 14, 2022
9a5d86c
Update to Camunda Platform 8 (#1787)
akkie Jun 14, 2022
48a3a1a
add json tags to lock requests/responses (#1788)
yaron2 Jun 14, 2022
efad4f0
Upgrade to Azure Table Storage Track 2 SDK in State Store and add Cos…
berndverst Jun 17, 2022
0b4c1b3
Shared implementation for Azure Service Bus subscriptions for binding…
ItalyPaleAle Jun 17, 2022
5468f87
update imports for Fossa and Certification test (#1796)
berndverst Jun 17, 2022
ab18cc2
lowcase id
Jun 20, 2022
1cdda68
Merge branch 'master' into master
shiling02404 Jun 20, 2022
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
5 changes: 3 additions & 2 deletions nameresolution/consul/consul.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,13 @@ func getRegistrationConfig(cfg configSpec, props map[string]string) (*consul.Age
} else if _, err := strconv.ParseUint(httpPort, 10, 0); err != nil {
return nil, fmt.Errorf("error parsing %s: %w", nr.DaprHTTPPort, err)
}

id := appID + "-" + host + "-" + httpPort
// if no health checks configured add dapr sidecar health check by default
if len(cfg.Checks) == 0 {
cfg.Checks = []*consul.AgentServiceCheck{
{
Name: "Dapr Health Status",
CheckID: fmt.Sprintf("daprHealth:%s", appID),
CheckID: fmt.Sprintf("daprHealth:%s", id),
Interval: "15s",
HTTP: fmt.Sprintf("http://%s:%s/v1.0/healthz", host, httpPort),
},
Expand All @@ -262,6 +262,7 @@ func getRegistrationConfig(cfg configSpec, props map[string]string) (*consul.Age
}

return &consul.AgentServiceRegistration{
ID: id,
Name: appID,
Address: host,
Port: appPortInt,
Expand Down
2 changes: 1 addition & 1 deletion nameresolution/consul/consul_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ func TestGetConfig(t *testing.T) {
assert.Equal(t, 1, len(actual.Registration.Checks))
check := actual.Registration.Checks[0]
assert.Equal(t, "Dapr Health Status", check.Name)
assert.Equal(t, "daprHealth:test-app", check.CheckID)
assert.Equal(t, "daprHealth:test-app-"+metadata.Properties[nr.HostAddress]+"-"+metadata.Properties[nr.DaprHTTPPort], check.CheckID)
assert.Equal(t, "15s", check.Interval)
assert.Equal(t, fmt.Sprintf("http://%s:%s/v1.0/healthz", metadata.Properties[nr.HostAddress], metadata.Properties[nr.DaprHTTPPort]), check.HTTP)

Expand Down