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.

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

Upgrade to go 1.10 #792

Merged
merged 1 commit into from
Apr 30, 2018
Merged

Upgrade to go 1.10 #792

merged 1 commit into from
Apr 30, 2018

Conversation

vprithvi
Copy link
Contributor

  • remove redundant newline in Fprintln arg list to fix build

@coveralls
Copy link

coveralls commented Apr 27, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling 684a086 on fix-build-go-1.10 into 2325502 on master.

@@ -40,8 +40,7 @@ their names to upper case and replacing punctuation with underscores. For exampl
--cassandra.connections-per-host CASSANDRA_CONNECTIONS_PER_HOST
--metrics-backend METRICS_BACKEND

The following configuration options are only available via environment variables:
`)
The following configuration options are only available via environment variables:`)
Copy link
Member

Choose a reason for hiding this comment

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

why? The formatting is better with a blank line.

$ go run ./cmd/query/main.go env

All command line options can be provided via environment variables by converting
their names to upper case and replacing punctuation with underscores. For example,

      command line option                 environment variable
      ------------------------------------------------------------------
      --cassandra.connections-per-host    CASSANDRA_CONNECTIONS_PER_HOST
      --metrics-backend                   METRICS_BACKEND

The following configuration options are only available via environment variables:

      SPAN_STORAGE_TYPE string         The type of backend (cassandra, elasticsearch, memory) used for trace storage. (default "cassandra")
      DEPENDENCY_STORAGE_TYPE string   The type of backend used for service dependencies storage. (default "${SPAN_STORAGE}")

Copy link
Contributor Author

@vprithvi vprithvi Apr 27, 2018

Choose a reason for hiding this comment

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

Does the additional newline make a difference? (The error says it's redundant)

The build failed with the following:

# github.com/jaegertracing/jaeger/cmd/env
cmd/env/command.go:34: Fprintln arg list ends with redundant newline
make: *** [test] Error 2

Copy link
Member

Choose a reason for hiding this comment

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

then I would add + "\n" before paren. Not having new-line makes display less readable

@@ -40,8 +40,7 @@ their names to upper case and replacing punctuation with underscores. For exampl
--cassandra.connections-per-host CASSANDRA_CONNECTIONS_PER_HOST
--metrics-backend METRICS_BACKEND

The following configuration options are only available via environment variables:
`)
The following configuration options are only available via environment variables:\n`)
Copy link
Member

Choose a reason for hiding this comment

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

are you sure \n is actually interpreted when in back-tick string?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question, I don't expect it to be, but let me verify/ replace with something that preserves formatting.

Copy link
Member

Choose a reason for hiding this comment

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

just run the cmd and see the output: go run ./cmd/query/main.go env

Copy link
Contributor

Choose a reason for hiding this comment

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

\n will be interpreted as the literal backslash and character n since it is raw string literal.
https://golang.org/ref/spec#String_literals
I would suggest inserting fmt.Fprint(cmd.OutOrStdout(), "\n") after Fprintln, if it has to be changed.

Copy link
Member

Choose a reason for hiding this comment

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

Why the complication? My original suggestion was to concatenate with +"\n"

- remove redundant newline in Fprintln arg list to fix build

Signed-off-by: Prithvi Raj <p.r@uber.com>
@vprithvi vprithvi merged commit c7891a4 into master Apr 30, 2018
@ghost ghost removed the review label Apr 30, 2018
@vprithvi vprithvi deleted the fix-build-go-1.10 branch April 30, 2018 15:08
mabn pushed a commit to mabn/jaeger that referenced this pull request May 28, 2018
* master: (38 commits)
  Preparing release 1.5.0 (jaegertracing#847)
  Add bounds to memory storage (jaegertracing#845)
  Add metric for debug traces (jaegertracing#796)
  Change metrics naming scheme (jaegertracing#776)
  Bump gocql version (jaegertracing#829)
  Remove ParentSpanID from domain model (jaegertracing#831)
  Make gas run quiet (jaegertracing#838)
  Revert "Make gas run quite"
  Revert "Install gas from install-ci"
  Install gas from install-ci
  Make gas run quite
  Add 'gas' for security problems scanning (jaegertracing#830)
  Add ability to adjust static sampling probabilities per operation (jaegertracing#827)
  Support log-level flag on agent (jaegertracing#828)
  Remove unused function (jaegertracing#822)
  Add healthcheck to standalone (jaegertracing#784)
  Do not use KeyValue fields directly and use KeyValues as decorator only (jaegertracing#810)
  Add ContaAzul to the adopters list (jaegertracing#806)
  Add ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (jaegertracing#805)
  Upgrade to  go 1.10 (jaegertracing#792)
  ...

# Conflicts:
#	cmd/agent/app/builder.go
#	cmd/collector/main.go
#	cmd/query/main.go
#	cmd/standalone/main.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants