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

chore: sync master back into develop #69

Merged
merged 157 commits into from
Aug 9, 2023
Merged

chore: sync master back into develop #69

merged 157 commits into from
Aug 9, 2023

Conversation

bardisg
Copy link

@bardisg bardisg commented Aug 9, 2023

Description of the change

Description here

Type of change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Related issues

Fix #1

Checklists

Development

  • Lint rules pass locally
  • The code changed/added as part of this pull request has been covered with tests
  • All tests related to the changed code pass in development

Code review

  • This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
  • "Ready for review" label attached to the PR and reviewers mentioned in a comment
  • Changes have been reviewed by at least one other engineer
  • Issue from task tracker has a link to this pull request

dependabot bot and others added 30 commits November 1, 2021 16:02
@dependabot
Bump spotless-maven-plugin from 2.14.0 to 2.17.3
8ee755b 
Bumps [spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.14.0 to 2.17.3.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](diffplug/spotless@lib/2.14.0...maven/2.17.3)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@pooyaj
Merge pull request segmentio#295 from segmentio/dependabot/maven/com.…
71be693 
…diffplug.spotless-spotless-maven-plugin-2.17.3

Bump spotless-maven-plugin from 2.14.0 to 2.17.3
Initial PR intended as a draft please review approach and let me know…
d3cfe5a 
… if I should go ahead with implementing changes
Modified logic for size check for each message before adding to queue…
bf038aa 
…, also checks size for the batch creation and test cases

I have a bunch of comments that i will remove before merge if PR gets approved.
ran mvn spotless:apply to fix circlet errors
2e8e61b
Test case succeeds locally, forcing test to wait to guarantee intera…
d9d0d82 
…ction happens
fix circlet code violation with mvn spotless apply
4092824
forced wait to guarantee interaction in test
75fb976
@dependabot
Bump okhttp from 4.3.0 to 4.9.3
5f9ae86 
Bumps [okhttp](https://github.com/square/okhttp) from 4.3.0 to 4.9.3.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.3.0...parent-4.9.3)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bugfix for TLS version error (protocol not supported error)
ca95853 
    Added a method to the Analytics Builder class forceTlsVersion1() - name subject to change
    Usage -
            Analytics.Builder builder = Analytics.builder("someKey");
            Analytics analytics = builder.userAgent("someUserAgent")
            .client(someClient)
            .endpoint("some endpoint")
            .anotherAlreadyExistingMethod(someParam)
            .forceTlsVersion1()
            .build();

    this new method forces the httpClient to be created using  ConnectionSpec of MODERN_TLS and including Tls Versions: TLS_1_0, TLS_1_1, TLS_1_2, TLS_1_3

    Also added a simple test case
run maven spotless:apply
7da597e
@dependabot
Bump spring-boot-autoconfigure from 2.5.5 to 2.6.2
27922cc 
Bumps [spring-boot-autoconfigure](https://github.com/spring-projects/spring-boot) from 2.5.5 to 2.6.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.5.5...v2.6.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-autoconfigure
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump auto.version from 1.8.2 to 1.9
292cbfc 
Bumps `auto.version` from 1.8.2 to 1.9.

Updates `auto-value` from 1.8.2 to 1.9
- [Release notes](https://github.com/google/auto/releases)
- [Commits](google/auto@auto-value-1.8.2...auto-value-1.9)

Updates `auto-value-annotations` from 1.8.2 to 1.9
- [Release notes](https://github.com/google/auto/releases)
- [Commits](google/auto@auto-value-1.8.2...auto-value-1.9)

---
updated-dependencies:
- dependency-name: com.google.auto.value:auto-value
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.auto.value:auto-value-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@pooyaj
Merge pull request segmentio#304 from North-Two-Five/bugfix-tlsversion
a9810cc 
Bugfix for TLS version error (protocol not supported error)
@pooyaj
Merge pull request segmentio#299 from segmentio/dependabot/maven/com.…
dddb9e7 
…squareup.okhttp3-okhttp-4.9.3

Bump okhttp from 4.3.0 to 4.9.3
@pooyaj
Merge pull request segmentio#307 from segmentio/dependabot/maven/org.…
78e33f3 
…springframework.boot-spring-boot-autoconfigure-2.6.2

Bump spring-boot-autoconfigure from 2.5.5 to 2.6.2
@dependabot
Bump logging-interceptor from 4.9.1 to 4.9.3
9503d9b 
Bumps [logging-interceptor](https://github.com/square/okhttp) from 4.9.1 to 4.9.3.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.9.1...parent-4.9.3)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@pooyaj
Merge pull request segmentio#301 from segmentio/dependabot/maven/com.…
16973ba 
…squareup.okhttp3-logging-interceptor-4.9.3

Bump logging-interceptor from 4.9.1 to 4.9.3
@dependabot
Bump maven-compiler-plugin from 3.8.1 to 3.9.0
f312214 
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.9.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump kotlin.version from 1.5.31 to 1.6.10
73d7032 
Bumps `kotlin.version` from 1.5.31 to 1.6.10.

Updates `kotlin-stdlib` from 1.5.31 to 1.6.10
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.5.31...v1.6.10)

Updates `kotlin-maven-plugin` from 1.5.31 to 1.6.10

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@pooyaj
Merge pull request segmentio#308 from segmentio/dependabot/maven/auto…
9df49ab 
….version-1.9

Bump auto.version from 1.8.2 to 1.9
@pooyaj
Merge pull request segmentio#310 from segmentio/dependabot/maven/kotl…
73f5f2e 
…in.version-1.6.10

Bump kotlin.version from 1.5.31 to 1.6.10
@dependabot
Bump assertj-core from 3.21.0 to 3.22.0
12bd554 
Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](assertj/assertj@assertj-core-3.21.0...assertj-core-3.22.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@pooyaj
Merge pull request segmentio#311 from segmentio/dependabot/maven/org.…
303c128 
…apache.maven.plugins-maven-compiler-plugin-3.9.0

Bump maven-compiler-plugin from 3.8.1 to 3.9.0
@dependabot
Bump spring-boot-autoconfigure from 2.6.2 to 2.6.3
14e45f1 
Bumps [spring-boot-autoconfigure](https://github.com/spring-projects/spring-boot) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.6.2...v2.6.3)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-autoconfigure
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump gson from 2.8.8 to 2.8.9
de25029 
Bumps [gson](https://github.com/google/gson) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](google/gson@gson-parent-2.8.8...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump spotless-maven-plugin from 2.17.3 to 2.20.0
544deb0 
Bumps [spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.17.3 to 2.20.0.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](diffplug/spotless@maven/2.17.3...lib/2.20.0)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@pooyaj
Merge pull request segmentio#317 from segmentio/dependabot/maven/org.…
233affb 
…assertj-assertj-core-3.22.0

Bump assertj-core from 3.21.0 to 3.22.0
@dependabot
Bump mockito-core from 3.12.4 to 4.3.1
a506212 
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.4 to 4.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.12.4...v4.3.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@jorgen25
based on PR: segmentio#316
666042c 
fixed compile errors: mockito version is upgraded so some methods are not named the same
example: verifyZeroInteractions became verifyNoInteractions
1abhishekpandey and others added 24 commits December 19, 2022 16:38
@1abhishekpandey
Revert "chore: bump version to 2.1.0"
f493468 
This reverts commit 7c121d6.
@1abhishekpandey
chore: bump version to 3.0.0
580533f
@1abhishekpandey
test(AnalyticsClientTest): fix MSG_MAX_CREATE_SIZE size limit
0998a7b
@1abhishekpandey
feat: introduce setDataPlaneUrl and mark endPoint as deprecated (#45
4e59f86 
)

* feat: introduce `setDataPlaneUrl` and mark `endPoint` as deprecated

To have uniform behaviour across SDKs, we've decided to mark `endPoint` API as deprecated and replace it with `setDataPlaneUrl` API. In future versions, we'll remove endPoint API.

* refactor: optimise endpoint API logic

* doc: update changelog
@itsdebs @1abhishekpandey
fix: added tier blocking sample code (#44)
8039296 
* fix: added tier blocking sample code

* fix: tier blocking flush arrival fix

* chore: update blocking flush logic

Now there will be a single phaser to manage the registered parties, and it will handle the max limit (of Phaser) as well.

Co-authored-by: Abhishek Pandey <64667840+1abhishekpandey@users.noreply.github.com>
@1abhishekpandey
doc: update changelog
7894d2a
@1abhishekpandey
feat: add getter method for dataPlaneUrl (#46)
94c5529
@1abhishekpandey
doc: update readme
da7b998
@1abhishekpandey
chore(analytics-cli): add setDataPlaneUrl while SDK init
15f1c4b
@1abhishekpandey
doc: update readme
29bccf7
@1abhishekpandey
chore(analytics-cli): add setDataPlaneUrl while SDK init
d4cfd76
@1abhishekpandey
chore: release version 3.0.0
c1cf284 
Merge pull request #47 from rudderlabs/develop
@1abhishekpandey
Merge pull request #49 from rudderlabs/feat/latestPull
7fcb2db 
chore: release version 3.0.0
@dependabot
chore(deps): bump mockito-core from 4.8.1 to 4.11.0 (#51)
58e4fde 
Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v4.8.1...v4.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump nexus-staging-maven-plugin from 1.6.7 to 1.6.13 (#50)
64ba8e3 
Bumps nexus-staging-maven-plugin from 1.6.7 to 1.6.13.

---
updated-dependencies:
- dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@1abhishekpandey
chore: add issue template for bug report
5456ffe
@1abhishekpandey
chore: add issue template for bug report
8fe0dc6 
Merge pull request #59 from rudderlabs/issueTemplate
@itsdebs
Merge remote-tracking branch 'origin/master'
051c92a 
# Conflicts:
#	pom.xml
@itsdebs
fix: updated version to fix snyk issue
5adf31e
@itsdebs
fix: sonar build issue
33a0438
@itsdebs
Merge pull request #66 from rudderlabs/fix/snyk-issues
9025084 
fix: snyk issues
@snyk-bot
fix: pom.xml to reduce vulnerabilities
f2e19a4 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002
@1abhishekpandey
Merge pull request #68 from rudderlabs/snyk-fix-7b60cb756dcd78b981732…
417a81f 
…236c4f6248c

chore: [Snyk] Security upgrade com.squareup.okhttp3:okhttp from 4.10.0 to 4.11.0
@dependabot
chore(deps): bump actions/cache from 1 to 3 (#61)
e312f6f 
Bumps [actions/cache](https://github.com/actions/cache) from 1 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v1...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sonarcloud
Copy link

sonarcloud bot commented Aug 9, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

warning The version of Java (11.0.19) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@bardisg bardisg self-assigned this Aug 9, 2023
@bardisg bardisg requested review from debanjan97 and itsdebs and removed request for debanjan97 August 9, 2023 12:49
@bardisg bardisg merged commit 77ca93a into develop Aug 9, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@itsdebs itsdebs Awaiting requested review from itsdebs

Assignees

@bardisg bardisg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@bardisg @pooyaj @jorgen25 @nd4p90x @edsonjab @olamy @dmenear @1abhishekpandey @itsdebs @snyk-bot