Skip to content

Reverted log4j shading due to regressions caused. #46546

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

Merged
merged 7 commits into from
Sep 3, 2025
Merged

Reverted log4j shading due to regressions caused. #46546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c30919
Reverted log4j shading due to regressions caused.
FabianMeiswinkel Aug 29, 2025
8b781ff
Updating changelogs
FabianMeiswinkel Aug 29, 2025
3cd19ea
Removing SPN AAD DBX live tests
FabianMeiswinkel Sep 2, 2025
54814c2
Merge branch 'main' into users/fabianm/log4jShadingRegressionFix
FabianMeiswinkel Sep 2, 2025
02ac5e1
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-java in…
FabianMeiswinkel Sep 3, 2025
feea98e
Updating changelog
FabianMeiswinkel Sep 3, 2025
1efef86
Updated changelog
FabianMeiswinkel Sep 3, 2025
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
13 changes: 10 additions & 3 deletions sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@
#### Breaking Changes

#### Bugs Fixed
* Added log4j-core to the list of shaded packages to avoid conflicts when customers use log4j in a different version. - See [PR 45924](https://github.com/Azure/azure-sdk-for-java/pull/46451)

#### Other Changes
* Reverted known issue due to shading log4j (which was introduced in 4.38.1). - See [PR 46546](https://github.com/Azure/azure-sdk-for-java/pull/46546)
* Added change feed performance monitoring which is used to improve end lsn calculation in `CosmosPartitionPlanner`. - See [PR 46320](https://github.com/Azure/azure-sdk-for-java/pull/46320)
* Added `spark.cosmos.auth.aad.audience` as a valid configuration option to allow using AAD tokens with custom audiences. - See [PR 46554](https://github.com/Azure/azure-sdk-for-java/pull/46554)

#### Other Changes

### 4.38.1 (2025-08-22)

**NOTE: This version has a known issue due to shading log4j - Please use more recent versions >= 4.38.2 or 4.38.0 instead**

#### Other Changes
* Added log4j-core to the list of shaded packages to avoid conflicts when customers use log4j in a different version. **NOTE: This change caused known issue - Please use a more recent version instead** - See [PR 45924](https://github.com/Azure/azure-sdk-for-java/pull/46451)

### 4.38.0 (2025-07-31)

#### Features Added
Expand Down
13 changes: 10 additions & 3 deletions sdk/cosmos/azure-cosmos-spark_3-4_2-12/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@
#### Breaking Changes

#### Bugs Fixed
* Added log4j-core to the list of shaded packages to avoid conflicts when customers use log4j in a different version. - See [PR 45924](https://github.com/Azure/azure-sdk-for-java/pull/46451)

#### Other Changes
* Reverted known issue due to shading log4j (which was introduced in 4.38.1). - See [PR 46546](https://github.com/Azure/azure-sdk-for-java/pull/46546)
* Added change feed performance monitoring which is used to improve end lsn calculation in `CosmosPartitionPlanner`. - See [PR 46320](https://github.com/Azure/azure-sdk-for-java/pull/46320)
* Added `spark.cosmos.auth.aad.audience` as a valid configuration option to allow using AAD tokens with custom audiences. - See [PR 46554](https://github.com/Azure/azure-sdk-for-java/pull/46554)

#### Other Changes

### 4.38.1 (2025-08-22)

**NOTE: This version has a known issue due to shading log4j - Please use more recent versions >= 4.38.2 or 4.38.0 instead**

#### Other Changes
* Added log4j-core to the list of shaded packages to avoid conflicts when customers use log4j in a different version. **NOTE: This change caused known issue - Please use a more recent version instead** - See [PR 45924](https://github.com/Azure/azure-sdk-for-java/pull/46451)

### 4.38.0 (2025-07-31)

#### Features Added
Expand Down
13 changes: 10 additions & 3 deletions sdk/cosmos/azure-cosmos-spark_3-5_2-12/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@
#### Breaking Changes

#### Bugs Fixed
* Added log4j-core to the list of shaded packages to avoid conflicts when customers use log4j in a different version. - See [PR 45924](https://github.com/Azure/azure-sdk-for-java/pull/46451)

#### Other Changes
* Reverted known issue due to shading log4j (which was introduced in 4.38.1). - See [PR 46546](https://github.com/Azure/azure-sdk-for-java/pull/46546)
* Added change feed performance monitoring which is used to improve end lsn calculation in `CosmosPartitionPlanner`. - See [PR 46320](https://github.com/Azure/azure-sdk-for-java/pull/46320)
* Added `spark.cosmos.auth.aad.audience` as a valid configuration option to allow using AAD tokens with custom audiences. - See [PR 46554](https://github.com/Azure/azure-sdk-for-java/pull/46554)

#### Other Changes

### 4.38.1 (2025-08-22)

**NOTE: This version has a known issue due to shading log4j - Please use more recent versions >= 4.38.2 or 4.38.0 instead**

#### Other Changes
* Added log4j-core to the list of shaded packages to avoid conflicts when customers use log4j in a different version. **NOTE: This change caused known issue - Please use a more recent version instead** - See [PR 45924](https://github.com/Azure/azure-sdk-for-java/pull/46451)

### 4.38.0 (2025-07-31)

#### Features Added
Expand Down
16 changes: 0 additions & 16 deletions sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,10 +589,6 @@
<pattern>net.jcip</pattern>
<shadedPattern>${shadingPrefix}.net.jcip</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.logging.log4j</pattern>
<shadedPattern>${shadingPrefix}.org.apache.logging.log4j</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
Expand All @@ -613,18 +609,6 @@
<include>**</include>
</includes>
</filter>
<filter>
<artifact>org.apache.logging.log4j:log4j-core</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<filter>
<artifact>org.apache.logging.log4j:log4j-slf4j-impl</artifact>
<includes>
<include>**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
Expand Down
3 changes: 1 addition & 2 deletions ...s/azure-cosmos-spark_3_2-12/src/main/scala/com/azure/cosmos/spark/CosmosClientCache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ private[spark] object CosmosClientCache extends BasicLoggingTrait {
val azMonConfig = cosmosClientConfiguration.azureMonitorConfig.get
val openTelemetry = configureOpenTelemetrySdk(cosmosClientConfiguration, azMonConfig)

if (azMonConfig.logLevel != Level.OFF) {
if (azMonConfig.enabled && azMonConfig.logLevel != Level.OFF) {
configureLoggingForAzureMonitor(cosmosClientConfiguration, azMonConfig, openTelemetry)
}

Expand Down Expand Up @@ -647,7 +647,6 @@ private[spark] object CosmosClientCache extends BasicLoggingTrait {

telemetryConfig = telemetryConfig
.tracingOptions(tracingOptions)
.enableTransportLevelTracing()
} else {
logInfo("Azure Monitor traces/logs disabled.")
}
Expand Down
114 changes: 0 additions & 114 deletions sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks/basicScenarioAad.scala
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions ...smos/azure-cosmos-spark_3_2-12/test-databricks/notebooks/basicScenarioAadMisspelled.scala
View file
Open in desktop

This file was deleted.