Skip to content

Fix malformed stackdriver tracing env var#21005

Merged
istio-testing merged 4 commits intoistio:masterfrom
gargnupur:nup_fix_tracing
Feb 11, 2020
Merged

Fix malformed stackdriver tracing env var#21005
istio-testing merged 4 commits intoistio:masterfrom
gargnupur:nup_fix_tracing

Conversation

@gargnupur
Copy link
Copy Markdown
Contributor

@gargnupur gargnupur commented Feb 10, 2020

Fix malformed stackdriver tracing env var
Ref: #20851

[ ] Configuration Infrastructure
[ ] Docs
[ ] Installation
[ ] Networking
[ ] Performance and Scalability
[X ] Policies and Telemetry
[ ] Security
[ ] Test and Release
[ ] User Experience
[ ] Developer Infrastructure

@gargnupur gargnupur requested a review from a team as a code owner February 10, 2020 21:24
@istio-policy-bot
Copy link
Copy Markdown

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Feb 10, 2020
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 10, 2020
@gargnupur
Copy link
Copy Markdown
Contributor Author

You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

Test coming in, different PR.. don't want to cause merge conflicts because of a new test in cherry-picks..

@gargnupur gargnupur requested a review from a team February 10, 2020 21:38
@gargnupur gargnupur requested a review from a team as a code owner February 10, 2020 21:38
@istio-testing istio-testing added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 10, 2020
@istio-testing istio-testing added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 10, 2020
}

func StackDriverMaxAnnotations(value int64) Instance {
//return newOption("stackdriverMaxAnnotations", value).withConvert(int64Converter(value))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: remove

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those files were added by a bad commit.. they are removed now

t.Helper()
err := UntilSuccess(fn, options...)
if err != nil {
time.Sleep(time.Minute * 10)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those files were added by a bad commit.. they are removed now

retry.UntilSuccessOrFail(t, func() error {
util.SendTraffic(ingInst, t, "Sending traffic", "", "", 1)

return fmt.Errorf("cannot get traces from stackdriver %v", bookinfoNsInst)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how is this testing stack driver?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It had tracing enabled through stackdriver but it's not complete yet and I will add the test in a different PR.
Those files were added by a bad commit.. they are removed now

@gargnupur
Copy link
Copy Markdown
Contributor Author

/test integ-telemetry-k8s-tests_istio

@istio-testing istio-testing merged commit 9c2eabd into istio:master Feb 11, 2020
@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #21005 failed to apply on top of branch "release-1.4":

Using index info to reconstruct a base tree...
M	install/kubernetes/helm/istio/charts/gateways/templates/deployment.yaml
M	install/kubernetes/helm/istio/files/injection-template.yaml
A	manifests/istio-control/istio-discovery/files/injection-template.yaml
A	manifests/istio-control/istio-discovery/templates/configmap.yaml
A	operator/pkg/vfs/assets.gen.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): operator/pkg/vfs/assets.gen.go deleted in HEAD and modified in Fix malformed stackdriver tracing env var. Version Fix malformed stackdriver tracing env var of operator/pkg/vfs/assets.gen.go left in tree.
CONFLICT (modify/delete): manifests/istio-control/istio-discovery/files/injection-template.yaml deleted in HEAD and modified in Fix malformed stackdriver tracing env var. Version Fix malformed stackdriver tracing env var of manifests/istio-control/istio-discovery/files/injection-template.yaml left in tree.
Auto-merging install/kubernetes/helm/istio/templates/configmap.yaml
CONFLICT (content): Merge conflict in install/kubernetes/helm/istio/templates/configmap.yaml
Auto-merging install/kubernetes/helm/istio/files/injection-template.yaml
Auto-merging install/kubernetes/helm/istio/charts/gateways/templates/deployment.yaml
error: Failed to merge in the changes.
Patch failed at 0001 Fix malformed stackdriver tracing env var

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #21005 failed to apply on top of branch "release-1.5":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	manifests/istio-control/istio-discovery/files/injection-template.yaml
M	manifests/istio-control/istio-discovery/templates/configmap.yaml
M	operator/pkg/vfs/assets.gen.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/vfs/assets.gen.go
CONFLICT (content): Merge conflict in operator/pkg/vfs/assets.gen.go
Auto-merging manifests/istio-control/istio-discovery/templates/configmap.yaml
Auto-merging manifests/istio-control/istio-discovery/files/injection-template.yaml
Patch failed at 0001 Fix malformed stackdriver tracing env var

gargnupur added a commit to gargnupur/istio that referenced this pull request Feb 13, 2020
* Fix malformed stackdriver tracing env var

Ref: istio#20851

* Run make gen

* Run make gen

* Fix test added
gargnupur added a commit to gargnupur/istio that referenced this pull request Feb 13, 2020
* Fix malformed stackdriver tracing env var

Ref: istio#20851

* Run make gen

* Run make gen

* Fix test added
istio-testing pushed a commit that referenced this pull request Feb 13, 2020
* Fix malformed stackdriver tracing env var

Ref: #20851

* Run make gen

* Run make gen

* Fix test added
istio-testing pushed a commit that referenced this pull request Feb 14, 2020
* Fix malformed stackdriver tracing env var

Ref: #20851

* Run make gen

* Run make gen

* Fix test added
sdake pushed a commit to sdake/istio that referenced this pull request Feb 21, 2020
* Fix malformed stackdriver tracing env var

Ref: istio#20851

* Run make gen

* Run make gen

* Fix test added
brian-avery pushed a commit to brian-avery/istio that referenced this pull request Mar 4, 2020
* Fix malformed stackdriver tracing env var

Ref: istio#20851

* Run make gen

* Run make gen

* Fix test added
brian-avery pushed a commit to brian-avery/istio that referenced this pull request Mar 4, 2020
* Fix malformed stackdriver tracing env var

Ref: istio#20851

* Run make gen

* Run make gen

* Fix test added
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/extensions and telemetry cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants