[BEAM-11831] Partially Revert "[BEAM-11805] Replace user-agent for spanner (#13990)"

[TheNeuralBit]

This partially reverts the changes from #13990. All of the changes to SpannerAccessor are reverted, except for the update to the comment that explains the purpose of the user-agent.

ValidatesRunner compliance status (on master branch)

Lang	ULR	Dataflow	Flink	Samza	Spark	Twister2
Go	---					---
Java
Python	---					---
XLang						---

Examples testing status on various runners

Lang	ULR	Dataflow	Flink	Samza	Spark	Twister2
Go	---	---	---	---	---	---	---
Java	---		---	---	---	---	---
Python	---	---	---	---	---	---	---
XLang	---	---	---	---	---	---	---

Post-Commit SDK/Transform Integration Tests Status (on master branch)

Go	Java	Python

Pre-Commit Tests Status (on master branch)

---	Java	Python	Go	Website	Whitespace	Typescript
Non-portable
Portable	---			---	---	---

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

GitHub Actions Tests Status (on master branch)

See CI.md for more information about GitHub Actions CI.

[TheNeuralBit]

Run Java PostCommit

[TheNeuralBit]

R: @allenpradeep

[TheNeuralBit]

Run Java PreCommit

[TheNeuralBit]

R: @nielm

[allenpradeep]

@thiagotnunes

Just wanted to confirm if the original issue that was saw earlier(as part of BEAM-11805) in the Cloud Spanner library is fixed.

java.lang.IllegalArgumentException: Multiple entries with same key: user-agent=Apache_Beam_Java/2.29.0-SNAPSHOT and user-agent=spanner-java/3.2.1

[thiagotnunes]

@allenpradeep6.4.0 should have the fixes we need

[TheNeuralBit]

Thanks for double-checking this. From jira:

./gradlew sdks:java:io:google-cloud-platform:dependencyReport shows:

+--- com.google.cloud:libraries-bom:22.0.0
...
| +--- com.google.cloud:google-cloud-spanner:6.12.1 (c)

So we should have the upstream fix now. To be sure, I also ran the Java PostCommit on this PR, which is what caught BEAM-11805. Note that SpannerReadIT is still passing.

[TheNeuralBit]

@allenpradeep does this look good given that we're on an appropriate version of the spanner client?

[TheNeuralBit]

R: @lukecwik

[allenpradeep]

LGTM
Sorry on the delay.

[TheNeuralBit]

Thank you!